diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
index 3748dfe0af98..b9dec0b87c9c 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
@@ -485,8 +485,8 @@ if (NOT INTERN_BUILD_MOBILE OR NOT BUILD_CAFFE2_MOBILE)
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/kernel.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_codegen.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp
+    ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/loopnest.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/mem_arena.cpp
-    ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/schedule.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/tensor.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/types.cpp
     ${TORCH_SRC_DIR}/csrc/jit/tensorexpr/unique_name_manager.cpp
diff --git a/test/cpp/tensorexpr/test_cuda.cpp b/test/cpp/tensorexpr/test_cuda.cpp
index 286daaca9b6a..be5856c47588 100644
--- a/test/cpp/tensorexpr/test_cuda.cpp
+++ b/test/cpp/tensorexpr/test_cuda.cpp
@@ -9,7 +9,7 @@
 #include "test/cpp/tensorexpr/padded_buffer.h"
 #include "torch/csrc/jit/tensorexpr/buffer.h"
 #include "torch/csrc/jit/tensorexpr/cuda_codegen.h"
-#include "torch/csrc/jit/tensorexpr/schedule.h"
+#include "torch/csrc/jit/tensorexpr/loopnest.h"
 #include "torch/csrc/jit/tensorexpr/tensor.h"
 
 #include <c10/cuda/CUDACachingAllocator.h>
diff --git a/test/cpp/tensorexpr/test_expr.cpp b/test/cpp/tensorexpr/test_expr.cpp
index 9394c3a52f97..6fddf5b9f22f 100644
--- a/test/cpp/tensorexpr/test_expr.cpp
+++ b/test/cpp/tensorexpr/test_expr.cpp
@@ -7,7 +7,7 @@
 #include "torch/csrc/jit/tensorexpr/function.h"
 #include "torch/csrc/jit/tensorexpr/ir.h"
 #include "torch/csrc/jit/tensorexpr/ir_printer.h"
-#include "torch/csrc/jit/tensorexpr/schedule.h"
+#include "torch/csrc/jit/tensorexpr/loopnest.h"
 #include "torch/csrc/jit/tensorexpr/tensor.h"
 
 #include <cmath>
diff --git a/test/cpp/tensorexpr/test_llvm.cpp b/test/cpp/tensorexpr/test_llvm.cpp
index 417470e6c2a0..bbcf60261388 100644
--- a/test/cpp/tensorexpr/test_llvm.cpp
+++ b/test/cpp/tensorexpr/test_llvm.cpp
@@ -9,7 +9,7 @@
 #include "torch/csrc/jit/tensorexpr/ir.h"
 #include "torch/csrc/jit/tensorexpr/ir_printer.h"
 #include "torch/csrc/jit/tensorexpr/llvm_codegen.h"
-#include "torch/csrc/jit/tensorexpr/schedule.h"
+#include "torch/csrc/jit/tensorexpr/loopnest.h"
 #include "torch/csrc/jit/tensorexpr/tensor.h"
 
 #include <numeric>
diff --git a/test/cpp/tensorexpr/test_schedule.cpp b/test/cpp/tensorexpr/test_loopnest.cpp
similarity index 99%
rename from test/cpp/tensorexpr/test_schedule.cpp
rename to test/cpp/tensorexpr/test_loopnest.cpp
index 1da9a4b71640..8d8f6e882f51 100644
--- a/test/cpp/tensorexpr/test_schedule.cpp
+++ b/test/cpp/tensorexpr/test_loopnest.cpp
@@ -10,7 +10,7 @@
 #include "torch/csrc/jit/tensorexpr/function.h"
 #include "torch/csrc/jit/tensorexpr/ir.h"
 #include "torch/csrc/jit/tensorexpr/ir_printer.h"
