diff --git a/oneflow/core/job/compiler.cpp b/oneflow/core/job/compiler.cpp
index 64fb0f6af3b9d44528c6d2b85bd391875be86044..f4a117163e58537aded7e7afd6220fb5ffb72439 100644
--- a/oneflow/core/job/compiler.cpp
+++ b/oneflow/core/job/compiler.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 #include "oneflow/core/job/global_for.h"
 #include "oneflow/core/persistence/tee_persistent_log_stream.h"
 #include "oneflow/core/graph/op_graph.h"
-#include "oneflow/core/job_completer/job_completer.h"
+#include "oneflow/core/job_rewriter/job_completer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job/job_build_and_infer_ctx.cpp b/oneflow/core/job/job_build_and_infer_ctx.cpp
index 41cbef480143e1d05ca004f5656dced4a071c861..e12f6fe867af43a5c2725f48bef2624d27d0fe9a 100644
--- a/oneflow/core/job/job_build_and_infer_ctx.cpp
+++ b/oneflow/core/job/job_build_and_infer_ctx.cpp
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/job/job_build_and_infer_ctx.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
-#include "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 #include "oneflow/core/framework/config_def.h"
 #include "oneflow/core/common/protobuf.h"
 #include "oneflow/core/job/mirrored_sig_infer_hint.h"
diff --git a/oneflow/core/job_completer/acc_grad.cpp b/oneflow/core/job_rewriter/acc_grad.cpp
similarity index 96%
rename from oneflow/core/job_completer/acc_grad.cpp
rename to oneflow/core/job_rewriter/acc_grad.cpp
index ebe70ceb96ff4905af3cffabcbb8b1ff08fe19bd..43a7f9e2e38cb7b8b9aeadce6eeb793906374e3e 100644
--- a/oneflow/core/job_completer/acc_grad.cpp
+++ b/oneflow/core/job_rewriter/acc_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/adam_optm.cpp b/oneflow/core/job_rewriter/adam_optm.cpp
similarity index 98%
rename from oneflow/core/job_completer/adam_optm.cpp
rename to oneflow/core/job_rewriter/adam_optm.cpp
index dc5780c5a8a90403efe41486bc90aa5f8e15bb42..f89e78a48974e6df9af46c548f6113e2629a53e6 100644
--- a/oneflow/core/job_completer/adam_optm.cpp
+++ b/oneflow/core/job_rewriter/adam_optm.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/add_keep_header_only_op_conf.cpp b/oneflow/core/job_rewriter/add_keep_header_only_op_conf.cpp
similarity index 98%
rename from oneflow/core/job_completer/add_keep_header_only_op_conf.cpp
rename to oneflow/core/job_rewriter/add_keep_header_only_op_conf.cpp
index 955627307a585a8f7a5054091f99b1f85cae4f46..24f6a4480edb0d235196b06a4acd64c0fa6920fc 100644
--- a/oneflow/core/job_completer/add_keep_header_only_op_conf.cpp
+++ b/oneflow/core/job_rewriter/add_keep_header_only_op_conf.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/add_keep_header_only_op_conf.h"
+#include "oneflow/core/job_rewriter/add_keep_header_only_op_conf.h"
 #include "oneflow/core/job/job_desc.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/add_keep_header_only_op_conf.h b/oneflow/core/job_rewriter/add_keep_header_only_op_conf.h
similarity index 81%
rename from oneflow/core/job_completer/add_keep_header_only_op_conf.h
rename to oneflow/core/job_rewriter/add_keep_header_only_op_conf.h
index 80ef25a006f27b0c276674da21d706a77c00b064..82a263b823212f106d31ea554dbf84cd2fb2745b 100644
--- a/oneflow/core/job_completer/add_keep_header_only_op_conf.h
+++ b/oneflow/core/job_rewriter/add_keep_header_only_op_conf.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_ADD_KEEP_HEADER_ONLY_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_ADD_KEEP_HEADER_ONLY_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_ADD_KEEP_HEADER_ONLY_H_
+#define ONEFLOW_CORE_JOB_REWRITER_ADD_KEEP_HEADER_ONLY_H_
 
 #include "oneflow/core/graph/op_graph.h"
 
@@ -27,4 +27,4 @@ void AddKeepHeaderOnlyOp(const OpGraph& op_graph, JobBuilder* job_builder);
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_ADD_KEEP_HEADER_ONLY_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_ADD_KEEP_HEADER_ONLY_H_
diff --git a/oneflow/core/job_completer/add_lbi_diff_watcher.cpp b/oneflow/core/job_rewriter/add_lbi_diff_watcher.cpp
similarity index 97%
rename from oneflow/core/job_completer/add_lbi_diff_watcher.cpp
rename to oneflow/core/job_rewriter/add_lbi_diff_watcher.cpp
index 477d541af54d80749cfbdcd4938e9bba2d46fbec..8ae6a718384c6c3447289d3e4f90d76d188dd10e 100644
--- a/oneflow/core/job_completer/add_lbi_diff_watcher.cpp
+++ b/oneflow/core/job_rewriter/add_lbi_diff_watcher.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/lbi_diff_watcher_info.pb.h"
 #include "oneflow/core/operator/operator.h"
 
diff --git a/oneflow/core/job_completer/auto_learning_rate.cpp b/oneflow/core/job_rewriter/auto_learning_rate.cpp
similarity index 98%
rename from oneflow/core/job_completer/auto_learning_rate.cpp
rename to oneflow/core/job_rewriter/auto_learning_rate.cpp
index 5d97f7a2c7e53750e13baddd6f6dbb428cdd6b8a..5e0c7ae4016add379f0c59850efac7ca39788c00 100644
--- a/oneflow/core/job_completer/auto_learning_rate.cpp
+++ b/oneflow/core/job_rewriter/auto_learning_rate.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/common/util.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job.pb.h"
 #include "oneflow/core/framework/framework.h"
 
