9 files changed, 51 insertions, 34 deletions
diff --git a/cpp/sca/samples/store/cart.hpp b/cpp/sca/samples/store/cart.hpp
index 764fdbd34f..55e8409959 100644
--- a/cpp/sca/samples/store/cart.hpp
+++ b/cpp/sca/samples/store/cart.hpp
@@ -19,8 +19,8 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_CART_HPP_
-#define SCA_CART_HPP_
+#ifndef store_cart_hpp
+#define store_cart_hpp
 
 #include <string.h>
 #include "tuscany/function.hpp"
@@ -29,7 +29,9 @@
 #include "item.hpp"
 #include "catalog.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 const double accum(const double total, const Item& item) {
@@ -72,4 +74,4 @@ public:
 };
 
 }
-#endif /* SCA_CART_HPP_ */
+#endif /* store_cart_hpp */
diff --git a/cpp/sca/samples/store/catalog.hpp b/cpp/sca/samples/store/catalog.hpp
index 76cab8576f..6578dd71ed 100644
--- a/cpp/sca/samples/store/catalog.hpp
+++ b/cpp/sca/samples/store/catalog.hpp
@@ -19,15 +19,17 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_CATALOG_HPP_
-#define SCA_CATALOG_HPP_
+#ifndef store_catalog_hpp
+#define store_catalog_hpp
 
 #include <string.h>
 #include "tuscany/list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class Catalog {
@@ -62,4 +64,4 @@ public:
 };
 
 }
-#endif /* SCA_CATALOG_HPP_ */
+#endif /* store_catalog_hpp */
diff --git a/cpp/sca/samples/store/currency-composite.hpp b/cpp/sca/samples/store/currency-composite.hpp
index d9bdd93949..a135ca660b 100644
--- a/cpp/sca/samples/store/currency-composite.hpp
+++ b/cpp/sca/samples/store/currency-composite.hpp
@@ -19,14 +19,16 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_CURRENCYCOMPOSITE_HPP_
-#define SCA_CURRENCYCOMPOSITE_HPP_
+#ifndef store_currencycomposite_hpp
+#define store_currencycomposite_hpp
 
 #include <string.h>
 #include <math.h>
 #include "currency.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class Currency : public CurrencyConverter {
@@ -49,4 +51,4 @@ public:
 };
 
 }
-#endif /* SCA_CURRENCYCOMPOSITE_HPP_ */
+#endif /* store_currencycomposite_hpp */
diff --git a/cpp/sca/samples/store/currency.hpp b/cpp/sca/samples/store/currency.hpp
index 045f993230..de4c8f72c0 100644
--- a/cpp/sca/samples/store/currency.hpp
+++ b/cpp/sca/samples/store/currency.hpp
@@ -19,15 +19,16 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_CURRENCY_HPP_
-#define SCA_CURRENCY_HPP_
+#ifndef store_currency_hpp
+#define store_currency_hpp
 
 #include <string.h>
 #include <math.h>
 
 using std::string;
+using namespace tuscany;
 
-namespace tuscany
+namespace store
 {
 
 class CurrencyConverter {
@@ -59,4 +60,4 @@ public:
 };
 
 }
-#endif /* SCA_CURRENCY_HPP_ */
+#endif /* store_currency_hpp */
diff --git a/cpp/sca/samples/store/item.hpp b/cpp/sca/samples/store/item.hpp
index eab80106fd..64b99c9b39 100644
--- a/cpp/sca/samples/store/item.hpp
+++ b/cpp/sca/samples/store/item.hpp
@@ -19,12 +19,14 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_ITEM_HPP_
-#define SCA_ITEM_HPP_
+#ifndef store_item_hpp
+#define store_item_hpp
 
 #include <string.h>
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class Item {
@@ -44,4 +46,4 @@ public:
 };
 
 }
-#endif /* SCA_ITEM_HPP_ */
+#endif /* store_item_hpp */
diff --git a/cpp/sca/samples/store/store-composite.hpp b/cpp/sca/samples/store/store-composite.hpp
index 1a235d3674..7cbaa62561 100644
--- a/cpp/sca/samples/store/store-composite.hpp
+++ b/cpp/sca/samples/store/store-composite.hpp
@@ -19,8 +19,8 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_STORECOMPOSITE_HPP_
-#define SCA_STORECOMPOSITE_HPP_
+#ifndef store_storecomposite_hpp
+#define store_storecomposite_hpp
 
 #include <string.h>
 #include "tuscany/list.hpp"
@@ -31,7 +31,9 @@
 #include "cart.hpp"
 #include "store-ui.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class Store : public StoreUI {
@@ -66,4 +68,4 @@ public:
 };
 
 }
-#endif /* SCA_STORECOMPOSITE_HPP_ */
+#endif /* store_storecomposite_hpp */
diff --git a/cpp/sca/samples/store/store-solution.hpp b/cpp/sca/samples/store/store-solution.hpp
index 4ed4fba551..ba36829718 100644
--- a/cpp/sca/samples/store/store-solution.hpp
+++ b/cpp/sca/samples/store/store-solution.hpp
@@ -19,15 +19,17 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_STORESOLUTION_HPP_
-#define SCA_STORESOLUTION_HPP_
+#ifndef store_storesolution_hpp
+#define store_storesolution_hpp
 
 #include <string.h>
 #include "tuscany/list.hpp"
 #include "store-composite.hpp"
 #include "currency-composite.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class StoreSolution : public Store {
@@ -60,4 +62,4 @@ public:
 };
 
 }
-#endif /* SCA_STORESOLUTION_HPP_ */
+#endif /* store_storesolution_hpp */
diff --git a/cpp/sca/samples/store/store-test.cpp b/cpp/sca/samples/store/store-test.cpp
index 96ce6af997..98be2a3037 100644
--- a/cpp/sca/samples/store/store-test.cpp
+++ b/cpp/sca/samples/store/store-test.cpp
@@ -31,7 +31,9 @@
 using std::cout;
 using std::endl;
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 bool testComponentAssembly() {
@@ -47,7 +49,7 @@ bool testComponentAssembly() {
 }
 
 int main() {
-    using namespace tuscany;
+    using namespace store;
 
     cout << "Testing..." << endl;
 
diff --git a/cpp/sca/samples/store/store-ui.hpp b/cpp/sca/samples/store/store-ui.hpp
index 4e8578cc2f..251924e67c 100644
--- a/cpp/sca/samples/store/store-ui.hpp
+++ b/cpp/sca/samples/store/store-ui.hpp
@@ -19,8 +19,8 @@
 
 /* $Rev$ $Date$ */
 
-#ifndef SCA_STOREUI_HPP_
-#define SCA_STOREUI_HPP_
+#ifndef store_storeui_hpp
+#define store_storeui_hpp
 
 #include <string.h>
 #include "tuscany/list.hpp"
@@ -29,7 +29,9 @@
 #include "catalog.hpp"
 #include "cart.hpp"
 
-namespace tuscany
+using namespace tuscany;
+
+namespace store
 {
 
 class StoreUI {
@@ -70,4 +72,4 @@ public:
 };
 
 }
-#endif /* SCA_STOREUI_HPP_ */
+#endif /* store_storeui_hpp */