diff --git a/paddle/operators/conv_op.cc b/paddle/operators/conv2d_op.cc
similarity index 95%
rename from paddle/operators/conv_op.cc
rename to paddle/operators/conv2d_op.cc
index 934f153e727ee8b532cfc51a9b5d6b776c04f843..b74b42546dbfcd68f08a3521244cda15905ff500 100644
--- a/paddle/operators/conv_op.cc
+++ b/paddle/operators/conv2d_op.cc
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/operators/gemm_conv_op.h"
+#include "paddle/operators/gemm_conv2d_op.h"
 
 namespace paddle {
 namespace operators {
@@ -116,7 +116,7 @@ namespace ops = paddle::operators;
 REGISTER_OP(conv2d, ops::Conv2DOp, ops::Conv2DOpMaker, conv2d_grad,
             ops::Conv2DOpGrad);
 
-REGISTER_OP_CPU_KERNEL(conv2d,
-                       ops::GemmConvKernel<paddle::platform::CPUPlace, float>);
 REGISTER_OP_CPU_KERNEL(
-    conv2d_grad, ops::GemmConvGradKernel<paddle::platform::CPUPlace, float>);
+    conv2d, ops::GemmConv2dKernel<paddle::platform::CPUPlace, float>);
+REGISTER_OP_CPU_KERNEL(
+    conv2d_grad, ops::GemmConvGrad2dKernel<paddle::platform::CPUPlace, float>);
diff --git a/paddle/operators/conv_op.cu b/paddle/operators/conv2d_op.cu
similarity index 76%
rename from paddle/operators/conv_op.cu
rename to paddle/operators/conv2d_op.cu
index a15adecda46cae7617a3059b78a2e230c2258ec2..7666f4c4c123f5758c722a8e7803f6b866bd67b1 100644
--- a/paddle/operators/conv_op.cu
+++ b/paddle/operators/conv2d_op.cu
@@ -12,11 +12,11 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/operators/gemm_conv_op.h"
+#include "paddle/operators/gemm_conv2d_op.h"
 
 namespace ops = paddle::operators;
 
-REGISTER_OP_GPU_KERNEL(conv2d,
-                       ops::GemmConvKernel<paddle::platform::GPUPlace, float>);
 REGISTER_OP_GPU_KERNEL(
-    conv2d_grad, ops::GemmConvGradKernel<paddle::platform::GPUPlace, float>);
+    conv2d, ops::GemmConv2dKernel<paddle::platform::GPUPlace, float>);
+REGISTER_OP_GPU_KERNEL(
+    conv2d_grad, ops::GemmConvGrad2dKernel<paddle::platform::GPUPlace, float>);
diff --git a/paddle/operators/gemm_conv_op.h b/paddle/operators/gemm_conv2d_op.h
similarity index 98%
rename from paddle/operators/gemm_conv_op.h
rename to paddle/operators/gemm_conv2d_op.h
index b125698c6de22647ea59fce5ca2e713bb6b28bbb..71bf09bb7e70ad10ef650481ee962a21624776e5 100644
--- a/paddle/operators/gemm_conv_op.h
+++ b/paddle/operators/gemm_conv2d_op.h
@@ -25,7 +25,7 @@ namespace operators {
 using Tensor = framework::Tensor;
 
 template <typename Place, typename T>
-class GemmConvKernel : public framework::OpKernel {
+class GemmConv2dKernel : public framework::OpKernel {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
     const Tensor* input = context.Input<Tensor>("Input");
@@ -101,7 +101,7 @@ class GemmConvKernel : public framework::OpKernel {
 };
 
 template <typename Place, typename T>
-class GemmConvGradKernel : public framework::OpKernel {
+class GemmConvGrad2dKernel : public framework::OpKernel {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
     const Tensor* input = context.Input<Tensor>("Input");