diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json
index f63a087..069e5c5 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json
@@ -4,7 +4,7 @@
 },
 "moleculeName" : "listRVWheel",
 "wheel" : {
-    "moleculeName" : "circleProgress"
+    "moleculeName" : "wheel"
 },
 "leftLabel" : {
     "moleculeName" : "label",
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/moduleMolecule.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/moduleMolecule.json
index df2616e..9c7df90 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/moduleMolecule.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/moduleMolecule.json
@@ -58,7 +58,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                        "moleculeName":"circleProgress"
+                        "moleculeName":"wheel"
                     }
                 },{
                     "horizontalAlignment":"fill",
@@ -83,7 +83,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                                                "moleculeName":"circleProgress"
+                                                "moleculeName":"wheel"
 
                     }
                 },{
@@ -109,7 +109,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                                                "moleculeName":"circleProgress"
+                                                "moleculeName":"wheel"
 
                     }
                 },{
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy 2.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy 2.json
index e9b9709..9fca663 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy 2.json	
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy 2.json	
@@ -71,7 +71,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -126,7 +126,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -181,7 +181,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -236,7 +236,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -291,7 +291,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy.json
index 6be06f9..920c19e 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy.json	
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices copy.json	
@@ -62,7 +62,7 @@
                      "molecule":{
                         "style":"unlimited",
                         "size": "small",
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"trailing"
                      }
                   },
@@ -108,7 +108,7 @@
                      "molecule":{
                         "style":"unlimited",
                         "size": "small",
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"trailing"
                      }
                   },
@@ -154,7 +154,7 @@
                      "molecule":{
                         "style":"unlimited",
                         "size": "small",
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"trailing"
                      }
                   },
@@ -200,7 +200,7 @@
                      "molecule":{
                         "style":"unlimited",
                         "size": "small",
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"trailing"
                      }
                   },
@@ -246,7 +246,7 @@
                      "molecule":{
                         "style":"unlimited",
                         "size": "small",
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"trailing"
                      }
                   },
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices.json
index e194e45..c082d37 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/plansDevices.json
@@ -68,7 +68,7 @@
                                  "lineWidth":4,
                                  "clockwise":1,
                                  "style":"unlimited",
-                                 "moleculeName":"circleProgress"
+                                 "moleculeName":"wheel"
                               }
                            },
                            {
@@ -121,7 +121,7 @@
                                  "clockwise":1,
                                  "style":"unlimited",
                                  "verticalAlignment":"center",
-                                 "moleculeName":"circleProgress"
+                                 "moleculeName":"wheel"
                               }
                            },{
                               "spacing":8,
@@ -172,7 +172,7 @@
                                  "lineWidth":4,
                                  "clockwise":1,
                                  "style":"unlimited",
-                                 "moleculeName":"circleProgress"
+                                 "moleculeName":"wheel"
                               }
                            },
                            {
@@ -225,7 +225,7 @@
                                  "lineWidth":4,
                                  "clockwise":1,
                                  "style":"unlimited",
-                                 "moleculeName":"circleProgress"
+                                 "moleculeName":"wheel"
                               }
                            },
                            {
@@ -278,7 +278,7 @@
                                  "lineWidth":4,
                                  "clockwise":1,
                                  "style":"unlimited",
-                                 "moleculeName":"circleProgress"
+                                 "moleculeName":"wheel"
                               }
                            },
                            {
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/testcircle.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/testcircle.json
index 95f74f4..0d5d8cc 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/testcircle.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/testcircle.json
@@ -54,7 +54,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "verticalAlignment":"center"
                     }
                   },
@@ -107,7 +107,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -162,7 +162,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -217,7 +217,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -272,7 +272,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -327,7 +327,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -382,7 +382,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -437,7 +437,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -492,7 +492,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -547,7 +547,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -602,7 +602,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -657,7 +657,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
@@ -712,7 +712,7 @@
                         "#1D88CA",
                         "#073652"
                       ],
-                      "moleculeName" : "circleProgress",
+                      "moleculeName" : "wheel",
                       "horizontalAlignment" : "center"
                     }
                   },
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless5.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless5.json
index 13bd83f..f8aa394 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless5.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/MVA3.0/wireless5.json
@@ -116,7 +116,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                        "moleculeName":"circleProgress"
+                        "moleculeName":"wheel"
                     }
                 },{
                     "horizontalAlignment":"fill",
@@ -141,7 +141,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                                                "moleculeName":"circleProgress"
+                                                "moleculeName":"wheel"
 
                     }
                 },{
@@ -167,7 +167,7 @@
                 },{
                     "horizontalAlignment":"trailing",
                     "molecule":{
-                                                "moleculeName":"circleProgress"
+                                                "moleculeName":"wheel"
 
                     }
                 },{
diff --git a/JSONCreator_iOS/JSONCreator/JSON/Samples/Prod.json b/JSONCreator_iOS/JSONCreator/JSON/Samples/Prod.json
index 8e76825..f2bf0a5 100644
--- a/JSONCreator_iOS/JSONCreator/JSON/Samples/Prod.json
+++ b/JSONCreator_iOS/JSONCreator/JSON/Samples/Prod.json
@@ -45,7 +45,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress"
+                        "moleculeName":"wheel"
                      }
                   },
                   {
@@ -95,7 +95,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -148,7 +148,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -201,7 +201,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },
@@ -254,7 +254,7 @@
                            "#1D88CA",
                            "#073652"
                         ],
-                        "moleculeName":"circleProgress",
+                        "moleculeName":"wheel",
                         "horizontalAlignment":"center"
                      }
                   },