diff --git a/src/DynareBison.yy b/src/DynareBison.yy
index ad7ed5ec8bd6103b452a70d044fc32749b1b89f9..380d0bd4573405420d85bcbd3ec94f3582083edc 100644
--- a/src/DynareBison.yy
+++ b/src/DynareBison.yy
@@ -22,7 +22,10 @@
 %require "3.0"
 %defines
 %define api.value.type variant
+%define api.namespace {Dynare}
 %define parse.assert
+%define parse.error verbose
+%define parse.trace
 
 %code top {
 class ParsingDriver;
@@ -33,8 +36,6 @@ class ParsingDriver;
 #include "CodeInterpreter.hh"
 }
 
-%name-prefix "Dynare"
-
 %parse-param { ParsingDriver &driver }
 %lex-param { ParsingDriver &driver }
 
@@ -45,9 +46,6 @@ class ParsingDriver;
   @$.begin.filename = @$.end.filename = &(driver.lexer->filename);
 }
 
-%debug
-%error-verbose
-
 %code {
 /* Little hack: we redefine the macro which computes the locations, because
    we need to access the location from within the parsing driver for error
diff --git a/src/macro/MacroBison.yy b/src/macro/MacroBison.yy
index 4453fa7fff34d031cb3dc2f50d00257103d4815d..50484d55b84dd098e825b85eb8c54254e502b9e0 100644
--- a/src/macro/MacroBison.yy
+++ b/src/macro/MacroBison.yy
@@ -22,14 +22,15 @@
 %require "3.0"
 %defines
 %define api.value.type variant
+%define api.namespace {Macro}
 %define parse.assert
+%define parse.error verbose
+%define parse.trace
 
 %code top {
 class MacroDriver;
 }
 
-%name-prefix "Macro"
-
 %parse-param { MacroDriver &driver }
 %parse-param { ostream &out }
 %lex-param { MacroDriver &driver }
@@ -41,9 +42,6 @@ class MacroDriver;
   @$.begin.filename = @$.end.filename = &driver.file;
 };
 
-%debug
-%error-verbose
-
 %code requires {
 #include "MacroValue.hh"
 }