diff --git a/src/Unittests/unittests_tutorials.cc b/src/Unittests/unittests_tutorials.cc
index 6ec4b36a..768cf485 100644
--- a/src/Unittests/unittests_tutorials.cc
+++ b/src/Unittests/unittests_tutorials.cc
@@ -619,20 +619,20 @@ TEST_F(OpenMeshTutorials, deleting_geometry_elements) {
   mesh.request_vertex_status();
 
   // generate vertices
-  MyMeshWithStatus::VertexHandle vhandle[8];
-  MyMeshWithStatus::FaceHandle   fhandle[6];
+  Mesh::VertexHandle vhandle[8];
+  Mesh::FaceHandle   fhandle[6];
 
-  vhandle[0] = mesh.add_vertex(MyMeshWithStatus::Point(-1, -1,  1));
-  vhandle[1] = mesh.add_vertex(MyMeshWithStatus::Point( 1, -1,  1));
-  vhandle[2] = mesh.add_vertex(MyMeshWithStatus::Point( 1,  1,  1));
-  vhandle[3] = mesh.add_vertex(MyMeshWithStatus::Point(-1,  1,  1));
-  vhandle[4] = mesh.add_vertex(MyMeshWithStatus::Point(-1, -1, -1));
-  vhandle[5] = mesh.add_vertex(MyMeshWithStatus::Point( 1, -1, -1));
-  vhandle[6] = mesh.add_vertex(MyMeshWithStatus::Point( 1,  1, -1));
-  vhandle[7] = mesh.add_vertex(MyMeshWithStatus::Point(-1,  1, -1));
+  vhandle[0] = mesh.add_vertex(Mesh::Point(-1, -1,  1));
+  vhandle[1] = mesh.add_vertex(Mesh::Point( 1, -1,  1));
+  vhandle[2] = mesh.add_vertex(Mesh::Point( 1,  1,  1));
+  vhandle[3] = mesh.add_vertex(Mesh::Point(-1,  1,  1));
+  vhandle[4] = mesh.add_vertex(Mesh::Point(-1, -1, -1));
+  vhandle[5] = mesh.add_vertex(Mesh::Point( 1, -1, -1));
+  vhandle[6] = mesh.add_vertex(Mesh::Point( 1,  1, -1));
+  vhandle[7] = mesh.add_vertex(Mesh::Point(-1,  1, -1));
 
   // generate (quadrilateral) faces
-  std::vector<MyMesh::VertexHandle>  tmp_face_vhandles;
+  std::vector<Mesh::VertexHandle>  tmp_face_vhandles;
   tmp_face_vhandles.clear();
   tmp_face_vhandles.push_back(vhandle[0]);
   tmp_face_vhandles.push_back(vhandle[1]);