diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c b/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
index bab269b24..c24dd30a8 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_api.c
@@ -29,7 +29,7 @@
 #include "fpga_x2p_setup.h"
 
 #include "mux_library_builder.h"
-#include "build_module_graph.h"
+#include "build_device_module.h"
 #include "build_device_bitstream.h"
 #include "build_fabric_bitstream.h"
 #include "bitstream_writer.h"
diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.cpp
similarity index 99%
rename from vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp
rename to vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.cpp
index ef1a03830..49b904257 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.cpp
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.cpp
@@ -20,7 +20,7 @@
 #include "build_grid_modules.h"
 #include "build_routing_modules.h"
 #include "build_top_module.h"
-#include "build_module_graph.h"
+#include "build_device_module.h"
 
 /********************************************************************
  * The main function to be called for building module graphs 
diff --git a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.h
similarity index 92%
rename from vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h
rename to vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.h
index f1375668f..40ce9e9c5 100644
--- a/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_module_graph.h
+++ b/vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_device_module.h
@@ -1,5 +1,5 @@
-#ifndef BUILD_MODULE_GRAPH_H
-#define BUILD_MODULE_GRAPH_H
+#ifndef BUILD_DEVICE_MODULE_H
+#define BUILD_DEVICE_MODULE_H
 
 #include <vector>
 #include "vpr_types.h"