5 files changed, 14 insertions, 14 deletions
diff --git a/cpp/sca/test/store-function/catalog.hpp b/cpp/sca/test/store-function/catalog.hpp
index 7bf54231a7..c49ebc8fa3 100644
--- a/cpp/sca/test/store-function/catalog.hpp
+++ b/cpp/sca/test/store-function/catalog.hpp
@@ -33,15 +33,15 @@ namespace store
 std::string catalog_currencyCode = "USD";
 
 double catalog_convert(const service& currencyConverter, const double price) {
-    return currencyConverter(tuscany::makeList<tuscany::value>("convert", "USD", catalog_currencyCode, price));
+    return currencyConverter(tuscany::mklist<tuscany::value>("convert", "USD", catalog_currencyCode, price));
 }
 
 const tuscany::list<ItemType> catalog_get(const service& currencyConverter) {
-    const std::string currencySymbol = currencyConverter_service(tuscany::makeList<tuscany::value>("getSymbol", catalog_currencyCode));
-    return tuscany::makeList(
-            makeItem("Apple", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 2.99)),
-            makeItem("Orange", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 3.55)),
-            makeItem("Pear", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 1.55)));
+    const std::string currencySymbol = currencyConverter_service(tuscany::mklist<tuscany::value>("getSymbol", catalog_currencyCode));
+    return tuscany::mklist(
+            item("Apple", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 2.99)),
+            item("Orange", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 3.55)),
+            item("Pear", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 1.55)));
 }
 
 const tuscany::value catalog_service(const service& currencyConverter, const tuscany::list<tuscany::value>& args) {
diff --git a/cpp/sca/test/store-function/item.hpp b/cpp/sca/test/store-function/item.hpp
index 40d18b4ce1..fbe29915dc 100644
--- a/cpp/sca/test/store-function/item.hpp
+++ b/cpp/sca/test/store-function/item.hpp
@@ -30,8 +30,8 @@ namespace store
 
 typedef tuscany::value ItemType;
 
-const ItemType makeItem(const std::string& name, const std::string& currencyCode, const std::string& currencySymbol, const double price) {
-    return tuscany::makeList<tuscany::value>(name, currencyCode, currencySymbol, price);
+const ItemType item(const std::string& name, const std::string& currencyCode, const std::string& currencySymbol, const double price) {
+    return tuscany::mklist<tuscany::value>(name, currencyCode, currencySymbol, price);
 }
 
 const std::string itemName(const ItemType& item) {
diff --git a/cpp/sca/test/store-function/store-function-test.cpp b/cpp/sca/test/store-function/store-function-test.cpp
index 604b33acff..8a6a86eb8a 100644
--- a/cpp/sca/test/store-function/store-function-test.cpp
+++ b/cpp/sca/test/store-function/store-function-test.cpp
@@ -33,7 +33,7 @@ namespace store
 
 bool testComponentAssembly() {
     const service store(storeSolution_service);
-    assert(length((tuscany::list<tuscany::value>)store(tuscany::makeList<tuscany::value>("getCatalog"))) == 3);
+    assert(length((tuscany::list<tuscany::value>)store(tuscany::mklist<tuscany::value>("getCatalog"))) == 3);
     return true;
 }
 
diff --git a/cpp/sca/test/store-function/store-ui.hpp b/cpp/sca/test/store-function/store-ui.hpp
index a2748547d5..12b28d6a92 100644
--- a/cpp/sca/test/store-function/store-ui.hpp
+++ b/cpp/sca/test/store-function/store-ui.hpp
@@ -33,19 +33,19 @@ namespace store
 {
 
 const tuscany::list<ItemType> storeUI_getCatalog(const service& catalog) {
-    return catalog(tuscany::makeList<tuscany::value>("get"));
+    return catalog(tuscany::mklist<tuscany::value>("get"));
 }
 
 const tuscany::list<ItemType> storeUI_getCart(const service& cart) {
-    return cart(tuscany::makeList<tuscany::value>("getAll"));
+    return cart(tuscany::mklist<tuscany::value>("getAll"));
 }
 
 const double storeUI_getTotal(const service& cart) {
-    return cart(tuscany::makeList<tuscany::value>("getTotal"));
+    return cart(tuscany::mklist<tuscany::value>("getTotal"));
 }
 
 const bool storeUI_post(const service& cart, const ItemType& item) {
-    return cart(tuscany::makeList<tuscany::value>("post", item));
+    return cart(tuscany::mklist<tuscany::value>("post", item));
 }
 
 const tuscany::value storeUI_service(const service& catalog, const service& cart, const tuscany::list<tuscany::value>& args) {
diff --git a/cpp/sca/test/store-object/catalog.hpp b/cpp/sca/test/store-object/catalog.hpp
index 6909911c07..fab013cf8e 100644
--- a/cpp/sca/test/store-object/catalog.hpp
+++ b/cpp/sca/test/store-object/catalog.hpp
@@ -54,7 +54,7 @@ public:
 
     virtual const tuscany::list<Item> get() const {
         const std::string currencySymbol = currencyConverter.getSymbol(currencyCode);
-        return tuscany::makeList(
+        return tuscany::mklist(
                 Item("Apple", currencyCode, currencySymbol, convert(2.99)),
                 Item("Orange", currencyCode, currencySymbol, convert(3.55)),
                 Item("Pear", currencyCode, currencySymbol, convert(1.55)));