diff --git a/Makefile b/Makefile
index 4f50b75..c8a10b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 compile:
-	bison --verbose -d Monicelli.y
-	flex -P mc Monicelli.ll
-	g++ -Wall -Wno-deprecated-register -std=c++11 -DYYDEBUG=0 Monicelli.tab.c lex.mc.c Nodes.cpp main.cpp -o mcc
-	rm Monicelli.tab.* lex.mc.c
+	bison --verbose -d Monicelli.ypp
+	flex -P mc Monicelli.lpp
+	g++ -Wall -Wno-deprecated-register -std=c++11 -DYYDEBUG=0 Monicelli.tab.cpp lex.mc.c Nodes.cpp main.cpp -o mcc
+	rm Monicelli.tab.* lex.*
 
 graph:
 	bison --graph Monicelli.y
 
 clean:
-	rm -f Monicelli.dot Monicelli.tab.* lex.mc.c Monicelli.output
+	rm -f Monicelli.dot Monicelli.tab.* lex.* Monicelli.output location.hh position.hh stack.hh
diff --git a/Monicelli.ll b/Monicelli.lpp
similarity index 98%
rename from Monicelli.ll
rename to Monicelli.lpp
index 9d69e7d..29e4a84 100644
--- a/Monicelli.ll
+++ b/Monicelli.lpp
@@ -1,5 +1,5 @@
 %{
-#include "Monicelli.tab.h"
+#include "Monicelli.tab.hpp"
 
 #include <string>
 #include <cstdlib>
diff --git a/Monicelli.y b/Monicelli.ypp
similarity index 100%
rename from Monicelli.y
rename to Monicelli.ypp
diff --git a/main.cpp b/main.cpp
index 2e94190..49443c0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-#include "Monicelli.tab.h"
+#include "Monicelli.tab.hpp"
 
 #include <iostream>
 #include <fstream>