diff --git a/float_models/CMakeLists.txt b/float_models/CMakeLists.txt
index 2831e7a..a3d9458 100644
--- a/float_models/CMakeLists.txt
+++ b/float_models/CMakeLists.txt
@@ -86,8 +86,8 @@
     ::mobilenet_v1_bytecode_module_static
     ::mobilenet_v1_bytecode_module_static_c
     ::mobilenet_input_c
-    samples::util::util
     iree::vm::bytecode_module
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=200k"
 )
@@ -101,8 +101,7 @@
     ::mobilenet_v1_c_module_static_c
     ::mobilenet_v1_c_module_static_emitc
     ::mobilenet_input_c
-    samples::util::util
-    "m"
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=200k"
   COPTS
@@ -122,7 +121,7 @@
     ::mnist_bytecode_module_static_c
     ::mnist_input_c
     iree::vm::bytecode_module
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=100k"
 )
@@ -136,8 +135,7 @@
     ::mnist_c_module_static_c
     ::mnist_c_module_static_emitc
     ::mnist_input_c
-    samples::util::util
-    "m"
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=100k"
   COPTS
diff --git a/float_models/iree_exec/mnist.h b/float_models/iree_exec/mnist.h
index 2f866e5..08a3515 100644
--- a/float_models/iree_exec/mnist.h
+++ b/float_models/iree_exec/mnist.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "samples/util/util.h"
+#include "model_util/util.h"
 
 typedef struct {
   int best_idx;
diff --git a/float_models/iree_exec/mobilenet_v1.h b/float_models/iree_exec/mobilenet_v1.h
index 0196c6f..b058572 100644
--- a/float_models/iree_exec/mobilenet_v1.h
+++ b/float_models/iree_exec/mobilenet_v1.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "samples/util/util.h"
+#include "model_util/util.h"
 
 typedef struct {
   int best_idx;
diff --git a/quant_models/CMakeLists.txt b/quant_models/CMakeLists.txt
index c9a9912..0c5dc39 100644
--- a/quant_models/CMakeLists.txt
+++ b/quant_models/CMakeLists.txt
@@ -98,7 +98,7 @@
     ::mobilenet_v1_bytecode_module_static
     ::mobilenet_v1_bytecode_module_static_c
     iree::vm::bytecode_module
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
 )
@@ -112,7 +112,7 @@
     ::mobilenet_quant_input_c
     ::mobilenet_v1_c_module_static_c
     ::mobilenet_v1_c_module_static_emitc
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
   COPTS
@@ -132,7 +132,7 @@
     ::mobilenet_v2_bytecode_module_static
     ::mobilenet_v2_bytecode_module_static_c
     iree::vm::bytecode_module
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
 )
@@ -146,7 +146,7 @@
     ::mobilenet_quant_input_c
     ::mobilenet_v2_c_module_static_c
     ::mobilenet_v2_c_module_static_emitc
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=300k"
   COPTS
@@ -166,7 +166,7 @@
     ::person_detection_bytecode_module_static_c
     ::person_detection_quant_input_c
     iree::vm::bytecode_module
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=128k"
 )
@@ -180,7 +180,7 @@
     ::person_detection_c_module_static_c
     ::person_detection_c_module_static_emitc
     ::person_detection_quant_input_c
-    samples::util::util
+    model_util::util
   LINKOPTS
     "LINKER:--defsym=__stack_size__=128k"
   COPTS
diff --git a/quant_models/iree_exec/mobilenet_v1.h b/quant_models/iree_exec/mobilenet_v1.h
index c26a550..4e6987f 100644
--- a/quant_models/iree_exec/mobilenet_v1.h
+++ b/quant_models/iree_exec/mobilenet_v1.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "samples/util/util.h"
+#include "model_util/util.h"
 
 typedef struct {
   int best_idx;
diff --git a/quant_models/iree_exec/mobilenet_v2.h b/quant_models/iree_exec/mobilenet_v2.h
index 049fe00..c111229 100644
--- a/quant_models/iree_exec/mobilenet_v2.h
+++ b/quant_models/iree_exec/mobilenet_v2.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "samples/util/util.h"
+#include "model_util/util.h"
 
 typedef struct {
   int best_idx;
diff --git a/quant_models/iree_exec/person_detection.h b/quant_models/iree_exec/person_detection.h
index d089e50..8924f68 100644
--- a/quant_models/iree_exec/person_detection.h
+++ b/quant_models/iree_exec/person_detection.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "samples/util/util.h"
+#include "model_util/util.h"
 
 typedef struct {
   int8_t non_person_score;