diff --git a/oneflow/core/job_completer/auto_mixed_precision.cpp b/oneflow/core/job_rewriter/auto_mixed_precision.cpp
similarity index 99%
rename from oneflow/core/job_completer/auto_mixed_precision.cpp
rename to oneflow/core/job_rewriter/auto_mixed_precision.cpp
index 6216eee3953cf38393543931c043dd80b1233b1a..a648b1956778901f6c13e1410b8485fb0658f57f 100644
--- a/oneflow/core/job_completer/auto_mixed_precision.cpp
+++ b/oneflow/core/job_rewriter/auto_mixed_precision.cpp
@@ -13,13 +13,13 @@ 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 "oneflow/core/job_completer/auto_mixed_precision_lists.h"
+#include "oneflow/core/job_rewriter/auto_mixed_precision_lists.h"
 
 #include <algorithm>
 
 #include "oneflow/core/device/cuda_util.h"
 #include "oneflow/core/framework/framework.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job_desc.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/auto_mixed_precision_lists.cpp b/oneflow/core/job_rewriter/auto_mixed_precision_lists.cpp
similarity index 96%
rename from oneflow/core/job_completer/auto_mixed_precision_lists.cpp
rename to oneflow/core/job_rewriter/auto_mixed_precision_lists.cpp
index ff38cf210dde2fec2746b2922d39be6639f254da..d7997474f09efecb48bda432ac24c0101ad255fc 100644
--- a/oneflow/core/job_completer/auto_mixed_precision_lists.cpp
+++ b/oneflow/core/job_rewriter/auto_mixed_precision_lists.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/auto_mixed_precision_lists.h"
+#include "oneflow/core/job_rewriter/auto_mixed_precision_lists.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/auto_mixed_precision_lists.h b/oneflow/core/job_rewriter/auto_mixed_precision_lists.h
similarity index 83%
rename from oneflow/core/job_completer/auto_mixed_precision_lists.h
rename to oneflow/core/job_rewriter/auto_mixed_precision_lists.h
index 579f0da40163516b91489b2cfa573806c3a5d8b2..0fe3fcb4caab3b82e086f9355002224c1c4888dc 100644
--- a/oneflow/core/job_completer/auto_mixed_precision_lists.h
+++ b/oneflow/core/job_rewriter/auto_mixed_precision_lists.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_AUTO_MIXED_PRECISION_LISTS_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_AUTO_MIXED_PRECISION_LISTS_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_AUTO_MIXED_PRECISION_LISTS_H_
+#define ONEFLOW_CORE_JOB_REWRITER_AUTO_MIXED_PRECISION_LISTS_H_
 
 #include "oneflow/core/common/util.h"
 #include "oneflow/core/operator/op_conf_util.h"
