diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless.json
index acf9184..7398ab7 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless.json
@@ -14,7 +14,7 @@
     },
     "Page":{
         "pageType":"wireless",
-        "template":"moleculeList",
+        "template":"list",
         "header": {
             "moleculeName":"header",
             "molecule": {
@@ -41,7 +41,7 @@
         "molecules":[{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":33,
@@ -103,7 +103,7 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
@@ -131,7 +131,7 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
@@ -159,7 +159,7 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
@@ -187,7 +187,7 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "molecules":[{
                     "molecule":{
                         "moleculeName":"label",
@@ -201,7 +201,7 @@
                     }
                 }]
             },
-            "separator":{
+            "line":{
                 "moleculeName":"line",
                 "type":"none"
             }
@@ -215,13 +215,13 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
                     "molecule":{
                         "verticalAlignment": "leading",
-                        "moleculeName":"moleculeStack",
+                        "moleculeName":"stack",
                         "horizontalAlignment":"fill",
                         "molecules":[{
                             "molecule":{
@@ -268,13 +268,13 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
                     "molecule":{
                         "verticalAlignment": "leading",
-                        "moleculeName":"moleculeStack",
+                        "moleculeName":"stack",
                         "horizontalAlignment":"fill",
                         "molecules":[{
                             "molecule":{
@@ -320,13 +320,13 @@
         },{
             "moleculeName":"listItem",
             "molecule":{
-                "moleculeName":"moleculeStack",
+                "moleculeName":"stack",
                 "axis":"horizontal",
                 "molecules":[{
                     "percent":60,
                     "molecule":{
                         "verticalAlignment": "leading",
-                        "moleculeName":"moleculeStack",
+                        "moleculeName":"stack",
                         "horizontalAlignment":"fill",
                         "molecules":[{
                             "molecule":{