diff --git a/Monicelli.lpp b/Monicelli.lpp
index e7e4336..bb67002 100644
--- a/Monicelli.lpp
+++ b/Monicelli.lpp
@@ -163,7 +163,7 @@ CHAR  [a-zA-Z_]
     return token::COLON;
 }
 "blinda la supercazzo"("r"|"l")"a" {
-    return token::FUNDECL;
+    return token::FUN_DECL;
 }
 "con" {
     return token::PARAMS;
@@ -172,7 +172,7 @@ CHAR  [a-zA-Z_]
     return token::COMMA;
 }
 ("b"|"p")"rematurata la supercazzo"("r"|"l")"a" {
-    return token::FUNCALL;
+    return token::FUN_CALL;
 }
 "o scherziamo"("?")? {
     return token::FUN_END;
diff --git a/Monicelli.ypp b/Monicelli.ypp
index 7756ef5..7e6664a 100644
--- a/Monicelli.ypp
+++ b/Monicelli.ypp
@@ -60,7 +60,7 @@
 %token LOOP_BEGIN LOOP_CONDITION
 %token BRANCH_CONDITION BRANCH_BEGIN BRANCH_ELSE BRANCH_END CASE_END
 %token COLON COMMA
-%token FUNDECL PARAMS FUNCALL FUN_END
+%token FUN_DECL PARAMS FUN_CALL FUN_END
 %token ABORT
 %token ID NUMBER FLOAT
 
@@ -155,7 +155,7 @@ fun_decls:
     fun_decls
 ;
 fun_decl:
-    FUNDECL fun_return ID {
+    FUN_DECL fun_return ID {
         funArgStack.push(new FunArgList());
     } args FUN_END {
         stmtStack.push(new StatementList());
@@ -305,7 +305,7 @@ case_stmt:
     }
 ;
 fun_call:
-    FUNCALL {
+    FUN_CALL {
         argsStack.push(new ExpressionList());
     }
     ID call_args FUN_END {