@@ -34,4 +34,4 @@ class AutoMixedPrecisionLists final {
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_AUTO_MIXED_PRECISION_LISTS_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_AUTO_MIXED_PRECISION_LISTS_H_
diff --git a/oneflow/core/job_completer/auto_train_step.cpp b/oneflow/core/job_rewriter/auto_train_step.cpp
similarity index 98%
rename from oneflow/core/job_completer/auto_train_step.cpp
rename to oneflow/core/job_rewriter/auto_train_step.cpp
index e6e4f99f50496745b9e54c4350079b13c794eff5..c4b7538b2216c23fed7d705d896b9bcbcccb4953 100644
--- a/oneflow/core/job_completer/auto_train_step.cpp
+++ b/oneflow/core/job_rewriter/auto_train_step.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job.pb.h"
 #include "oneflow/core/job/foreign_callback.h"
 #include "oneflow/core/framework/framework.h"
diff --git a/oneflow/core/job_completer/autograd.cpp b/oneflow/core/job_rewriter/autograd.cpp
similarity index 99%
rename from oneflow/core/job_completer/autograd.cpp
rename to oneflow/core/job_rewriter/autograd.cpp
index 459869a1ac3969631206a3c625a7d928e9d5e159..32e6fc017e1e00a0573653582faba13c37651eb5 100644
--- a/oneflow/core/job_completer/autograd.cpp
+++ b/oneflow/core/job_rewriter/autograd.cpp
@@ -13,10 +13,10 @@ 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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 #include "oneflow/core/job/job_builder.h"
 #include "oneflow/core/job/foreign_callback.h"
-#include "oneflow/core/job_completer/clone_grad.h"
+#include "oneflow/core/job_rewriter/clone_grad.h"
 #include "oneflow/core/operator/variable_op.h"
 #include "oneflow/core/register/op_blob_arg.pb.h"
 #include "oneflow/core/common/protobuf.h"
diff --git a/oneflow/core/job_completer/autograd.h b/oneflow/core/job_rewriter/autograd.h
similarity index 96%
rename from oneflow/core/job_completer/autograd.h
rename to oneflow/core/job_rewriter/autograd.h
index f0984b254b3507c14c27b7496802361bb05da45e..b67e0c9ad01654d99a577a499793ada328ed9eda 100644
--- a/oneflow/core/job_completer/autograd.h
+++ b/oneflow/core/job_rewriter/autograd.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_AUTOGRAD_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_AUTOGRAD_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_AUTOGRAD_H_
+#define ONEFLOW_CORE_JOB_REWRITER_AUTOGRAD_H_
 
 #include "oneflow/core/job/job_desc.h"
 #include "oneflow/core/operator/operator.h"
@@ -69,4 +69,4 @@ class GenerateBackwardOpConfWrapperStruct final {
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_AUTOGRAD_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_AUTOGRAD_H_
diff --git a/oneflow/core/job_completer/autotick.cpp b/oneflow/core/job_rewriter/autotick.cpp
similarity index 99%
rename from oneflow/core/job_completer/autotick.cpp
rename to oneflow/core/job_rewriter/autotick.cpp
index b82e8d7c6a28a9a1b07ca26c672166f122022940..13332db45993fa381d68d84ebbfda7dd010cba94 100644
--- a/oneflow/core/job_completer/autotick.cpp
+++ b/oneflow/core/job_rewriter/autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 #include "oneflow/core/job/job_builder.h"
 #include "oneflow/core/job/critical_section_desc.h"
 #include "oneflow/core/common/protobuf.h"
diff --git a/oneflow/core/job_completer/autotick.h b/oneflow/core/job_rewriter/autotick.h
similarity index 92%
rename from oneflow/core/job_completer/autotick.h
rename to oneflow/core/job_rewriter/autotick.h
index b9ce0dbf571826b3ff56ebd3cd52af318a8de8e1..8dbfc1c510bd6f6b0f77d9fe6e6fd86b046b367a 100644
--- a/oneflow/core/job_completer/autotick.h
+++ b/oneflow/core/job_rewriter/autotick.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_AUTOTICK_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_AUTOTICK_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_AUTOTICK_H_
+#define ONEFLOW_CORE_JOB_REWRITER_AUTOTICK_H_
 
 #include "oneflow/core/job/job_desc.h"
 #include "oneflow/core/operator/operator.h"
@@ -49,4 +49,4 @@ class MutOpConTickInputHelper {
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_AUTOTICK_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_AUTOTICK_H_
diff --git a/oneflow/core/job_completer/broadcast_to_compatible_with_grad.cpp b/oneflow/core/job_rewriter/broadcast_to_compatible_with_grad.cpp
similarity index 97%
rename from oneflow/core/job_completer/broadcast_to_compatible_with_grad.cpp
rename to oneflow/core/job_rewriter/broadcast_to_compatible_with_grad.cpp
index 143452c55fd41d60f95a82e72b1e8ec9c9900c95..4814e6b58962d541ae4adb4ff491e0e8239a0a3a 100644
--- a/oneflow/core/job_completer/broadcast_to_compatible_with_grad.cpp
+++ b/oneflow/core/job_rewriter/broadcast_to_compatible_with_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 #include "oneflow/core/common/shape_view.h"
 #include "oneflow/core/framework/framework.h"
 
diff --git a/oneflow/core/job_completer/clone_grad.cpp b/oneflow/core/job_rewriter/clone_grad.cpp
similarity index 98%
rename from oneflow/core/job_completer/clone_grad.cpp
rename to oneflow/core/job_rewriter/clone_grad.cpp
index fdc51ef5511505aea7702cdd81d53800dbee0996..b14ae2a19939aaa085875bf69ac9c0f379266965 100644
--- a/oneflow/core/job_completer/clone_grad.cpp
+++ b/oneflow/core/job_rewriter/clone_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/clone_grad.h"
+#include "oneflow/core/job_rewriter/clone_grad.h"
 #include "oneflow/core/framework/framework.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/clone_grad.h b/oneflow/core/job_rewriter/clone_grad.h
similarity index 82%
rename from oneflow/core/job_completer/clone_grad.h
rename to oneflow/core/job_rewriter/clone_grad.h
index ac910f499d38e77032002bfc60fb02f9065d35aa..a96d9561a83803084724cc9e1b75316a8521734a 100644
--- a/oneflow/core/job_completer/clone_grad.h
+++ b/oneflow/core/job_rewriter/clone_grad.h
@@ -13,10 +13,10 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_CLONE_GRAD_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_CLONE_GRAD_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_CLONE_GRAD_H_
+#define ONEFLOW_CORE_JOB_REWRITER_CLONE_GRAD_H_
 
-#include "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
@@ -26,4 +26,4 @@ void GenerateCloneGradOpIfNeed(const OpNode& op_node, JobBuilder* job_builder,
                                HashMap<OpBlobArg, LogicalBlobId>* out_oba2clone_bw_add_out_lbi);
 }
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_CLONE_GRAD_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_CLONE_GRAD_H_
diff --git a/oneflow/core/job_completer/complete_ofrecord_decoder.cpp b/oneflow/core/job_rewriter/complete_ofrecord_decoder.cpp
similarity index 99%
rename from oneflow/core/job_completer/complete_ofrecord_decoder.cpp
rename to oneflow/core/job_rewriter/complete_ofrecord_decoder.cpp
index 0258f55ccdfc759bf7714ddaa0b0e4c891f1fde1..ba74f63e187e17845cace4533e630fbaeecad65f 100644
--- a/oneflow/core/job_completer/complete_ofrecord_decoder.cpp
+++ b/oneflow/core/job_rewriter/complete_ofrecord_decoder.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job_builder.h"
 #include "oneflow/core/operator/operator.h"
 #include "oneflow/core/job/parallel_desc.h"
diff --git a/oneflow/core/job_completer/decode_random_autotick.cpp b/oneflow/core/job_rewriter/decode_random_autotick.cpp
similarity index 96%
rename from oneflow/core/job_completer/decode_random_autotick.cpp
rename to oneflow/core/job_rewriter/decode_random_autotick.cpp
index 95a49bf1a19a0a5959bd588a4e8d63988a756556..ec4d94b614afdde9c28325647e6d5cc98cb33429 100644
--- a/oneflow/core/job_completer/decode_random_autotick.cpp
+++ b/oneflow/core/job_rewriter/decode_random_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/device_tick_autotick.cpp b/oneflow/core/job_rewriter/device_tick_autotick.cpp
similarity index 96%
rename from oneflow/core/job_completer/device_tick_autotick.cpp
rename to oneflow/core/job_rewriter/device_tick_autotick.cpp
index 511db09a15eb2d780d3162fb0c01083460e2ffac..fa4ae673488f1c5fc12eeba45b3e56f65eeec6fc 100644
--- a/oneflow/core/job_completer/device_tick_autotick.cpp
+++ b/oneflow/core/job_rewriter/device_tick_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/distribute_grad.cpp b/oneflow/core/job_rewriter/distribute_grad.cpp
similarity index 99%
rename from oneflow/core/job_completer/distribute_grad.cpp
rename to oneflow/core/job_rewriter/distribute_grad.cpp
index b776a0f16551f36f218d242ac3edea45620c81fb..66e2dffacff6e450a4218c33631f8f02d0f99cc2 100644
--- a/oneflow/core/job_completer/distribute_grad.cpp
+++ b/oneflow/core/job_rewriter/distribute_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/do_parallel_cast_before_widening_type_cast_pass.cpp b/oneflow/core/job_rewriter/do_parallel_cast_before_widening_type_cast_pass.cpp
similarity index 98%
rename from oneflow/core/job_completer/do_parallel_cast_before_widening_type_cast_pass.cpp
rename to oneflow/core/job_rewriter/do_parallel_cast_before_widening_type_cast_pass.cpp
index cc77e3b015b5cedbf0758154b827a2bfbfc5fb8c..ee1e05fd9e747fb662bf07f0eb2b8528c7df025b 100644
--- a/oneflow/core/job_completer/do_parallel_cast_before_widening_type_cast_pass.cpp
+++ b/oneflow/core/job_rewriter/do_parallel_cast_before_widening_type_cast_pass.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/framework/user_op_conf.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/register/runtime_blob_desc.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/dump_time_shape_and_blob_parallel_conf_pass.cpp b/oneflow/core/job_rewriter/dump_time_shape_and_blob_parallel_conf_pass.cpp
similarity index 96%
rename from oneflow/core/job_completer/dump_time_shape_and_blob_parallel_conf_pass.cpp
rename to oneflow/core/job_rewriter/dump_time_shape_and_blob_parallel_conf_pass.cpp
index 91ed967f31cc565ebf71d4bfddcad098c1384335..1721ac0634445606805503da2deefb0ee92b5b1b 100644
--- a/oneflow/core/job_completer/dump_time_shape_and_blob_parallel_conf_pass.cpp
+++ b/oneflow/core/job_rewriter/dump_time_shape_and_blob_parallel_conf_pass.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/common/util.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job.pb.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/dump_variable_info_pass.cpp b/oneflow/core/job_rewriter/dump_variable_info_pass.cpp
similarity index 98%
rename from oneflow/core/job_completer/dump_variable_info_pass.cpp
rename to oneflow/core/job_rewriter/dump_variable_info_pass.cpp
index fd79e6c5e49163d6b34d0f6b2226bfb7d5eaee01..12a2bfe47d2acc1d41edc660b24c61398d5b4a6a 100644
--- a/oneflow/core/job_completer/dump_variable_info_pass.cpp
+++ b/oneflow/core/job_rewriter/dump_variable_info_pass.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/global_for.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/dynamic_reshape_grad.cpp b/oneflow/core/job_rewriter/dynamic_reshape_grad.cpp
similarity index 97%
rename from oneflow/core/job_completer/dynamic_reshape_grad.cpp
rename to oneflow/core/job_rewriter/dynamic_reshape_grad.cpp
index f8c691531676306c2fba2e88377502cefbf8e763..f7e1bc5e181839f224ffcd9734aebf9be430c2df 100644
--- a/oneflow/core/job_completer/dynamic_reshape_grad.cpp
+++ b/oneflow/core/job_rewriter/dynamic_reshape_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/foreign_input_autotick.cpp b/oneflow/core/job_rewriter/foreign_input_autotick.cpp
similarity index 96%
rename from oneflow/core/job_completer/foreign_input_autotick.cpp
rename to oneflow/core/job_rewriter/foreign_input_autotick.cpp
index d88f7083d5d5dfa81d7278e4410c7c1fd426b686..305d88b99dca27d6c6eafed71192bf918473cbbd 100644
--- a/oneflow/core/job_completer/foreign_input_autotick.cpp
+++ b/oneflow/core/job_rewriter/foreign_input_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/generate_backward_and_optimizer_op_confs.cpp b/oneflow/core/job_rewriter/generate_backward_and_optimizer_op_confs.cpp
similarity index 97%
rename from oneflow/core/job_completer/generate_backward_and_optimizer_op_confs.cpp
rename to oneflow/core/job_rewriter/generate_backward_and_optimizer_op_confs.cpp
index eee2272deee29c3ed58831ddb8c5e737eb837e7c..f2f135153f6637632b74eb0387db96e23ee6248d 100644
--- a/oneflow/core/job_completer/generate_backward_and_optimizer_op_confs.cpp
+++ b/oneflow/core/job_rewriter/generate_backward_and_optimizer_op_confs.cpp
@@ -13,9 +13,9 @@ 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 "oneflow/core/job_completer/op_graph_pass.h"
-#include "oneflow/core/job_completer/autograd.h"
-#include "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/autograd.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/group_boxing_by_dst_parallel.cpp b/oneflow/core/job_rewriter/group_boxing_by_dst_parallel.cpp
similarity index 98%
rename from oneflow/core/job_completer/group_boxing_by_dst_parallel.cpp
rename to oneflow/core/job_rewriter/group_boxing_by_dst_parallel.cpp
index 941d1697492f60986431c036668be42f45d4286a..e05fe66d10462677f31669495117868ce9040c10 100644
--- a/oneflow/core/job_completer/group_boxing_by_dst_parallel.cpp
+++ b/oneflow/core/job_rewriter/group_boxing_by_dst_parallel.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/group_boxing_by_dst_parallel.h"
+#include "oneflow/core/job_rewriter/group_boxing_by_dst_parallel.h"
 #include "oneflow/core/job/job_desc.h"
 #include "oneflow/core/common/protobuf.h"
 
diff --git a/oneflow/core/job_completer/group_boxing_by_dst_parallel.h b/oneflow/core/job_rewriter/group_boxing_by_dst_parallel.h
similarity index 79%
rename from oneflow/core/job_completer/group_boxing_by_dst_parallel.h
rename to oneflow/core/job_rewriter/group_boxing_by_dst_parallel.h
index 546c3dfd872769522f6698d1947f6964ebdfa528..910a891b229c8b318c5d13cbeda4fdc0dd601777 100644
--- a/oneflow/core/job_completer/group_boxing_by_dst_parallel.h
+++ b/oneflow/core/job_rewriter/group_boxing_by_dst_parallel.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_GROUP_BOXING_BY_DST_PARALLEL_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_GROUP_BOXING_BY_DST_PARALLEL_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_GROUP_BOXING_BY_DST_PARALLEL_H_
+#define ONEFLOW_CORE_JOB_REWRITER_GROUP_BOXING_BY_DST_PARALLEL_H_
 
 #include "oneflow/core/graph/op_graph.h"
 
@@ -27,4 +27,4 @@ void GroupBoxingByDstParallel(const OpGraph& op_graph, JobBuilder* job_builder);
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_GROUP_BOXING_BY_DST_PARALLEL_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_GROUP_BOXING_BY_DST_PARALLEL_H_
diff --git a/oneflow/core/job_completer/identity_grad.cpp b/oneflow/core/job_rewriter/identity_grad.cpp
similarity index 98%
rename from oneflow/core/job_completer/identity_grad.cpp
rename to oneflow/core/job_rewriter/identity_grad.cpp
index 0e2d6309b2c43ffb2a00c3b105f7f1da925df7bb..5ec79464fed74f189c2969ac3c16b856d2ea2193 100644
--- a/oneflow/core/job_completer/identity_grad.cpp
+++ b/oneflow/core/job_rewriter/identity_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/indexed_slices_optimizer_rewrite_pass.cpp b/oneflow/core/job_rewriter/indexed_slices_optimizer_rewrite_pass.cpp
similarity index 99%
rename from oneflow/core/job_completer/indexed_slices_optimizer_rewrite_pass.cpp
rename to oneflow/core/job_rewriter/indexed_slices_optimizer_rewrite_pass.cpp
index b1a083edfa2abb35e3c1d934f269a06ec1d2d86a..bc3db3fce56a6fc7b921bc7ec8aae2039b2f84ac 100644
--- a/oneflow/core/job_completer/indexed_slices_optimizer_rewrite_pass.cpp
+++ b/oneflow/core/job_rewriter/indexed_slices_optimizer_rewrite_pass.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/framework/framework.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/input_autotick.cpp b/oneflow/core/job_rewriter/input_autotick.cpp
similarity index 95%
rename from oneflow/core/job_completer/input_autotick.cpp
rename to oneflow/core/job_rewriter/input_autotick.cpp
index b24cce4e59883ee28572aa23de00efcf445aee97..58d631ef24e722a83276c704ccf400dd96abf355 100644
--- a/oneflow/core/job_completer/input_autotick.cpp
+++ b/oneflow/core/job_rewriter/input_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/job_completer.cpp b/oneflow/core/job_rewriter/job_completer.cpp
similarity index 91%
rename from oneflow/core/job_completer/job_completer.cpp
rename to oneflow/core/job_rewriter/job_completer.cpp
index e419a1749cc6d5b88c2b3f6324fed8bd2a960a23..02121c51786a6a5d1c877fad8d8afe682e9b3a35 100644
--- a/oneflow/core/job_completer/job_completer.cpp
+++ b/oneflow/core/job_rewriter/job_completer.cpp
@@ -13,15 +13,15 @@ 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 "oneflow/core/job_completer/job_completer.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
-#include "oneflow/core/job_completer/autograd.h"
-#include "oneflow/core/job_completer/autotick.h"
-#include "oneflow/core/job_completer/add_keep_header_only_op_conf.h"
+#include "oneflow/core/job_rewriter/job_completer.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/autograd.h"
+#include "oneflow/core/job_rewriter/autotick.h"
+#include "oneflow/core/job_rewriter/add_keep_header_only_op_conf.h"
 #include "oneflow/core/job/job_desc.h"
-#include "oneflow/core/job_completer/group_boxing_by_dst_parallel.h"
+#include "oneflow/core/job_rewriter/group_boxing_by_dst_parallel.h"
 #include "oneflow/core/framework/config_def.h"
-#include "oneflow/core/job_completer/xrt_compilation.h"
+#include "oneflow/core/job_rewriter/xrt_compilation.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/job_completer.h b/oneflow/core/job_rewriter/job_completer.h
similarity index 85%
rename from oneflow/core/job_completer/job_completer.h
rename to oneflow/core/job_rewriter/job_completer.h
index 78e452da27bb7c7fd920da6daf99637af8963bce..b63952645ec2f27b8867cf85de7733981a2cb20e 100644
--- a/oneflow/core/job_completer/job_completer.h
+++ b/oneflow/core/job_rewriter/job_completer.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_JOB_COMPLETER_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_JOB_COMPLETER_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_JOB_COMPLETER_H_
+#define ONEFLOW_CORE_JOB_REWRITER_JOB_COMPLETER_H_
 
 #include "oneflow/core/common/util.h"
 #include "oneflow/core/job/job_desc.h"
@@ -33,4 +33,4 @@ class JobCompleter final {
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_JOB_COMPLETER_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_JOB_COMPLETER_H_
diff --git a/oneflow/core/job_completer/lars_optm.cpp b/oneflow/core/job_rewriter/lars_optm.cpp
similarity index 97%
rename from oneflow/core/job_completer/lars_optm.cpp
rename to oneflow/core/job_rewriter/lars_optm.cpp
index dcd68a197ed420bc135057379aa284ea21bea0cc..c2b55c0e8803148c6a2a1a52b19848190e7f7f6a 100644
--- a/oneflow/core/job_completer/lars_optm.cpp
+++ b/oneflow/core/job_rewriter/lars_optm.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/lazy_adam_optm.cpp b/oneflow/core/job_rewriter/lazy_adam_optm.cpp
similarity index 98%
rename from oneflow/core/job_completer/lazy_adam_optm.cpp
rename to oneflow/core/job_rewriter/lazy_adam_optm.cpp
index d1754ff432feaa13d37926c7806c129d0658b65f..9c87b70e654267ca9cfdb897c70a4384b2cc8739 100644
--- a/oneflow/core/job_completer/lazy_adam_optm.cpp
+++ b/oneflow/core/job_rewriter/lazy_adam_optm.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/momentum_optm.cpp b/oneflow/core/job_rewriter/momentum_optm.cpp
similarity index 98%
rename from oneflow/core/job_completer/momentum_optm.cpp
rename to oneflow/core/job_rewriter/momentum_optm.cpp
index eecaff408baa401175b6ae186a12175ff4bd06a1..5e1c26c7b273d801c4b8242e4ccc89ac27d4b0b2 100644
--- a/oneflow/core/job_completer/momentum_optm.cpp
+++ b/oneflow/core/job_rewriter/momentum_optm.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/common/str_util.h"
-#include "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/naive_optm.cpp b/oneflow/core/job_rewriter/naive_optm.cpp
similarity index 96%
rename from oneflow/core/job_completer/naive_optm.cpp
rename to oneflow/core/job_rewriter/naive_optm.cpp
index abb2d3d752e94f9efe4eb64577ca876d559f779d..bfa7b286ef59bf3d52363eef5b809db0420ca4f2 100644
--- a/oneflow/core/job_completer/naive_optm.cpp
+++ b/oneflow/core/job_rewriter/naive_optm.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/non_distributed_optimizer_pass.cpp b/oneflow/core/job_rewriter/non_distributed_optimizer_pass.cpp
similarity index 99%
rename from oneflow/core/job_completer/non_distributed_optimizer_pass.cpp
rename to oneflow/core/job_rewriter/non_distributed_optimizer_pass.cpp
index 1b331d2dc8d1b7b1ebd241acf9c0e885635356a0..c1b7b50f0de3fed34c8c0fd9ed02b2e196d1acb0 100644
--- a/oneflow/core/job_completer/non_distributed_optimizer_pass.cpp
+++ b/oneflow/core/job_rewriter/non_distributed_optimizer_pass.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "oneflow/core/common/util.h"
-#include "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/graph/op_graph.h"
 #include "oneflow/core/job/job_desc.h"
 
diff --git a/oneflow/core/job_completer/op_graph_pass.cpp b/oneflow/core/job_rewriter/op_graph_pass.cpp
similarity index 96%
rename from oneflow/core/job_completer/op_graph_pass.cpp
rename to oneflow/core/job_rewriter/op_graph_pass.cpp
index eb996d22fecb377692f4c2b486047273c565b3b4..b159eb3ed5e8fbbb338a52c26051942efa7c73a6 100644
--- a/oneflow/core/job_completer/op_graph_pass.cpp
+++ b/oneflow/core/job_rewriter/op_graph_pass.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/op_graph_pass.h b/oneflow/core/job_rewriter/op_graph_pass.h
similarity index 91%
rename from oneflow/core/job_completer/op_graph_pass.h
rename to oneflow/core/job_rewriter/op_graph_pass.h
index 50aa1380ff73c796b9f9240a9a3cc2b7807d1572..c1b9f215539885c79afc7a078e9834499ac38030 100644
--- a/oneflow/core/job_completer/op_graph_pass.h
+++ b/oneflow/core/job_rewriter/op_graph_pass.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_OP_GRAPH_PASS_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_OP_GRAPH_PASS_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_OP_GRAPH_PASS_H_
+#define ONEFLOW_CORE_JOB_REWRITER_OP_GRAPH_PASS_H_
 
 #include "oneflow/core/graph/op_graph.h"
 #include "oneflow/core/job/job_builder.h"
@@ -56,4 +56,4 @@ const OpGraphPass& FunctionPass(const std::string& pass_name);
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_OP_GRAPH_PASS_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_OP_GRAPH_PASS_H_
diff --git a/oneflow/core/job_completer/optimizer.cpp b/oneflow/core/job_rewriter/optimizer.cpp
similarity index 99%
rename from oneflow/core/job_completer/optimizer.cpp
rename to oneflow/core/job_rewriter/optimizer.cpp
index b3c7604aa4e4d1e2d4db5808c0e29a4ec9f90166..66a950c2cabc7b0bec3dd78bad3bc9c3bba3ad48 100644
--- a/oneflow/core/job_completer/optimizer.cpp
+++ b/oneflow/core/job_rewriter/optimizer.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 #include <re2/re2.h>
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/optimizer.h b/oneflow/core/job_rewriter/optimizer.h
similarity index 92%
rename from oneflow/core/job_completer/optimizer.h
rename to oneflow/core/job_rewriter/optimizer.h
index f8cd52e2885907791156270a58b9d936f8ab5c9b..b4d261e061eb846317a12ce00c88b2d4a52e8a42 100644
--- a/oneflow/core/job_completer/optimizer.h
+++ b/oneflow/core/job_rewriter/optimizer.h
@@ -13,8 +13,8 @@ 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.
 */
-#ifndef ONEFLOW_CORE_JOB_COMPLETER_OPTIMIZER_H_
-#define ONEFLOW_CORE_JOB_COMPLETER_OPTIMIZER_H_
+#ifndef ONEFLOW_CORE_JOB_REWRITER_OPTIMIZER_H_
+#define ONEFLOW_CORE_JOB_REWRITER_OPTIMIZER_H_
 
 #include "oneflow/core/graph/op_graph.h"
 #include "oneflow/core/operator/variable_op.h"
@@ -46,4 +46,4 @@ class GenerateOptimizerOpConfWrapperStruct final {
 
 }  // namespace oneflow
 
-#endif  // ONEFLOW_CORE_JOB_COMPLETER_OPTIMIZER_H_
+#endif  // ONEFLOW_CORE_JOB_REWRITER_OPTIMIZER_H_
diff --git a/oneflow/core/job_completer/parallel_cast_grad.cpp b/oneflow/core/job_rewriter/parallel_cast_grad.cpp
similarity index 97%
rename from oneflow/core/job_completer/parallel_cast_grad.cpp
rename to oneflow/core/job_rewriter/parallel_cast_grad.cpp
index dde64d9e102c273cb7a92c4e19dbdce7d785d3e6..f18d0f1fd59bf9125b197ddcdbd9430603d3eb39 100644
--- a/oneflow/core/job_completer/parallel_cast_grad.cpp
+++ b/oneflow/core/job_rewriter/parallel_cast_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/prelu_grad.cpp b/oneflow/core/job_rewriter/prelu_grad.cpp
similarity index 98%
rename from oneflow/core/job_completer/prelu_grad.cpp
rename to oneflow/core/job_rewriter/prelu_grad.cpp
index d126df4cc4f4c90c262df3e59e0e5c392a84e798..ee70a8c20a6864df361b9acfc4edc5bf0a7e20f3 100644
--- a/oneflow/core/job_completer/prelu_grad.cpp
+++ b/oneflow/core/job_rewriter/prelu_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/prune_cast_to_static_shape_op_pass.cpp b/oneflow/core/job_rewriter/prune_cast_to_static_shape_op_pass.cpp
similarity index 98%
rename from oneflow/core/job_completer/prune_cast_to_static_shape_op_pass.cpp
rename to oneflow/core/job_rewriter/prune_cast_to_static_shape_op_pass.cpp
index dfd334b6ae1b45ecd45dda5b1eec1a076ba93c98..903d16d4c5154dc3c37bb8a126ac18526870fadc 100644
--- a/oneflow/core/job_completer/prune_cast_to_static_shape_op_pass.cpp
+++ b/oneflow/core/job_rewriter/prune_cast_to_static_shape_op_pass.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/register/runtime_blob_desc.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/prune_parallel_cast_op_pass.cpp b/oneflow/core/job_rewriter/prune_parallel_cast_op_pass.cpp
similarity index 98%
rename from oneflow/core/job_completer/prune_parallel_cast_op_pass.cpp
rename to oneflow/core/job_rewriter/prune_parallel_cast_op_pass.cpp
index 2656520b8ea62b44a129e86f95f592417a30d595..c994c37b0e00ed357e012680f46d844aed3ff99f 100644
--- a/oneflow/core/job_completer/prune_parallel_cast_op_pass.cpp
+++ b/oneflow/core/job_rewriter/prune_parallel_cast_op_pass.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/register/runtime_blob_desc.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/record_load_autotick.cpp b/oneflow/core/job_rewriter/record_load_autotick.cpp
similarity index 96%
rename from oneflow/core/job_completer/record_load_autotick.cpp
rename to oneflow/core/job_rewriter/record_load_autotick.cpp
index 4e4002b936627fc9a797a6937afa7a54044df72c..ee42e7843ea47198bbe9214bca3a471d4c5e0f0f 100644
--- a/oneflow/core/job_completer/record_load_autotick.cpp
+++ b/oneflow/core/job_rewriter/record_load_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/repeat_grad.cpp b/oneflow/core/job_rewriter/repeat_grad.cpp
similarity index 96%
rename from oneflow/core/job_completer/repeat_grad.cpp
rename to oneflow/core/job_rewriter/repeat_grad.cpp
index 109c97fd518b00d4b740a42ca3606f5676fdea15..8c35717a305aaf357e669d2a48e8edcf95f6613f 100644
--- a/oneflow/core/job_completer/repeat_grad.cpp
+++ b/oneflow/core/job_rewriter/repeat_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/rmsprop_optm.cpp b/oneflow/core/job_rewriter/rmsprop_optm.cpp
similarity index 96%
rename from oneflow/core/job_completer/rmsprop_optm.cpp
rename to oneflow/core/job_rewriter/rmsprop_optm.cpp
index 159730383f2e0925e680fc2ab14edc1d4529d097..b15d38a7ccd081e2bb75f3944209b38d4a4ccb47 100644
--- a/oneflow/core/job_completer/rmsprop_optm.cpp
+++ b/oneflow/core/job_rewriter/rmsprop_optm.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/optimizer.h"
+#include "oneflow/core/job_rewriter/optimizer.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/set_default_variable_conf.cpp b/oneflow/core/job_rewriter/set_default_variable_conf.cpp
similarity index 98%
rename from oneflow/core/job_completer/set_default_variable_conf.cpp
rename to oneflow/core/job_rewriter/set_default_variable_conf.cpp
index caa64b3b234bb9e40d750295958a12a478d025cd..78a9b4c7c91cd3e128ce15860602ee99621796ee 100644
--- a/oneflow/core/job_completer/set_default_variable_conf.cpp
+++ b/oneflow/core/job_rewriter/set_default_variable_conf.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/job/job_builder.h"
 #include "oneflow/core/job/job_set_compile_ctx.h"
 
diff --git a/oneflow/core/job_completer/sigmoid_cross_entropy_grad.cpp b/oneflow/core/job_rewriter/sigmoid_cross_entropy_grad.cpp
similarity index 97%
rename from oneflow/core/job_completer/sigmoid_cross_entropy_grad.cpp
rename to oneflow/core/job_rewriter/sigmoid_cross_entropy_grad.cpp
index 5a402b3b9c7dd957dddbd3d0c33913156b53b0e1..ab353056be8839ef83c71d78d9a5611695ce0a9a 100644
--- a/oneflow/core/job_completer/sigmoid_cross_entropy_grad.cpp
+++ b/oneflow/core/job_rewriter/sigmoid_cross_entropy_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/source_user_op_auto_tick.cpp b/oneflow/core/job_rewriter/source_user_op_auto_tick.cpp
similarity index 96%
rename from oneflow/core/job_completer/source_user_op_auto_tick.cpp
rename to oneflow/core/job_rewriter/source_user_op_auto_tick.cpp
index b437e28d150b742a3b7e410dc6c507e1f4ce017e..a335c8f485e7a964424c00fa58c447eaf12cde58 100644
--- a/oneflow/core/job_completer/source_user_op_auto_tick.cpp
+++ b/oneflow/core/job_rewriter/source_user_op_auto_tick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 #include "oneflow/core/framework/user_op_registry_manager.h"
 
 namespace oneflow {
diff --git a/oneflow/core/job_completer/tick_autotick.cpp b/oneflow/core/job_rewriter/tick_autotick.cpp
similarity index 95%
rename from oneflow/core/job_completer/tick_autotick.cpp
rename to oneflow/core/job_rewriter/tick_autotick.cpp
index ad27b6273fcc03b672ab3f48065360fc6ea93933..ac293aa75060a32524865ecb1aeb098f79aab7e9 100644
--- a/oneflow/core/job_completer/tick_autotick.cpp
+++ b/oneflow/core/job_rewriter/tick_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/tie_up_chain_headers.cpp b/oneflow/core/job_rewriter/tie_up_chain_headers.cpp
similarity index 98%
rename from oneflow/core/job_completer/tie_up_chain_headers.cpp
rename to oneflow/core/job_rewriter/tie_up_chain_headers.cpp
index a03743c8dd78e316884d54f1494d37ae68070a25..b61d06efdcd6f39fa99ec4fce2f1d0fe3756038d 100644
--- a/oneflow/core/job_completer/tie_up_chain_headers.cpp
+++ b/oneflow/core/job_rewriter/tie_up_chain_headers.cpp
@@ -13,9 +13,9 @@ 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 "oneflow/core/job_completer/op_graph_pass.h"
+#include "oneflow/core/job_rewriter/op_graph_pass.h"
 #include "oneflow/core/framework/config_def.h"
-#include "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/tuple_identity_grad.cpp b/oneflow/core/job_rewriter/tuple_identity_grad.cpp
similarity index 95%
rename from oneflow/core/job_completer/tuple_identity_grad.cpp
rename to oneflow/core/job_rewriter/tuple_identity_grad.cpp
index 221d3d8f8be82ffb297539bdb573f7a98eb8e2ca..3713b0b483aab8a5df13fc4b5d314250fd6035bb 100644
--- a/oneflow/core/job_completer/tuple_identity_grad.cpp
+++ b/oneflow/core/job_rewriter/tuple_identity_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/user_grad.cpp b/oneflow/core/job_rewriter/user_grad.cpp
similarity index 97%
rename from oneflow/core/job_completer/user_grad.cpp
rename to oneflow/core/job_rewriter/user_grad.cpp
index d12fd3e6db4cb9acb75644da645b5d26ce19c220..ff4721e3693c6a8fafbd1e47656daaaa4d38e7de 100644
--- a/oneflow/core/job_completer/user_grad.cpp
+++ b/oneflow/core/job_rewriter/user_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 #include "oneflow/core/framework/user_op_registry_manager.h"
 #include "oneflow/core/framework/user_op_conf.h"
 
diff --git a/oneflow/core/job_completer/variable_autotick.cpp b/oneflow/core/job_rewriter/variable_autotick.cpp
similarity index 96%
rename from oneflow/core/job_completer/variable_autotick.cpp
rename to oneflow/core/job_rewriter/variable_autotick.cpp
index 6ab311a28aaaf30e91b193a30c840a1db991c0cf..fadb7769c08cbc20af68c4777f7b0b7a5cf60e22 100644
--- a/oneflow/core/job_completer/variable_autotick.cpp
+++ b/oneflow/core/job_rewriter/variable_autotick.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autotick.h"
+#include "oneflow/core/job_rewriter/autotick.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/variable_grad.cpp b/oneflow/core/job_rewriter/variable_grad.cpp
similarity index 94%
rename from oneflow/core/job_completer/variable_grad.cpp
rename to oneflow/core/job_rewriter/variable_grad.cpp
index 09cc994d85911a303f2b6daf1cdf87b9379185e7..112aacc2140d786c61be7414aadbb72077c89060 100644
--- a/oneflow/core/job_completer/variable_grad.cpp
+++ b/oneflow/core/job_rewriter/variable_grad.cpp
@@ -13,7 +13,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 "oneflow/core/job_completer/autograd.h"
+#include "oneflow/core/job_rewriter/autograd.h"
 
 namespace oneflow {
 
diff --git a/oneflow/core/job_completer/xrt_compilation.h b/oneflow/core/job_rewriter/xrt_compilation.h
similarity index 100%
rename from oneflow/core/job_completer/xrt_compilation.h
rename to oneflow/core/job_rewriter/xrt_compilation.h