-#include "torch/csrc/jit/tensorexpr/schedule.h"
+#include "torch/csrc/jit/tensorexpr/loopnest.h"
 #include "torch/csrc/jit/tensorexpr/tensor.h"
 
 namespace torch {
diff --git a/test/cpp/tensorexpr/test_simplify.cpp b/test/cpp/tensorexpr/test_simplify.cpp
index 371f7a3428ac..f97f6da343ab 100644
--- a/test/cpp/tensorexpr/test_simplify.cpp
+++ b/test/cpp/tensorexpr/test_simplify.cpp
@@ -4,7 +4,7 @@
 #include "torch/csrc/jit/tensorexpr/hash_server.h"
 #include "torch/csrc/jit/tensorexpr/ir_simplifier.h"
 #include "torch/csrc/jit/tensorexpr/llvm_codegen.h"
-#include "torch/csrc/jit/tensorexpr/schedule.h"
+#include "torch/csrc/jit/tensorexpr/loopnest.h"
 
 namespace torch {
 namespace jit {
diff --git a/tools/build_variables.bzl b/tools/build_variables.bzl
index bf0c7ed66ecc..de4a15339ae1 100644
--- a/tools/build_variables.bzl
+++ b/tools/build_variables.bzl
@@ -209,8 +209,8 @@ libtorch_sources = [
     "torch/csrc/jit/tensorexpr/kernel.cpp",
     "torch/csrc/jit/tensorexpr/llvm_codegen.cpp",
     "torch/csrc/jit/tensorexpr/llvm_jit.cpp",
+    "torch/csrc/jit/tensorexpr/loopnest.cpp",
     "torch/csrc/jit/tensorexpr/mem_arena.cpp",
-    "torch/csrc/jit/tensorexpr/schedule.cpp",
     "torch/csrc/jit/tensorexpr/tensor.cpp",
     "torch/csrc/jit/tensorexpr/types.cpp",
     "torch/csrc/jit/tensorexpr/unique_name_manager.cpp",
diff --git a/torch/csrc/jit/tensorexpr/kernel.cpp b/torch/csrc/jit/tensorexpr/kernel.cpp
index 0eedfb7382a9..867575cb7f3d 100644
--- a/torch/csrc/jit/tensorexpr/kernel.cpp
+++ b/torch/csrc/jit/tensorexpr/kernel.cpp
@@ -4,7 +4,7 @@
 #include <torch/csrc/jit/tensorexpr/analysis.h>
 #include <torch/csrc/jit/tensorexpr/ir_printer.h>
 #include <torch/csrc/jit/tensorexpr/ir_simplifier.h>
-#include <torch/csrc/jit/tensorexpr/schedule.h>
+#include <torch/csrc/jit/tensorexpr/loopnest.h>
 
 using namespace torch::jit;
 using namespace torch::jit::tensorexpr;
diff --git a/torch/csrc/jit/tensorexpr/schedule.cpp b/torch/csrc/jit/tensorexpr/loopnest.cpp
similarity index 99%
rename from torch/csrc/jit/tensorexpr/schedule.cpp
rename to torch/csrc/jit/tensorexpr/loopnest.cpp
index 8b7b6a5a29e5..a49ee5fb4c84 100644
--- a/torch/csrc/jit/tensorexpr/schedule.cpp
+++ b/torch/csrc/jit/tensorexpr/loopnest.cpp
@@ -1,4 +1,4 @@
-#include <torch/csrc/jit/tensorexpr/schedule.h>
+#include <torch/csrc/jit/tensorexpr/loopnest.h>
 
 #include <queue>
 #include <stdexcept>
@@ -403,6 +403,7 @@ class FunctionInliner : public IRMutator {
     }
   }
 
+ private:
   std::unordered_map<const Var*, const Expr*> inline_mapping_;
   std::vector<Function*> funcs_;
   std::unordered_set<const Var*> func_var_set_;
diff --git a/torch/csrc/jit/tensorexpr/schedule.h b/torch/csrc/jit/tensorexpr/loopnest.h
similarity index 100%
rename from torch/csrc/jit/tensorexpr/schedule.h
rename to torch/csrc/jit/tensorexpr/loopnest.h