diff --git a/src/query/frontend/interpret/interpret.hpp b/src/query/frontend/interpret/interpret.hpp
index 1046006d4..ad9a3dbe5 100644
--- a/src/query/frontend/interpret/interpret.hpp
+++ b/src/query/frontend/interpret/interpret.hpp
@@ -5,7 +5,7 @@
 #include "utils/assert.hpp"
 #include "query/backend/cpp/typed_value.hpp"
 #include "query/frontend/ast/ast.hpp"
-#include "query/frontend/typecheck/symbol_table.hpp"
+#include "query/frontend/semantic/symbol_table.hpp"
 
 namespace query {
 
diff --git a/src/query/frontend/logical/operator.hpp b/src/query/frontend/logical/operator.hpp
index 6307aef67..94f3793e7 100644
--- a/src/query/frontend/logical/operator.hpp
+++ b/src/query/frontend/logical/operator.hpp
@@ -7,7 +7,7 @@
 #include "database/graph_db_accessor.hpp"
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/interpret/interpret.hpp"
-#include "query/frontend/typecheck/symbol_table.hpp"
+#include "query/frontend/semantic/symbol_table.hpp"
 
 namespace query {
 
diff --git a/src/query/frontend/logical/planner.hpp b/src/query/frontend/logical/planner.hpp
index f6b1f6c8b..e9dc10a5e 100644
--- a/src/query/frontend/logical/planner.hpp
+++ b/src/query/frontend/logical/planner.hpp
@@ -34,7 +34,7 @@ std::shared_ptr<LogicalOperator> GenReturn(
   return std::make_shared<Produce>(current_op, ret.named_expressions_);
 }
 
-std::shared_ptr<LogicalOperator> Apply(Query& query)
+std::shared_ptr<LogicalOperator> MakeLogicalPlan(Query& query)
 {
   std::shared_ptr<LogicalOperator> current_op;
   for (auto& clause : query.clauses_) {
diff --git a/src/query/frontend/typecheck/typecheck.hpp b/src/query/frontend/semantic/symbol_generator.hpp
similarity index 93%
rename from src/query/frontend/typecheck/typecheck.hpp
rename to src/query/frontend/semantic/symbol_generator.hpp
index 9d1dc3735..c11551762 100644
--- a/src/query/frontend/typecheck/typecheck.hpp
+++ b/src/query/frontend/semantic/symbol_generator.hpp
@@ -2,13 +2,13 @@
 
 #include "utils/exceptions/basic_exception.hpp"
 #include "query/frontend/ast/ast.hpp"
-#include "query/frontend/typecheck/symbol_table.hpp"
+#include "query/frontend/semantic/symbol_table.hpp"
 
 namespace query {
 
-class TypeCheckVisitor : public TreeVisitorBase {
+class SymbolGenerator : public TreeVisitorBase {
  public:
-  TypeCheckVisitor(SymbolTable& symbol_table) : symbol_table_(symbol_table) {}
+  SymbolGenerator(SymbolTable& symbol_table) : symbol_table_(symbol_table) {}
 
   // Expressions
   void PreVisit(NamedExpression& named_expr) override {
diff --git a/src/query/frontend/typecheck/symbol_table.hpp b/src/query/frontend/semantic/symbol_table.hpp
similarity index 100%
rename from src/query/frontend/typecheck/symbol_table.hpp
rename to src/query/frontend/semantic/symbol_table.hpp