diff --git a/src/tim/vx/ops/deconv2d_test.cc b/src/tim/vx/ops/deconv2d_test.cc
index 6fc75ad..4402685 100644
--- a/src/tim/vx/ops/deconv2d_test.cc
+++ b/src/tim/vx/ops/deconv2d_test.cc
@@ -17,7 +17,7 @@ size_t element_count(const tim::vx::ShapeType& shape) {
 
 }  // namespace
 
-TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
+TEST(DeConv2d, shape_3_3_2_1_float_depthwise) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -55,7 +55,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
     EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4));
     EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::DeConv2d>(
+    auto op = graph->CreateOperation<tim::vx::ops::DeConv2d>(
         2,
         tim::vx::PadType::SAME,
         std::array<uint32_t, 2>({3, 3}),    /*ksize*/
@@ -63,7 +63,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
         std::array<uint32_t, 2>({1, 1}),    /*dilation*/
         std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/
         2/*group*/);
-    (*add).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
+    (*op).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -85,7 +85,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
     EXPECT_EQ(golden, output_data) << "Result mismatch";
 }
 
-TEST(deconv2d, shape_3_3_1_1_float) {
+TEST(DeConv2d, shape_3_3_1_1_float) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -114,7 +114,7 @@ TEST(deconv2d, shape_3_3_1_1_float) {
     EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4));
     EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::DeConv2d>(
+    auto op = graph->CreateOperation<tim::vx::ops::DeConv2d>(
         1,
         tim::vx::PadType::SAME,
         std::array<uint32_t, 2>({3, 3}),    /*ksize*/
@@ -122,7 +122,7 @@ TEST(deconv2d, shape_3_3_1_1_float) {
         std::array<uint32_t, 2>({1, 1}),    /*dilation*/
         std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/
         1/*group*/);
-    (*add).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
+    (*op).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -135,4 +135,4 @@ TEST(deconv2d, shape_3_3_1_1_float) {
     };
 
     EXPECT_EQ(golden, output_data) << "Result mismatch";
-}
\ No newline at end of file
+}
diff --git a/src/tim/vx/ops/instancenormalization_test.cc b/src/tim/vx/ops/instancenormalization_test.cc
index 18d6d47..4123d7a 100644
--- a/src/tim/vx/ops/instancenormalization_test.cc
+++ b/src/tim/vx/ops/instancenormalization_test.cc
@@ -40,7 +40,7 @@ template<typename T>
 }
 }
 
-TEST(instance_norm, shape_3_6_1_float) {
+TEST(InstanceNorm, shape_3_6_1_float) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -97,7 +97,7 @@ TEST(instance_norm, shape_3_6_1_float) {
     EXPECT_TRUE(ArraysMatch(golden, output, 1e-5f));
 }
 
-TEST(instance_norm, shape_3_3_6_1_float) {
+TEST(InstanceNorm, shape_3_3_6_1_float) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
diff --git a/src/tim/vx/ops/relational_operations_test.cc b/src/tim/vx/ops/relational_operations_test.cc
index 87e4593..f590a9c 100644
--- a/src/tim/vx/ops/relational_operations_test.cc
+++ b/src/tim/vx/ops/relational_operations_test.cc
@@ -27,7 +27,7 @@
 
 #include "gtest/gtest.h"
 
-TEST(OP, equal_shape_1_uint8) {
+TEST(Equal, shape_1_uint8) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -50,8 +50,8 @@ TEST(OP, equal_shape_1_uint8) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()));
 
-    auto add = graph->CreateOperation<tim::vx::ops::Equal>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::Equal>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -63,7 +63,7 @@ TEST(OP, equal_shape_1_uint8) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, notequal_shape_5_fp32) {
+TEST(NotEqual, shape_5_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -85,8 +85,8 @@ TEST(OP, notequal_shape_5_fp32) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::NotEqual>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::NotEqual>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -98,7 +98,7 @@ TEST(OP, notequal_shape_5_fp32) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, less_shape_5_1_fp32) {
+TEST(Less, shape_5_1_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -120,8 +120,8 @@ TEST(OP, less_shape_5_1_fp32) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::Less>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::Less>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -133,7 +133,7 @@ TEST(OP, less_shape_5_1_fp32) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, greaterorequal_shape_5_2_1_fp32) {
+TEST(GreaterOrEqual, shape_5_2_1_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -159,8 +159,8 @@ TEST(OP, greaterorequal_shape_5_2_1_fp32) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::GreaterOrEqual>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::GreaterOrEqual>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -172,7 +172,7 @@ TEST(OP, greaterorequal_shape_5_2_1_fp32) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, greater_shape_5_2_1_1_fp32) {
+TEST(Greater, shape_5_2_1_1_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -198,8 +198,8 @@ TEST(OP, greater_shape_5_2_1_1_fp32) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::Greater>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::Greater>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -211,7 +211,7 @@ TEST(OP, greater_shape_5_2_1_1_fp32) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, lessorequal_shape_1_5_2_1_1_fp32) {
+TEST(LessOrEqual, shape_1_5_2_1_1_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -237,8 +237,8 @@ TEST(OP, lessorequal_shape_1_5_2_1_1_fp32) {
     EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
     EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::LessOrEqual>();
-    (*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::LessOrEqual>();
+    (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
diff --git a/src/tim/vx/ops/reorg_test.cc b/src/tim/vx/ops/reorg_test.cc
index 79cf424..ee355ba 100644
--- a/src/tim/vx/ops/reorg_test.cc
+++ b/src/tim/vx/ops/reorg_test.cc
@@ -29,7 +29,7 @@
 
 // FIXME (KC) : There seems to be a limitation that Channel needs to be >= 4,
 //              also stride other than 2 is not tested
-TEST(OP, reorg_shape_4_4_4_1_u8) {
+TEST(Reorg, shape_4_4_4_1_u8) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -59,8 +59,8 @@ TEST(OP, reorg_shape_4_4_4_1_u8) {
 
     EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size()));
 
-    auto add = graph->CreateOperation<tim::vx::ops::Reorg>(2);
-    (*add).BindInputs({input_tensor}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::Reorg>(2);
+    (*op).BindInputs({input_tensor}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());
@@ -69,7 +69,7 @@ TEST(OP, reorg_shape_4_4_4_1_u8) {
     EXPECT_EQ(golden, output);
 }
 
-TEST(OP, reorg_shape_4_4_4_1_fp32) {
+TEST(Reorg, shape_4_4_4_1_fp32) {
     auto ctx = tim::vx::Context::Create();
     auto graph = ctx->CreateGraph();
 
@@ -98,8 +98,8 @@ TEST(OP, reorg_shape_4_4_4_1_fp32) {
 
     EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size()*4));
 
-    auto add = graph->CreateOperation<tim::vx::ops::Reorg>(2);
-    (*add).BindInputs({input_tensor}).BindOutputs({output_tensor});
+    auto op = graph->CreateOperation<tim::vx::ops::Reorg>(2);
+    (*op).BindInputs({input_tensor}).BindOutputs({output_tensor});
 
     EXPECT_TRUE(graph->Compile());
     EXPECT_TRUE(graph->Run());