diff --git a/lib/pddlparse/include/pddlparse/ParserException.h b/lib/pddlparse/include/pddlparse/Exception.h
similarity index 54%
rename from lib/pddlparse/include/pddlparse/ParserException.h
rename to lib/pddlparse/include/pddlparse/Exception.h
index b0630bb..e8a04df 100644
--- a/lib/pddlparse/include/pddlparse/ParserException.h
+++ b/lib/pddlparse/include/pddlparse/Exception.h
@@ -1,5 +1,5 @@
-#ifndef __PDDL_PARSE__PARSER_EXCEPTION_H
-#define __PDDL_PARSE__PARSER_EXCEPTION_H
+#ifndef __PDDL_PARSE__EXCEPTION_H
+#define __PDDL_PARSE__EXCEPTION_H
 
 #include <exception>
 #include <string>
@@ -11,39 +11,39 @@ namespace pddl
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// ParserException
+// Exception
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class ParserException: public std::exception
+class Exception: public std::exception
 {
 	public:
-		explicit ParserException()
-		:	ParserException("unspecified parser error")
+		explicit Exception()
+		:	Exception("unspecified parser error")
 		{
 		}
 
-		explicit ParserException(const char *message)
-		:	ParserException(static_cast<std::string>(message))
+		explicit Exception(const char *message)
+		:	Exception(static_cast<std::string>(message))
 		{
 		}
 
-		explicit ParserException(const std::string &message)
+		explicit Exception(const std::string &message)
 		:	m_message{message}
 		{
 		}
 
-		explicit ParserException(const tokenize::Location &location)
-		:	ParserException(location, "unspecified parser error")
+		explicit Exception(const tokenize::Location &location)
+		:	Exception(location, "unspecified parser error")
 		{
 		}
 
-		explicit ParserException(const tokenize::Location &location, const char *message)
-		:	ParserException(location, static_cast<std::string>(message))
+		explicit Exception(const tokenize::Location &location, const char *message)
+		:	Exception(location, static_cast<std::string>(message))
 		{
 		}
 
-		explicit ParserException(const tokenize::Location &location, const std::string &message)
+		explicit Exception(const tokenize::Location &location, const std::string &message)
 		:	m_location{location},
 			m_message{message},
 			// TODO: refactor
@@ -52,7 +52,7 @@ class ParserException: public std::exception
 		{
 		}
 
-		~ParserException() noexcept = default;
+		~Exception() noexcept = default;
 
 		const char *what() const throw()
 		{
@@ -77,6 +77,14 @@ class ParserException: public std::exception
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+class ParserException : public Exception
+{
+	public:
+		using Exception::Exception;
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 }
 
 #endif
diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h b/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h
index eb95854..efbfb5a 100644
--- a/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h
+++ b/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h
@@ -3,7 +3,7 @@
 
 #include <pddlparse/AST.h>
 #include <pddlparse/Context.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTContext.h>
 #include <pddlparse/detail/VariableStack.h>
 #include <pddlparse/detail/parsing/VariableDeclaration.h>
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp
index 774024e..d377070 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/Action.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTContext.h>
 #include <pddlparse/detail/VariableStack.h>
 #include <pddlparse/detail/parsing/Effect.h>
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp
index 5fa3230..76e30c0 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/Constant.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 
 namespace pddl
 {
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp
index a1c3196..38a9d2f 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/ConstantDeclaration.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTCopy.h>
 #include <pddlparse/detail/parsing/PrimitiveType.h>
 
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp
index f760d1c..7931bb4 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/Description.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/parsing/Domain.h>
 #include <pddlparse/detail/parsing/Problem.h>
 #include <pddlparse/detail/parsing/Utils.h>
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp
index e508efa..0f83876 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/Domain.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/Requirements.h>
 #include <pddlparse/detail/parsing/Action.h>
 #include <pddlparse/detail/parsing/ConstantDeclaration.h>
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp
index fdfa7c3..9f3d495 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/InitialState.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/parsing/Fact.h>
 
 namespace pddl
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp
index b5291b2..470861c 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/PredicateDeclaration.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTContext.h>
 #include <pddlparse/detail/parsing/VariableDeclaration.h>
 
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp
index 669ab08..11344e3 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/PrimitiveType.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/Requirements.h>
 
 namespace pddl
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp
index ae22764..19564d5 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/PrimitiveTypeDeclaration.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTCopy.h>
 #include <pddlparse/detail/parsing/PrimitiveType.h>
 
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
index 4f9bef6..ba48558 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/Problem.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/Requirements.h>
 #include <pddlparse/detail/parsing/ConstantDeclaration.h>
 #include <pddlparse/detail/parsing/InitialState.h>
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp
index d980087..04acb3d 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp
@@ -4,7 +4,7 @@
 #include <map>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 
 namespace pddl
 {
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp
index 5b74b3d..16f6998 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp
@@ -1,6 +1,6 @@
 #include <pddlparse/detail/parsing/Type.h>
 
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/parsing/Expressions.h>
 #include <pddlparse/detail/parsing/PrimitiveType.h>
 
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp
index 1da68be..857a507 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/Variable.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 
 namespace pddl
 {
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp
index ff66267..0dcd90b 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp
@@ -1,7 +1,7 @@
 #include <pddlparse/detail/parsing/VariableDeclaration.h>
 
 #include <pddlparse/AST.h>
-#include <pddlparse/ParserException.h>
+#include <pddlparse/Exception.h>
 #include <pddlparse/detail/ASTCopy.h>
 #include <pddlparse/detail/parsing/Type.h>