diff --git a/paddle/function/CMakeLists.txt b/paddle/function/CMakeLists.txt
index 0697842bbef620b0b536b742d06db23e00a78eec..4660324423f2ded40d47a113ce68e6318be024f3 100644
--- a/paddle/function/CMakeLists.txt
+++ b/paddle/function/CMakeLists.txt
@@ -1,11 +1,11 @@
-file(GLOB h_files . *_op.h)
-file(GLOB cpp_files . *_op.cpp)
+file(GLOB h_files . *Op.h)
+file(GLOB cpp_files . *Op.cpp)
 
 list(APPEND h_files Function.h)
 list(APPEND cpp_files Function.cpp)
 
 if(WITH_GPU)
-    file(GLOB cu_files . *_op_gpu.cu)
+    file(GLOB cu_files . *OpGpu.cu)
     cuda_compile(cu_objs ${cu_files})
 endif()
 
@@ -15,9 +15,9 @@ add_library(paddle_test_main STATIC TestMain.cpp)
 
 if(WITH_GPU)
     # TODO:
-    # file(GLOB test_files . *_op_test.cpp)
+    # file(GLOB test_files . *OpTest.cpp)
     # add_executable(${test_bin} EXCLUDE_FROM_ALL ${test_files})
-    add_simple_unittest(cross_map_normal_op_test)
+    add_simple_unittest(CrossMapNormalOpTest)
 endif()
 
 add_style_check_target(paddle_function ${h_files})
diff --git a/paddle/function/cross_map_normal_op.cpp b/paddle/function/CrossMapNormalOp.cpp
similarity index 99%
rename from paddle/function/cross_map_normal_op.cpp
rename to paddle/function/CrossMapNormalOp.cpp
index a9c7693830542f0e0d852f629d210b92a5bf2069..f13eb78d27d900064f8cf0dc4194d1e34ded2b14 100644
--- a/paddle/function/cross_map_normal_op.cpp
+++ b/paddle/function/CrossMapNormalOp.cpp
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "cross_map_normal_op.h"
+#include "CrossMapNormalOp.h"
 #include "paddle/math/Vector.h"
 
 namespace paddle {
diff --git a/paddle/function/cross_map_normal_op.h b/paddle/function/CrossMapNormalOp.h
similarity index 100%
rename from paddle/function/cross_map_normal_op.h
rename to paddle/function/CrossMapNormalOp.h
diff --git a/paddle/function/cross_map_normal_op_gpu.cu b/paddle/function/CrossMapNormalOpGpu.cu
similarity index 99%
rename from paddle/function/cross_map_normal_op_gpu.cu
rename to paddle/function/CrossMapNormalOpGpu.cu
index aae4f461b6f57de6cadfe7c3a6d684c613cc037f..b33dd108348b7789c6e73bfe3b1ffbc448163ef7 100644
--- a/paddle/function/cross_map_normal_op_gpu.cu
+++ b/paddle/function/CrossMapNormalOpGpu.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "hl_base.h"
-#include "cross_map_normal_op.h"
+#include "CrossMapNormalOp.h"
 
 namespace paddle {
 
diff --git a/paddle/function/cross_map_normal_op_test.cpp b/paddle/function/CrossMapNormalOpTest.cpp
similarity index 98%
rename from paddle/function/cross_map_normal_op_test.cpp
rename to paddle/function/CrossMapNormalOpTest.cpp
index 22692691bdb64c23cbd2a479b2afb919672554f7..d65d9310affd7c9b7fee3118c79449870849c243 100644
--- a/paddle/function/cross_map_normal_op_test.cpp
+++ b/paddle/function/CrossMapNormalOpTest.cpp
@@ -15,6 +15,8 @@ limitations under the License. */
 #include <gtest/gtest.h>
 #include "FunctionTest.h"
 
+namespace paddle {
+
 TEST(CrossMapNormal, real) {
   for (size_t numSamples : {5, 32}) {
     for (size_t channels : {1, 5, 32}) {
@@ -69,3 +71,5 @@ TEST(CrossMapNormalGrad, real) {
     }
   }
 }
+
+}  // namespace paddle
diff --git a/paddle/function/Function.cpp b/paddle/function/Function.cpp
index 02880e5ea1acb85d8685f865a5745f7090db03d2..eb005e6744f2f343ad6feab84d5851b7760a1e58 100644
--- a/paddle/function/Function.cpp
+++ b/paddle/function/Function.cpp
@@ -32,14 +32,14 @@ real FuncConfig::get<real>(const std::string& key) const {
 
 template <>
 FuncConfig& FuncConfig::set<size_t>(const std::string& key, size_t v) {
-  CHECK(valueMap_.count(key) == 0) << "Duplicated value: " << key;
+  CHECK_EQ(valueMap_.count(key), 0) << "Duplicated value: " << key;
   valueMap_[key].s = v;
   return *this;
 }
 
 template <>
 FuncConfig& FuncConfig::set<real>(const std::string& key, real v) {
-  CHECK(valueMap_.count(key) == 0) << "Duplicated value: " << key;
+  CHECK_EQ(valueMap_.count(key), 0) << "Duplicated value: " << key;
   valueMap_[key].r = v;
   return *this;
 }
diff --git a/paddle/function/FunctionTest.h b/paddle/function/FunctionTest.h
index a8c5e412bd12df2ea0b4d6bd67072fb7d08591fe..a602bde57e5aed7452d5d1a8860b277203a682e1 100644
--- a/paddle/function/FunctionTest.h
+++ b/paddle/function/FunctionTest.h
@@ -95,8 +95,3 @@ protected:
 };
 
 }  // namespace paddle
-
-using paddle::FunctionCompare;
-using paddle::FuncConfig;
-using paddle::Dims;
-using paddle::Tensor;