diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt
index a76a95644dae2755a9599a57259a1f9b2ed604b7..433edbfda742d3be9915eade7b0a455398a501dc 100644
--- a/paddle/framework/CMakeLists.txt
+++ b/paddle/framework/CMakeLists.txt
@@ -19,10 +19,10 @@ cc_test(op_desc_test SRCS op_desc_test.cc DEPS op_desc protobuf)
 cc_library(operator SRCS operator.cc DEPS op_desc device_context tensor)
 cc_test(operator_test SRCS operator_test.cc DEPS operator op_registry)
 
-cc_library(grad_op_creator SRCS grad_op_creator.cc DEPS op_proto operator)
-cc_library(op_registry SRCS op_registry.cc DEPS op_desc grad_op_creator)
+cc_library(grad_op_builder SRCS grad_op_builder.cc DEPS op_proto operator)
+cc_library(op_registry SRCS op_registry.cc DEPS op_desc grad_op_builder)
 cc_test(op_registry_test SRCS op_registry_test.cc DEPS op_registry)
-cc_test(grad_op_creator_test SRCS grad_op_creator_test.cc DEPS grad_op_creator op_registry add_op)
+cc_test(grad_op_builder_test SRCS grad_op_builder_test.cc DEPS grad_op_builder op_registry add_op)
 
 py_proto_compile(framework_py_proto SRCS attr_type.proto op_proto.proto op_desc.proto)
 # Generate an empty __init__.py to make framework_py_proto as a valid python module.
diff --git a/paddle/framework/grad_op_builder.cc b/paddle/framework/grad_op_builder.cc
index d9ec8a10a5291724d02f6b7e9dc897b7982e6da0..6235be75f27dadb65de663ff1b3caf26a649f6cb 100644
--- a/paddle/framework/grad_op_builder.cc
+++ b/paddle/framework/grad_op_builder.cc
@@ -20,7 +20,7 @@ namespace framework {
 
 OperatorBase* GradOpBuilder::Build() {
   BuildOpInOutArgList();
-  std::string grad_op_type = OpRegistry::grad_ops().at(op->type_);
+  std::string grad_op_type = OpRegistry::grad_ops().at(op_->type_);
   OperatorBase* grad_op = OpRegistry::op_creators().at(grad_op_type)();
   grad_op->type_ = grad_op_type;
   CompleteGradOp(grad_op);
diff --git a/paddle/framework/grad_op_creator_test.cc b/paddle/framework/grad_op_builder_test.cc
similarity index 89%
rename from paddle/framework/grad_op_creator_test.cc
rename to paddle/framework/grad_op_builder_test.cc
index 27ac65813120a2a682535a02bcecb882c4a7640d..288a7841cd7c9212d8fa230e38d49dfc26e76256 100644
--- a/paddle/framework/grad_op_creator_test.cc
+++ b/paddle/framework/grad_op_builder_test.cc
@@ -1,4 +1,4 @@
-#include "paddle/framework/grad_op_creator.h"
+#include "paddle/framework/grad_op_builder.h"
 #include <gtest/gtest.h>
 #include "paddle/framework/op_registry.h"
 #include "paddle/framework/operator.h"
@@ -8,7 +8,7 @@ USE_OP(add_two);
 namespace paddle {
 namespace framework {
 
-TEST(GradOpCreator, AddTwo) {
+TEST(GradOpBuilder, AddTwo) {
   std::shared_ptr<OperatorBase> add_op(
       OpRegistry::CreateOp("add_two", {"x", "y"}, {"out"}, {}));
   std::shared_ptr<OperatorBase> grad_add_op = OpRegistry::CreateGradOp(add_op);
diff --git a/paddle/framework/op_registry.h b/paddle/framework/op_registry.h
index 31a4151851f4dd2fd65f7a580785ca698264f6d8..f16deae028d76dc40d6bc589648b461c430c3c98 100644
--- a/paddle/framework/op_registry.h
+++ b/paddle/framework/op_registry.h
@@ -20,7 +20,7 @@ limitations under the License. */
 #include <unordered_map>
 #include <unordered_set>
 #include "paddle/framework/attr_checker.h"
-#include "paddle/framework/grad_op_creator.h"
+#include "paddle/framework/grad_op_builder.h"
 #include "paddle/framework/op_desc.pb.h"
 #include "paddle/framework/scope.h"