diff --git a/src/ast/AstAbstract.h b/src/ast/Abstract.h
similarity index 95%
rename from src/ast/AstAbstract.h
rename to src/ast/Abstract.h
index ddcc862753c..be5af6010bb 100644
--- a/src/ast/AstAbstract.h
+++ b/src/ast/Abstract.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstAbstract.h
+ * @file Abstract.h
  *
  * Abstract class definitions for AST nodes
  *
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "ast/AstNode.h"
+#include "ast/Node.h"
 
 namespace souffle {
 
diff --git a/src/ast/AstArgument.h b/src/ast/Argument.h
similarity index 99%
rename from src/ast/AstArgument.h
rename to src/ast/Argument.h
index d90e30557cb..038ca22068f 100644
--- a/src/ast/AstArgument.h
+++ b/src/ast/Argument.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstArgument.h
+ * @file Argument.h
  *
  * Define the classes Argument, Variable, and Constant to represent
  * variables and constants in literals. Variable and Constant are
@@ -22,9 +22,9 @@
 #include "FunctorOps.h"
 #include "RamTypes.h"
 #include "SrcLocation.h"
-#include "ast/AstAbstract.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Abstract.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/AstAttribute.h b/src/ast/Attribute.h
similarity index 95%
rename from src/ast/AstAttribute.h
rename to src/ast/Attribute.h
index 981ea2c18d8..95910ef9f14 100644
--- a/src/ast/AstAttribute.h
+++ b/src/ast/Attribute.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstAttribute.h
+ * @file Attribute.h
  *
  * Defines an attribute for a relation
  *
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "SrcLocation.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include <ostream>
 #include <string>
 #include <utility>
diff --git a/src/ast/AstClause.h b/src/ast/Clause.h
similarity index 98%
rename from src/ast/AstClause.h
rename to src/ast/Clause.h
index 7934690c261..071150495fe 100644
--- a/src/ast/AstClause.h
+++ b/src/ast/Clause.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstClause.h
+ * @file Clause.h
  *
  * Defines AST Clauses
  *
@@ -17,9 +17,9 @@
 #pragma once
 
 #include "SrcLocation.h"
-#include "ast/AstAbstract.h"
-#include "ast/AstLiteral.h"
-#include "ast/AstNode.h"
+#include "ast/Abstract.h"
+#include "ast/Literal.h"
+#include "ast/Node.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/AstComponent.h b/src/ast/Component.h
similarity index 98%
rename from src/ast/AstComponent.h
rename to src/ast/Component.h
index e9b3f3751de..5d9cdc8e077 100644
--- a/src/ast/AstComponent.h
+++ b/src/ast/Component.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstComponent.h
+ * @file Component.h
  *
  * Defines the class utilized to model a component within the input program.
  *
@@ -17,12 +17,12 @@
 #pragma once
 
 #include "SrcLocation.h"
-#include "ast/AstClause.h"
-#include "ast/AstIO.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
-#include "ast/AstRelation.h"
-#include "ast/AstType.h"
+#include "ast/Clause.h"
+#include "ast/IO.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
+#include "ast/Relation.h"
+#include "ast/Type.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/AstFunctorDeclaration.h b/src/ast/FunctorDeclaration.h
similarity index 98%
rename from src/ast/AstFunctorDeclaration.h
rename to src/ast/FunctorDeclaration.h
index 0b0f1a0a1bd..8deebb89daa 100644
--- a/src/ast/AstFunctorDeclaration.h
+++ b/src/ast/FunctorDeclaration.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstFunctorDeclaration.h
+ * @file FunctorDeclaration.h
  *
  * Defines external functors.
  *
@@ -18,7 +18,7 @@
 
 #include "RamTypes.h"
 #include "SrcLocation.h"
-#include "ast/AstNode.h"
+#include "ast/Node.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
 #include "utility/tinyformat.h"
diff --git a/src/ast/AstIO.h b/src/ast/IO.h
similarity index 97%
rename from src/ast/AstIO.h
rename to src/ast/IO.h
index 885fc68507f..1c16be15b11 100644
--- a/src/ast/AstIO.h
+++ b/src/ast/IO.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstIO.h
+ * @file IO.h
  *
  * Define the classes representing IO operations.
  *
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "SrcLocation.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
 #include <map>
diff --git a/src/ast/AstLiteral.h b/src/ast/Literal.h
similarity index 98%
rename from src/ast/AstLiteral.h
rename to src/ast/Literal.h
index 61ba737a127..7143aac5603 100644
--- a/src/ast/AstLiteral.h
+++ b/src/ast/Literal.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstLiteral.h
+ * @file Literal.h
  *
  * Define classes for Literals and its subclasses atoms, negated atoms,
  * and binary relations.
@@ -19,9 +19,9 @@
 
 #include "BinaryConstraintOps.h"
 #include "SrcLocation.h"
-#include "ast/AstAbstract.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Abstract.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/AstNode.h b/src/ast/Node.h
similarity index 99%
rename from src/ast/AstNode.h
rename to src/ast/Node.h
index 53e8f05f14a..5970a05d070 100644
--- a/src/ast/AstNode.h
+++ b/src/ast/Node.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstNode.h
+ * @file Node.h
  *
  * Abstract class definitions for AST nodes
  *
diff --git a/src/ast/AstParserUtils.cpp b/src/ast/ParserUtils.cpp
similarity index 97%
rename from src/ast/AstParserUtils.cpp
rename to src/ast/ParserUtils.cpp
index 3dc1f046438..a13babc6b65 100644
--- a/src/ast/AstParserUtils.cpp
+++ b/src/ast/ParserUtils.cpp
@@ -8,17 +8,17 @@
 
 /************************************************************************
  *
- * @file AstParserUtils.cpp
+ * @file ParserUtils.cpp
  *
  * Defines class RuleBody to represents rule bodies.
  *
  ***********************************************************************/
 
-#include "ast/AstParserUtils.h"
-#include "ast/AstClause.h"
-#include "ast/AstLiteral.h"
-#include "ast/AstNode.h"
-#include "ast/AstUtils.h"
+#include "ast/ParserUtils.h"
+#include "ast/Clause.h"
+#include "ast/Literal.h"
+#include "ast/Node.h"
+#include "ast/Utils.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/AstParserUtils.h b/src/ast/ParserUtils.h
similarity index 97%
rename from src/ast/AstParserUtils.h
rename to src/ast/ParserUtils.h
index e64ddf8af10..b4a623063f7 100644
--- a/src/ast/AstParserUtils.h
+++ b/src/ast/ParserUtils.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstParserUtils.h
+ * @file ParserUtils.h
  *
  * Defines class RuleBody to represents rule bodies.
  *
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "ast/AstAbstract.h"
+#include "ast/Abstract.h"
 #include "utility/MiscUtil.h"
 #include <iosfwd>
 #include <memory>
diff --git a/src/ast/AstPragma.h b/src/ast/Pragma.h
similarity index 97%
rename from src/ast/AstPragma.h
rename to src/ast/Pragma.h
index ad8f1594d6d..444d1d59a76 100644
--- a/src/ast/AstPragma.h
+++ b/src/ast/Pragma.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstPragma.h
+ * @file Pragma.h
  *
  * Define the class AstPragma to update global options based on parameter.
  *
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "SrcLocation.h"
-#include "ast/AstNode.h"
+#include "ast/Node.h"
 #include <ostream>
 #include <string>
 #include <utility>
diff --git a/src/ast/AstProgram.h b/src/ast/Program.h
similarity index 96%
rename from src/ast/AstProgram.h
rename to src/ast/Program.h
index 187da018e32..1769b43f4dd 100644
--- a/src/ast/AstProgram.h
+++ b/src/ast/Program.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstProgram.h
+ * @file Program.h
  *
  * Define a class that represents a Datalog program consisting of types,
  * relations, and clauses.
@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include "ast/AstClause.h"
-#include "ast/AstComponent.h"
-#include "ast/AstFunctorDeclaration.h"
-#include "ast/AstIO.h"
-#include "ast/AstNode.h"
-#include "ast/AstPragma.h"
-#include "ast/AstQualifiedName.h"
-#include "ast/AstRelation.h"
-#include "ast/AstType.h"
-#include "ast/AstUtils.h"
+#include "ast/Clause.h"
+#include "ast/Component.h"
+#include "ast/FunctorDeclaration.h"
+#include "ast/IO.h"
+#include "ast/Node.h"
+#include "ast/Pragma.h"
+#include "ast/QualifiedName.h"
+#include "ast/Relation.h"
+#include "ast/Type.h"
+#include "ast/Utils.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <algorithm>
diff --git a/src/ast/AstQualifiedName.h b/src/ast/QualifiedName.h
similarity index 99%
rename from src/ast/AstQualifiedName.h
rename to src/ast/QualifiedName.h
index 5d8531ed897..79ecb053585 100644
--- a/src/ast/AstQualifiedName.h
+++ b/src/ast/QualifiedName.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstQualifiedName.h
+ * @file QualifiedName.h
  *
  * Defines qualified names so that objects in components (types,
  * relations, etc.) can be accessed via either a fully/partially
diff --git a/src/ast/AstRelation.h b/src/ast/Relation.h
similarity index 97%
rename from src/ast/AstRelation.h
rename to src/ast/Relation.h
index d5b3fce6516..a5f775d95cf 100644
--- a/src/ast/AstRelation.h
+++ b/src/ast/Relation.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstRelation.h
+ * @file Relation.h
  *
  * Defines class Relation that represents relations in a Datalog program.
  * A relation can either be an IDB or EDB relation.
@@ -19,9 +19,9 @@
 
 #include "RelationTag.h"
 #include "SrcLocation.h"
-#include "ast/AstAttribute.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Attribute.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <algorithm>
diff --git a/src/ast/AstTranslationUnit.h b/src/ast/TranslationUnit.h
similarity index 98%
rename from src/ast/AstTranslationUnit.h
rename to src/ast/TranslationUnit.h
index 1fd1b80995b..0b0ee29df4a 100644
--- a/src/ast/AstTranslationUnit.h
+++ b/src/ast/TranslationUnit.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstTranslationUnit.h
+ * @file TranslationUnit.h
  *
  * Define AST translation unit class consisting of
  * an symbol table, AST program, error reports, and
@@ -20,7 +20,7 @@
 
 #include "DebugReport.h"
 #include "Global.h"
-#include "ast/AstProgram.h"
+#include "ast/Program.h"
 #include "ast/analysis/AstAnalysis.h"
 #include "ast/analysis/RecursiveClauses.h"
 #include "ast/analysis/SCCGraph.h"
diff --git a/src/ast/AstType.h b/src/ast/Type.h
similarity index 97%
rename from src/ast/AstType.h
rename to src/ast/Type.h
index 6bd90b351ec..aab176fcba1 100644
--- a/src/ast/AstType.h
+++ b/src/ast/Type.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstType.h
+ * @file Type.h
  *
  * Defines a type, i.e., disjoint supersets of the universe
  *
@@ -18,9 +18,9 @@
 
 #include "RamTypes.h"
 #include "SrcLocation.h"
-#include "ast/AstAttribute.h"
-#include "ast/AstNode.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/Attribute.h"
+#include "ast/Node.h"
+#include "ast/QualifiedName.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
diff --git a/src/ast/TypeSystem.h b/src/ast/TypeSystem.h
index 711dfce3e16..3d7fe7b97a7 100644
--- a/src/ast/TypeSystem.h
+++ b/src/ast/TypeSystem.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "RamTypes.h"
-#include "ast/AstQualifiedName.h"
+#include "ast/QualifiedName.h"
 #include "utility/ContainerUtil.h"
 #include "utility/FunctionalUtil.h"
 #include "utility/MiscUtil.h"
diff --git a/src/ast/AstUtils.cpp b/src/ast/Utils.cpp
similarity index 96%
rename from src/ast/AstUtils.cpp
rename to src/ast/Utils.cpp
index f9f62045138..dae32b315c0 100644
--- a/src/ast/AstUtils.cpp
+++ b/src/ast/Utils.cpp
@@ -8,26 +8,26 @@
 
 /************************************************************************
  *
- * @file AstUtils.cpp
+ * @file Utils.cpp
  *
  * A collection of utilities operating on AST constructs.
  *
  ***********************************************************************/
 
-#include "ast/AstUtils.h"
+#include "ast/Utils.h"
 #include "BinaryConstraintOps.h"
 #include "TypeSystem.h"
-#include "ast/AstAbstract.h"
-#include "ast/AstArgument.h"
-#include "ast/AstClause.h"
-#include "ast/AstFunctorDeclaration.h"
-#include "ast/AstLiteral.h"
-#include "ast/AstNode.h"
-#include "ast/AstProgram.h"
-#include "ast/AstQualifiedName.h"
-#include "ast/AstRelation.h"
-#include "ast/AstType.h"
-#include "ast/AstVisitor.h"
+#include "ast/Abstract.h"
+#include "ast/Argument.h"
+#include "ast/Clause.h"
+#include "ast/FunctorDeclaration.h"
+#include "ast/Literal.h"
+#include "ast/Node.h"
+#include "ast/Program.h"
+#include "ast/QualifiedName.h"
+#include "ast/Relation.h"
+#include "ast/Type.h"
+#include "ast/Visitor.h"
 #include "ast/analysis/AstType.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
diff --git a/src/ast/AstUtils.h b/src/ast/Utils.h
similarity index 99%
rename from src/ast/AstUtils.h
rename to src/ast/Utils.h
index fc65d9e2772..bc4852913b9 100644
--- a/src/ast/AstUtils.h
+++ b/src/ast/Utils.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstUtils.h
+ * @file Utils.h
  *
  * A collection of utilities operating on AST constructs.
  *
diff --git a/src/ast/AstVisitor.h b/src/ast/Visitor.h
similarity index 97%
rename from src/ast/AstVisitor.h
rename to src/ast/Visitor.h
index bd060aa7d2c..1b18ae35f40 100644
--- a/src/ast/AstVisitor.h
+++ b/src/ast/Visitor.h
@@ -8,7 +8,7 @@
 
 /************************************************************************
  *
- * @file AstVisitor.h
+ * @file Visitor.h
  *
  * Provides some infrastructure for the implementation of operations
  * on top of AST structures.
@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include "ast/AstArgument.h"
-#include "ast/AstAttribute.h"
-#include "ast/AstClause.h"
-#include "ast/AstComponent.h"
-#include "ast/AstLiteral.h"
-#include "ast/AstNode.h"
-#include "ast/AstPragma.h"
-#include "ast/AstProgram.h"
-#include "ast/AstRelation.h"
-#include "ast/AstType.h"
+#include "ast/Argument.h"
+#include "ast/Attribute.h"
+#include "ast/Clause.h"
+#include "ast/Component.h"
+#include "ast/Literal.h"
+#include "ast/Node.h"
+#include "ast/Pragma.h"
+#include "ast/Program.h"
+#include "ast/Relation.h"
+#include "ast/Type.h"
 #include "utility/FunctionalUtil.h"
 #include "utility/MiscUtil.h"
 #include <cstddef>