diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h b/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h
index 6e3039842d..c87a9ca33a 100644
--- a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h
+++ b/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h
@@ -140,10 +140,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
     shape.m_radius = 9.999999776482582e-03f;
     shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_vertex1.Set(4.452173995971680e+01f, 1.669565200805664e+01f);
-    shape.m_Vertex2F.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
-    shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
+    shape.m_vertex2.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
+    shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_hasVertex0 = bool(0);
-    shape.m_hasVertex3F = bool(0);
+    shape.m_hasVertex3 = bool(0);
 
     fd.shape = &shape;
 
@@ -162,10 +162,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
     shape.m_radius = 9.999999776482582e-03f;
     shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f);
-    shape.m_Vertex2F.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
-    shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
+    shape.m_vertex2.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
+    shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_hasVertex0 = bool(0);
-    shape.m_hasVertex3F = bool(0);
+    shape.m_hasVertex3 = bool(0);
 
     fd.shape = &shape;
 
@@ -184,10 +184,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
     shape.m_radius = 9.999999776482582e-03f;
     shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_vertex1.Set(0.000000000000000e+00f, 1.669565200805664e+01f);
-    shape.m_Vertex2F.Set(4.452173995971680e+01f, 1.669565200805664e+01f);
-    shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
+    shape.m_vertex2.Set(4.452173995971680e+01f, 1.669565200805664e+01f);
+    shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_hasVertex0 = bool(0);
-    shape.m_hasVertex3F = bool(0);
+    shape.m_hasVertex3 = bool(0);
 
     fd.shape = &shape;
 
@@ -206,10 +206,10 @@ b2Joint** joints = (b2Joint**)b2Alloc(2 * sizeof(b2Joint*));
     shape.m_radius = 9.999999776482582e-03f;
     shape.m_vertex0.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_vertex1.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
-    shape.m_Vertex2F.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
-    shape.m_Vertex3F.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
+    shape.m_vertex2.Set(4.452173995971680e+01f, 0.000000000000000e+00f);
+    shape.m_vertex3.Set(0.000000000000000e+00f, 0.000000000000000e+00f);
     shape.m_hasVertex0 = bool(0);
-    shape.m_hasVertex3F = bool(0);
+    shape.m_hasVertex3 = bool(0);
 
     fd.shape = &shape;
 
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h b/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h
index 12e4855fee..c5306beaba 100644
--- a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h
+++ b/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h
@@ -35,36 +35,36 @@ public:
             b2EdgeShape shape;
 
             shape.Set(v1, v2);
-            shape.m_hasVertex3F = true;
-            shape.m_Vertex3F = v3;
+            shape.m_hasVertex3 = true;
+            shape.m_vertex3 = v3;
             ground->CreateFixture(&shape, 0.0f);
 
             shape.Set(v2, v3);
             shape.m_hasVertex0 = true;
-            shape.m_hasVertex3F = true;
+            shape.m_hasVertex3 = true;
             shape.m_vertex0 = v1;
-            shape.m_Vertex3F = v4;
+            shape.m_vertex3 = v4;
             ground->CreateFixture(&shape, 0.0f);
 
             shape.Set(v3, v4);
             shape.m_hasVertex0 = true;
-            shape.m_hasVertex3F = true;
+            shape.m_hasVertex3 = true;
             shape.m_vertex0 = v2;
-            shape.m_Vertex3F = v5;
+            shape.m_vertex3 = v5;
             ground->CreateFixture(&shape, 0.0f);
 
             shape.Set(v4, v5);
             shape.m_hasVertex0 = true;
-            shape.m_hasVertex3F = true;
+            shape.m_hasVertex3 = true;
             shape.m_vertex0 = v3;
-            shape.m_Vertex3F = v6;
+            shape.m_vertex3 = v6;
             ground->CreateFixture(&shape, 0.0f);
 
             shape.Set(v5, v6);
             shape.m_hasVertex0 = true;
-            shape.m_hasVertex3F = true;
+            shape.m_hasVertex3 = true;
             shape.m_vertex0 = v4;
-            shape.m_Vertex3F = v7;
+            shape.m_vertex3 = v7;
             ground->CreateFixture(&shape, 0.0f);
 
             shape.Set(v6, v7);