diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44ef4ed12..9aa973f67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,7 +261,7 @@ add_custom_target(generate_opencypher_parser
    COMMAND
    ${CMAKE_COMMAND} -E make_directory ${opencypher_generated}
    COMMAND 
-   java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.6-complete.jar -Dlanguage=Cpp -visitor -o ${opencypher_generated} -package antlrcpptest ${opencypher_grammar}
+   java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.6-complete.jar -Dlanguage=Cpp -visitor -o ${opencypher_generated} -package antlropencypher ${opencypher_grammar}
    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
    DEPENDS ${opencypher_grammar}
    )
diff --git a/src/query/frontend/opencypher/generated/CypherBaseListener.cpp b/src/query/frontend/opencypher/generated/CypherBaseListener.cpp
index 884d3d3b6..05d7787f4 100644
--- a/src/query/frontend/opencypher/generated/CypherBaseListener.cpp
+++ b/src/query/frontend/opencypher/generated/CypherBaseListener.cpp
@@ -5,4 +5,4 @@
 
 #include "CypherBaseListener.h"
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
diff --git a/src/query/frontend/opencypher/generated/CypherBaseListener.h b/src/query/frontend/opencypher/generated/CypherBaseListener.h
index a40bcf8ea..a7d2660ca 100644
--- a/src/query/frontend/opencypher/generated/CypherBaseListener.h
+++ b/src/query/frontend/opencypher/generated/CypherBaseListener.h
@@ -8,7 +8,7 @@
 #include "CypherListener.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 /**
  * This class provides an empty implementation of CypherListener,
@@ -263,4 +263,4 @@ public:
 
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/generated/CypherBaseVisitor.cpp b/src/query/frontend/opencypher/generated/CypherBaseVisitor.cpp
index cd90d7fd3..f5f2c48e9 100644
--- a/src/query/frontend/opencypher/generated/CypherBaseVisitor.cpp
+++ b/src/query/frontend/opencypher/generated/CypherBaseVisitor.cpp
@@ -5,4 +5,4 @@
 
 #include "CypherBaseVisitor.h"
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
diff --git a/src/query/frontend/opencypher/generated/CypherBaseVisitor.h b/src/query/frontend/opencypher/generated/CypherBaseVisitor.h
index b190de96a..265e435e7 100644
--- a/src/query/frontend/opencypher/generated/CypherBaseVisitor.h
+++ b/src/query/frontend/opencypher/generated/CypherBaseVisitor.h
@@ -8,7 +8,7 @@
 #include "CypherVisitor.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 /**
  * This class provides an empty implementation of CypherVisitor, which can be
