diff --git a/src/Makefile b/src/Makefile
index a096629..e1f4bfc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,9 +6,6 @@ LIB_FILES = parser/bison_parser.cpp parser/flex_lexer.cpp parser/SQLParser.cpp l
 TESTS_MAIN = sql_tests.cpp
 TESTS_BIN = bin/tests
 
-EXECUTION_MAIN = sql_execution.cpp
-EXECUTION_BIN = bin/sql_execution
-
 CC = g++
 CFLAGS = -g -O3 -Ilib/ -I./ -Iparser/ -std=c++11 -pthread
 
@@ -22,8 +19,8 @@ build: clean
 	cp parser/*.cpp build/
 
 
-execution: $(LIB_FILES) $(EXECUTION_MAIN)
-	$(CC) $(CFLAGS) $(LIB_FILES) $(EXECUTION_MAIN) -o $(EXECUTION_BIN)
+analysis: $(LIB_FILES) sql_analysis.cpp
+	$(CC) $(CFLAGS) $(LIB_FILES) sql_analysis.cpp -o bin/analysis
 
 
 grammar_test: $(LIB_FILES) sql_grammar_test.cpp
@@ -39,5 +36,5 @@ parser/bison_parser.cpp:
 
 
 clean:
-	rm -f *.o *~ $(EXECUTION_BIN) $(TESTS_BIN) bin/grammar_test
+	rm -f *.o *~ bin/analysis $(TESTS_BIN) bin/grammar_test
 	make clean -C parser/
diff --git a/src/build_and_run_tests.sh b/src/build_and_run_tests.sh
index d08fbc2..46b1f7e 100644
--- a/src/build_and_run_tests.sh
+++ b/src/build_and_run_tests.sh
@@ -4,7 +4,7 @@ make clean
 # make tests
 # ./bin/tests
 
-make execution
+make analysis
 
 make grammar_test
 
@@ -19,8 +19,9 @@ echo "\n\n"
 
 echo "\n\n"
 
-./bin/sql_execution "SELECT a FROM foo WHERE a > 12 OR b > 3 AND c = 3"
-./bin/sql_execution "SELECT col1, col2, 'test' FROM table, foo WHERE age > 12 AND zipcode = 12345 GROUP BY col1 ORDER BY col2 DESC LIMIT 100;"
-# ./bin/sql_execution "SELECT * from table WHERE (b OR NOT a) AND a = 12.5 JOIN table2 ON a = b"
+# ./bin/analysis "SELECT a FROM foo WHERE a > 12 OR b > 3 AND c = 3"
+./bin/analysis "SELECT col1, col2, 'test' FROM table, foo WHERE age > 12 AND zipcode = 12345 GROUP BY col1 ORDER BY col2 DESC LIMIT 100;"
+./bin/analysis "SELECT * from table WHERE (b OR NOT a) AND a = 12.5 JOIN table2 ON a = b"
+# ./bin/analysis "SELECT * from table WHERE (b OR NOT a) AND a = 12.5 JOIN table2 ON a = b"
 
 echo "\n\n"
\ No newline at end of file
diff --git a/src/sql_execution.cpp b/src/sql_analysis.cpp
similarity index 100%
rename from src/sql_execution.cpp
rename to src/sql_analysis.cpp