diff --git a/samples/benchmark/main.cc b/samples/benchmark/main.cc
index 861d2bd..1a6c366 100644
--- a/samples/benchmark/main.cc
+++ b/samples/benchmark/main.cc
@@ -120,8 +120,8 @@ main(int argc, char** argv)
     if (pid == 0) {
         acHostMeshCreate(info, &model);
         acHostMeshCreate(info, &candidate);
-        acMeshRandomize(&model);
-        acMeshRandomize(&candidate);
+        acHostMeshRandomize(&model);
+        acHostMeshRandomize(&candidate);
     }*/
 
     // GPU alloc & compute
@@ -131,7 +131,7 @@ main(int argc, char** argv)
     /*
     AcMesh model;
     acHostMeshCreate(info, &model);
-    acMeshRandomize(&model);
+    acHostMeshRandomize(&model);
     acGridLoadMesh(STREAM_DEFAULT, model);
     */
 
@@ -146,7 +146,7 @@ main(int argc, char** argv)
     // Verify
     if (pid == 0) {
         acHostIntegrateStep(model, FLT_EPSILON);
-        acMeshApplyPeriodicBounds(&model);
+        acHostMeshApplyPeriodicBounds(&model);
 
         AcResult retval = acVerifyMesh(model, candidate);
         acHostMeshDestroy(&model);
diff --git a/samples/mpitest/main.cc b/samples/mpitest/main.cc
index e690352..2ef4c0e 100644
--- a/samples/mpitest/main.cc
+++ b/samples/mpitest/main.cc
@@ -49,8 +49,8 @@ main(void)
     if (pid == 0) {
         acHostMeshCreate(info, &model);
         acHostMeshCreate(info, &candidate);
-        acMeshRandomize(&model);
-        acMeshRandomize(&candidate);
+        acHostMeshRandomize(&model);
+        acHostMeshRandomize(&candidate);
     }
 
     // GPU alloc & compute
@@ -61,10 +61,10 @@ main(void)
     acGridPeriodicBoundconds(STREAM_DEFAULT);
     acGridStoreMesh(STREAM_DEFAULT, &candidate);
     if (pid == 0) {
-        acMeshApplyPeriodicBounds(&model);
+        acHostMeshApplyPeriodicBounds(&model);
         const AcResult res = acVerifyMesh("Boundconds", model, candidate);
         ERRCHK_ALWAYS(res == AC_SUCCESS);
-        acMeshRandomize(&model);
+        acHostMeshRandomize(&model);
     }
 
     // Integration
@@ -74,10 +74,10 @@ main(void)
     acGridStoreMesh(STREAM_DEFAULT, &candidate);
     if (pid == 0) {
         acHostIntegrateStep(model, FLT_EPSILON);
-        acMeshApplyPeriodicBounds(&model);
+        acHostMeshApplyPeriodicBounds(&model);
         const AcResult res = acVerifyMesh("Integration", model, candidate);
         ERRCHK_ALWAYS(res == AC_SUCCESS);
-        acMeshRandomize(&model);
+        acHostMeshRandomize(&model);
     }
 
     // Scalar reductions
diff --git a/samples/standalone_mpi/main.cc b/samples/standalone_mpi/main.cc
index 23080af..897e595 100644
--- a/samples/standalone_mpi/main.cc
+++ b/samples/standalone_mpi/main.cc
@@ -445,7 +445,7 @@ main(int argc, char** argv)
 #endif
         }
 
-        acMeshApplyPeriodicBounds(&mesh);
+        acHostMeshApplyPeriodicBounds(&mesh);
         if (start_step == 0) {
             save_mesh(mesh, 0, t_step);
         }
diff --git a/src/core/device.cc b/src/core/device.cc
index 123dee2..d4fdafe 100644
--- a/src/core/device.cc
+++ b/src/core/device.cc
@@ -1290,7 +1290,7 @@ acGridRandomize(void)
 
     AcMesh host;
     acHostMeshCreate(grid.submesh.info, &host);
-    acMeshRandomize(&host);
+    acHostMeshRandomize(&host);
     acDeviceLoadMesh(grid.device, STREAM_DEFAULT, host);
     acHostMeshDestroy(&host);
 
diff --git a/src/utils/modelsolver.c b/src/utils/modelsolver.c
index 3bed567..0a20e3b 100644
--- a/src/utils/modelsolver.c
+++ b/src/utils/modelsolver.c
@@ -30,7 +30,7 @@
 #include <stdbool.h>
 
 #include "errchk.h"
-#include "memory.h" // acHostMeshCreate, acHostMeshDestroy, acMeshApplyPeriodicBounds
+#include "memory.h" // acHostMeshCreate, acHostMeshDestroy, acHostMeshApplyPeriodicBounds
 
 // Standalone flags
 #define LDENSITY (1)