diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp
index 726abe4f2ee116f410e537a1b30709cd5ab11e61..86b3e7eb93bb6040af97007741853ef6474ddb3d 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp
@@ -368,7 +368,7 @@ int main() {
 
   std::string input_path = dir_prefix + std::string("input.bin");
   // void* input = readTrainedWeights(input_path.c_str(), 0,5000,3,32,32);
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   uint8_t *labels = readLabels(labels_path.c_str(), 5000);
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp
index 2aad203263ab079ab72c85fa36ef2251f6db23ba..bc1f9fa18e6faeed60d171ec90c4dc891136b1ad 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp
@@ -415,7 +415,7 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet2_cifar10/";
 
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp
index 811edbd4940e4a9b42ad551ca9a9ecd29191305b..59161a118d6e9baa9196d045a072993c733b3697 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp
@@ -415,7 +415,7 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet2_cifar10/";
 
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
index 0d50f566f934ff5b89c5224fe26176cacc33f3cb..466e311577d1e1d46d2e0c6a2a624cc21900be4f 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
@@ -463,9 +463,9 @@ typedef struct __attribute__((__packed__)) {
 int main() {
 
   std::string dir_prefix =
-      std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet_tune/";
-  std::string input_path = dir_prefix + std::string("test_input.bin");
-  std::string labels_path = dir_prefix + std::string("test_labels.bin");
+      std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet/";
+  std::string input_path = dir_prefix + std::string("input.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 11, 11);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp
index c8d5d2437e1c9c50198096b4c0b8fd6201b18e1d..340e0aa1194ac57e96eadd1669a97fa25fdd0c44 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp
@@ -463,10 +463,10 @@ typedef struct __attribute__((__packed__)) {
 int main() {
 
   std::string dir_prefix =
-      std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet_tune/";
+      std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet/";
 
-  std::string input_path = dir_prefix + std::string("test_input.bin");
-  std::string labels_path = dir_prefix + std::string("test_labels.bin");
+  std::string input_path = dir_prefix + std::string("input.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 11, 11);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
index f24be84b318789ab0275bae0f1e552b1c5cf5c81..3613e9f1325d73e7515a88f3e198bcd32821224c 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
@@ -269,30 +269,30 @@ int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/lenet_mnist/";
 
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
 
-  std::string conv2d_1_w_path = dir_prefix + std::string("conv1.bin");
+  std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 1, 5, 5);
-  std::string conv2d_1_b_path = dir_prefix + std::string("conv1_bias.bin");
+  std::string conv2d_1_b_path = dir_prefix + std::string("conv2d_1_b.bin");
   void *conv2d_1_b =
       readTrainedWeights(conv2d_1_b_path.c_str(), 0, 1, 32, 1, 1);
-  std::string conv2d_2_w_path = dir_prefix + std::string("conv2.bin");
+  std::string conv2d_2_w_path = dir_prefix + std::string("conv2d_2_w.bin");
   void *conv2d_2_w =
       readTrainedWeights(conv2d_2_w_path.c_str(), 0, 64, 32, 5, 5);
-  std::string conv2d_2_b_path = dir_prefix + std::string("conv2_bias.bin");
+  std::string conv2d_2_b_path = dir_prefix + std::string("conv2d_2_b.bin");
   void *conv2d_2_b =
       readTrainedWeights(conv2d_2_b_path.c_str(), 0, 1, 64, 1, 1);
-  std::string dense_1_w_path = dir_prefix + std::string("fc1.bin");
+  std::string dense_1_w_path = dir_prefix + std::string("dense_1_w.bin");
   void *dense_1_w =
       readTrainedWeights(dense_1_w_path.c_str(), 0, 1, 1, 3136, 1024);
-  std::string dense_1_b_path = dir_prefix + std::string("fc1_bias.bin");
+  std::string dense_1_b_path = dir_prefix + std::string("dense_1_b.bin");
   void *dense_1_b =
       readTrainedWeights(dense_1_b_path.c_str(), 0, 1, 1024, 1, 1);
-  std::string dense_2_w_path = dir_prefix + std::string("fc2.bin");
+  std::string dense_2_w_path = dir_prefix + std::string("dense_2_w.bin");
   void *dense_2_w =
       readTrainedWeights(dense_2_w_path.c_str(), 0, 1, 1, 1024, 10);
-  std::string dense_2_b_path = dir_prefix + std::string("fc2_bias.bin");
+  std::string dense_2_b_path = dir_prefix + std::string("dense_2_b.bin");
   void *dense_2_b = readTrainedWeights(dense_2_b_path.c_str(), 0, 1, 10, 1, 1);
   void *input = readTrainedWeights(input_path.c_str(), 0, 5000, 1, 28, 28);
 
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp
index a4dc5eb9c290b234407bdb723b1bab503c11dcec..9a8bfbc68fcaad4b369223c53e98121e9934b27d 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp
@@ -269,30 +269,30 @@ int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/lenet_mnist/";
 
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
 
-  std::string conv2d_1_w_path = dir_prefix + std::string("conv1.bin");
+  std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 1, 5, 5);
-  std::string conv2d_1_b_path = dir_prefix + std::string("conv1_bias.bin");
+  std::string conv2d_1_b_path = dir_prefix + std::string("conv2d_1_b.bin");
   void *conv2d_1_b =
       readTrainedWeights(conv2d_1_b_path.c_str(), 0, 1, 32, 1, 1);
-  std::string conv2d_2_w_path = dir_prefix + std::string("conv2.bin");
+  std::string conv2d_2_w_path = dir_prefix + std::string("conv2d_2_w.bin");
   void *conv2d_2_w =
       readTrainedWeights(conv2d_2_w_path.c_str(), 0, 64, 32, 5, 5);
-  std::string conv2d_2_b_path = dir_prefix + std::string("conv2_bias.bin");
+  std::string conv2d_2_b_path = dir_prefix + std::string("conv2d_2_b.bin");
   void *conv2d_2_b =
       readTrainedWeights(conv2d_2_b_path.c_str(), 0, 1, 64, 1, 1);
-  std::string dense_1_w_path = dir_prefix + std::string("fc1.bin");
+  std::string dense_1_w_path = dir_prefix + std::string("dense_1_w.bin");
   void *dense_1_w =
       readTrainedWeights(dense_1_w_path.c_str(), 0, 1, 1, 3136, 1024);
-  std::string dense_1_b_path = dir_prefix + std::string("fc1_bias.bin");
+  std::string dense_1_b_path = dir_prefix + std::string("dense_1_b.bin");
   void *dense_1_b =
       readTrainedWeights(dense_1_b_path.c_str(), 0, 1, 1024, 1, 1);
-  std::string dense_2_w_path = dir_prefix + std::string("fc2.bin");
+  std::string dense_2_w_path = dir_prefix + std::string("dense_2_w.bin");
   void *dense_2_w =
       readTrainedWeights(dense_2_w_path.c_str(), 0, 1, 1, 1024, 10);
-  std::string dense_2_b_path = dir_prefix + std::string("fc2_bias.bin");
+  std::string dense_2_b_path = dir_prefix + std::string("dense_2_b.bin");
   void *dense_2_b = readTrainedWeights(dense_2_b_path.c_str(), 0, 1, 10, 1, 1);
   //  void* input = readTrainedWeights(input_path.c_str(), 0, 5000,1,28,28);
 
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp
index 9941ac977111ccbc39c4a06c3656415aafb03abd..d9f96cfdac18876b676369ba2c7c0e8f4e2ea986 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp
@@ -1232,7 +1232,7 @@ int main() {
 
   std::string input_path = dir_prefix + std::string("input.bin");
   void *input = readTrainedWeights(input_path.c_str(), 0, 5000, 3, 32, 32);
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   uint32_t *labels = readLabels3(labels_path.c_str(), 5000);
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp
index a0e62d3b5859550d74b7960714ed3d69d81b5fd7..6bf5a58135d7fe7101c359a29f8909937d9bc8c7 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp
@@ -1305,7 +1305,7 @@ int main() {
 
   std::string input_path = dir_prefix + std::string("input.bin");
   // void* input = readTrainedWeights(input_path.c_str(), 0,5000,3,32,32);
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   // uint32_t* labels = readLabels3(labels_path.c_str(),5000);
 
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
index 78b762a210fa8f42ea59581cfc49c15d99ea14a7..f1533c75b4b838f5b86dfbf915cfd359b9682636 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
@@ -831,7 +831,7 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar10/";
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp
index 11b67b1e5cbf06644f8318aa0b194623b33e4d61..059bff6d22a51853090700072d4cf3915ed5f796 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp
@@ -831,7 +831,7 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar10/";
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
index f931cc76b4730f52942afaa99b460b469b72d245..41fe9ae0f34c5c5086f8c16491f5035d5a382702 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
@@ -832,7 +832,7 @@ int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar100/";
 
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp
index 3f2175a7f4e78e284cde699041788e1b641b3bc9..3a853d3a0f5399057164594951a884222a02e105 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp
@@ -832,7 +832,7 @@ int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar100/";
 
   std::string input_path = dir_prefix + std::string("input.bin");
-  std::string labels_path = dir_prefix + std::string("labels32.bin");
+  std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp
index 18eb7a58dbc7bba593b998f5b3cc84ac8077bebe..2bd129300adc5ffb609df1e46c951630d682b883 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp
@@ -878,7 +878,7 @@ typedef struct __attribute__((__packed__)) {
 int main() {
 
   std::string dir_prefix =
-      std::string(MODEL_PARAMS_DIR) + "/vgg16_imagenet_tune/";
+      std::string(MODEL_PARAMS_DIR) + "/vgg16_imagenet/";
   std::string input_path = dir_prefix + std::string("input.bin");
   std::string labels_path = dir_prefix + std::string("labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");