@@ -336,4 +336,4 @@ public:
 
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/generated/CypherLexer.cpp b/src/query/frontend/opencypher/generated/CypherLexer.cpp
index 49a5b90fc..24b3eb6ed 100644
--- a/src/query/frontend/opencypher/generated/CypherLexer.cpp
+++ b/src/query/frontend/opencypher/generated/CypherLexer.cpp
@@ -7,7 +7,7 @@
 
 using namespace antlr4;
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
 
 CypherLexer::CypherLexer(CharStream* input) : Lexer(input) {
   _interpreter = new atn::LexerATNSimulator(this, _atn, _decisionToDFA,
diff --git a/src/query/frontend/opencypher/generated/CypherLexer.h b/src/query/frontend/opencypher/generated/CypherLexer.h
index bcb3f4528..a6faa4381 100644
--- a/src/query/frontend/opencypher/generated/CypherLexer.h
+++ b/src/query/frontend/opencypher/generated/CypherLexer.h
@@ -7,7 +7,7 @@
 #include "antlr4-runtime.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 
 class  CypherLexer : public antlr4::Lexer {
@@ -73,4 +73,4 @@ private:
   static Initializer _init;
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/generated/CypherListener.cpp b/src/query/frontend/opencypher/generated/CypherListener.cpp
index 252830fce..8a9a59f98 100644
--- a/src/query/frontend/opencypher/generated/CypherListener.cpp
+++ b/src/query/frontend/opencypher/generated/CypherListener.cpp
@@ -5,4 +5,4 @@
 
 #include "CypherListener.h"
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
diff --git a/src/query/frontend/opencypher/generated/CypherListener.h b/src/query/frontend/opencypher/generated/CypherListener.h
index d3279c77a..1c940dc06 100644
--- a/src/query/frontend/opencypher/generated/CypherListener.h
+++ b/src/query/frontend/opencypher/generated/CypherListener.h
@@ -8,7 +8,7 @@
 #include "CypherParser.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 /**
  * This interface defines an abstract listener for a parse tree produced by CypherParser.
@@ -256,4 +256,4 @@ public:
 
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/generated/CypherParser.cpp b/src/query/frontend/opencypher/generated/CypherParser.cpp
index 2242a5b69..a61aceebb 100644
--- a/src/query/frontend/opencypher/generated/CypherParser.cpp
+++ b/src/query/frontend/opencypher/generated/CypherParser.cpp
@@ -9,7 +9,7 @@
 #include "CypherParser.h"
 
 using namespace antlrcpp;
-using namespace antlrcpptest;
+using namespace antlropencypher;
 using namespace antlr4;
 
 CypherParser::CypherParser(TokenStream *input) : Parser(input) {
diff --git a/src/query/frontend/opencypher/generated/CypherParser.h b/src/query/frontend/opencypher/generated/CypherParser.h
index bf893e58f..1c3cdb243 100644
--- a/src/query/frontend/opencypher/generated/CypherParser.h
+++ b/src/query/frontend/opencypher/generated/CypherParser.h
@@ -7,7 +7,7 @@
 #include "antlr4-runtime.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 
 class  CypherParser : public antlr4::Parser {
@@ -1655,4 +1655,4 @@ private:
   static Initializer _init;
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/generated/CypherVisitor.cpp b/src/query/frontend/opencypher/generated/CypherVisitor.cpp
index 7cf88770c..d001e27a4 100644
--- a/src/query/frontend/opencypher/generated/CypherVisitor.cpp
+++ b/src/query/frontend/opencypher/generated/CypherVisitor.cpp
@@ -5,4 +5,4 @@
 
 #include "CypherVisitor.h"
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
diff --git a/src/query/frontend/opencypher/generated/CypherVisitor.h b/src/query/frontend/opencypher/generated/CypherVisitor.h
index 5fc29342c..78628d080 100644
--- a/src/query/frontend/opencypher/generated/CypherVisitor.h
+++ b/src/query/frontend/opencypher/generated/CypherVisitor.h
@@ -8,7 +8,7 @@
 #include "CypherParser.h"
 
 
-namespace antlrcpptest {
+namespace antlropencypher {
 
 /**
  * This class defines an abstract visitor for a parse tree
@@ -181,4 +181,4 @@ public:
 
 };
 
-}  // namespace antlrcpptest
+}  // namespace antlropencypher
diff --git a/src/query/frontend/opencypher/parser.hpp b/src/query/frontend/opencypher/parser.hpp
index ddcd67252..f1d9f1808 100644
--- a/src/query/frontend/opencypher/parser.hpp
+++ b/src/query/frontend/opencypher/parser.hpp
@@ -9,7 +9,7 @@
 namespace frontend {
 namespace opencypher {
 
-using namespace antlrcpptest;
+using namespace antlropencypher;
 using namespace antlr4;
 
 /**
diff --git a/src/query/stripper.hpp b/src/query/stripper.hpp
index 2c3b888f3..dcff02b66 100644
--- a/src/query/stripper.hpp
+++ b/src/query/stripper.hpp
@@ -19,7 +19,7 @@
 #include "query/frontend/opencypher/generated/CypherParser.h"
 
 using namespace antlr4;
-using namespace antlrcpptest;
+using namespace antlropencypher;
 
 /**
  * @brief QueryStripper