diff --git a/src/gmio_support/stl_occ.cpp b/src/gmio_support/stl_occ.cpp
index 390683c..8945a1b 100644
--- a/src/gmio_support/stl_occ.cpp
+++ b/src/gmio_support/stl_occ.cpp
@@ -89,7 +89,7 @@ void gmio_stl_set_occmesh(
     std::memset(mesh, 0, sizeof(gmio_stl_mesh_t));
     mesh->cookie = &meshCookie;
     mesh->triangle_count = meshCookie.mesh()->NbTriangles(meshCookie.domainId());
-    mesh->get_triangle_func = internal::occmesh_get_triangle;
+    mesh->func_get_triangle = internal::occmesh_get_triangle;
 }
 
 gmio_stl_mesh gmio_stl_occmesh(const gmio_OccStlMeshDomain &meshCookie)
@@ -104,7 +104,7 @@ void gmio_stl_set_occmesh_creator(
 {
     std::memset(creator, 0, sizeof(gmio_stl_mesh_creator_t));
     creator->cookie = internal::occMeshPtr(mesh);
-    creator->add_triangle_func = internal::occmesh_add_triangle;
+    creator->func_add_triangle = internal::occmesh_add_triangle;
 }
 
 gmio_stl_mesh_creator gmio_stl_occmesh_creator(const Handle_StlMesh_Mesh &mesh)
diff --git a/src/gmio_support/stream_qt.cpp b/src/gmio_support/stream_qt.cpp
index 4bbf575..d3e3062 100644
--- a/src/gmio_support/stream_qt.cpp
+++ b/src/gmio_support/stream_qt.cpp
@@ -72,11 +72,11 @@ gmio_stream_t gmio_stream_qiodevice(QIODevice* device)
 {
     gmio_stream_t stream = { 0 };
     stream.cookie = device;
-    stream.at_end_func = gmio_stream_qiodevice_at_end;
-    stream.error_func = gmio_stream_qiodevice_error;
-    stream.read_func = gmio_stream_qiodevice_read;
-    stream.write_func = gmio_stream_qiodevice_write;
-    stream.size_func = gmio_stream_qiodevice_size;
-    stream.rewind_func = gmio_stream_qiodevice_rewind;
+    stream.func_at_end = gmio_stream_qiodevice_at_end;
+    stream.func_error = gmio_stream_qiodevice_error;
+    stream.func_read = gmio_stream_qiodevice_read;
+    stream.func_write = gmio_stream_qiodevice_write;
+    stream.func_size = gmio_stream_qiodevice_size;
+    stream.func_rewind = gmio_stream_qiodevice_rewind;
     return stream;
 }