diff --git a/Makefile b/Makefile
index 501bdf9e63196707c1a04de84c32171517003e45..e58e339843ba024a03e322f823ec1d691fbaa7f7 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ MAIN_OBJS = \
 	ModelBlocks.o \
 	IncidenceMatrix.o \
 	BlockTriangular.o \
-	Model_Graph.o \
+	ModelGraph.o \
 	DynareMain.o \
 	DynareMain2.o
 
diff --git a/Model_Graph.cc b/ModelGraph.cc
similarity index 99%
rename from Model_Graph.cc
rename to ModelGraph.cc
index 40fdc7fb3d4a3a06b731224d17f267a455967763..87e459eff9b8848ca7f2dbf2c10bd53b870d65b0 100644
--- a/Model_Graph.cc
+++ b/ModelGraph.cc
@@ -26,7 +26,7 @@
 #include <stack>
 #include <cmath>
 #include "ModelTree.hh"
-#include "Model_Graph.hh"
+#include "ModelGraph.hh"
 #include "BlockTriangular.hh"
 
 using namespace std;
diff --git a/Model_Graph.hh b/ModelGraph.hh
similarity index 100%
rename from Model_Graph.hh
rename to ModelGraph.hh
diff --git a/ModelTree.cc b/ModelTree.cc
index 19345b821693cbd5b8bcb86fb2daadcd7eb078dd..02665879350542ca55bcc0efa2887e6f27a39b6b 100644
--- a/ModelTree.cc
+++ b/ModelTree.cc
@@ -35,7 +35,7 @@
 
 #include "ModelTree.hh"
 
-#include "Model_Graph.hh"
+#include "ModelGraph.hh"
 
 ModelTree::ModelTree(SymbolTable &symbol_table_arg,
                      NumericalConstants &num_constants_arg) :