diff --git a/src/lex_parser.y b/src/lex_parser.y
index edd8e0d..6a7657e 100644
--- a/src/lex_parser.y
+++ b/src/lex_parser.y
@@ -42,10 +42,10 @@ typedef void* yyscan_t;
 	Statement* statement;
 	SelectStatement* select_statement;
 	TableRef* table;
-	Expression* expr;
+	Expr* expr;
 
 	List<char*>* slist;
-	List<Expression*>* explist;
+	List<Expr*>* explist;
 }
 
 %token SELECT FROM GROUP BY WHERE NOT AND OR
@@ -131,15 +131,15 @@ comparison_predicate:
 
 
 expr:
-		column_name { $$ = new Expression($1); }
-	|	NAME '(' column_name ')' { $$ = new Expression($3, $1); }
+		column_name { $$ = new Expr($1); }
+	|	NAME '(' column_name ')' { $$ = new Expr($3, $1); }
 	;
 
 
 
 /* Lists */
 expr_list: 
-		expr { $$ = new List<Expression*>($1); }
+		expr { $$ = new List<Expr*>($1); }
 	|	expr_list ',' expr { $1->push_back($3); $$ = $1; }
 	;
 
diff --git a/src/lib/Expression.cpp b/src/lib/Expr.cpp
similarity index 100%
rename from src/lib/Expression.cpp
rename to src/lib/Expr.cpp
diff --git a/src/lib/Expr.h b/src/lib/Expr.h
new file mode 100644
index 0000000..6fb064e
--- /dev/null
+++ b/src/lib/Expr.h
@@ -0,0 +1,17 @@
+#ifndef __EXPRESSION_H__
+#define __EXPRESSION_H__
+
+#include <cstdlib>
+
+
+class Expr {
+public:
+	Expr(char* name) : name(name), func_name(NULL) {};
+	Expr(char* name, char* func_name) : name(name), func_name(func_name) {};
+
+	char* name;
+	char* func_name;
+};
+
+
+#endif
\ No newline at end of file
diff --git a/src/lib/Expression.h b/src/lib/Expression.h
deleted file mode 100644
index 66440c5..0000000
--- a/src/lib/Expression.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __EXPRESSION_H__
-#define __EXPRESSION_H__
-
-#include <cstdlib>
-
-
-class Expression {
-public:
-	Expression(char* name) : name(name), func_name(NULL) {};
-	Expression(char* name, char* func_name) : name(name), func_name(func_name) {};
-
-	char* name;
-	char* func_name;
-};
-
-
-#endif
\ No newline at end of file
diff --git a/src/lib/Statement.h b/src/lib/Statement.h
index 786f185..8403464 100644
--- a/src/lib/Statement.h
+++ b/src/lib/Statement.h
@@ -5,7 +5,7 @@
 #ifndef __STATEMENT_H__
 #define __STATEMENT_H__
  
-#include "Expression.h"
+#include "Expr.h"
 #include "List.h"
 
 class TableRef;
@@ -32,8 +32,8 @@ public:
 	SelectStatement();
 
 	TableRef* _from_table;
-	List<Expression*>* _select_list;
-	List<Expression*>* _group_by;
+	List<Expr*>* _select_list;
+	List<Expr*>* _group_by;
 };