diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index a3a679c1..2b700c6c 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -18,7 +18,7 @@ libintel_tools_la_SOURCES = 	\
 	intel_drm.c		\
 	intel_gpu_tools.h	\
 	intel_mmio.c		\
-	intel_pci.c		\
+	intel_chipset.c		\
 	intel_reg.h		\
 	ioctl_wrappers.c	\
 	ioctl_wrappers.h	\
diff --git a/lib/intel_pci.c b/lib/intel_chipset.c
similarity index 100%
rename from lib/intel_pci.c
rename to lib/intel_chipset.c
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index 1814315e..e6329c9c 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -7,9 +7,9 @@ bin_SCRIPTS = chipset.py
 
 lib_LTLIBRARIES = I915ChipsetPython.la
 I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS)
-I915ChipsetPython_la_SOURCES = chipset_wrap_python.c intel_chipset.c \
+I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \
 			       $(top_srcdir)/lib/intel_drm.c  \
-			       $(top_srcdir)/lib/intel_pci.c  \
+			       $(top_srcdir)/lib/intel_chipset.c  \
 			       $(top_srcdir)/lib/intel_reg_map.c  \
 			       $(top_srcdir)/lib/intel_mmio.c  \
 			       $(top_srcdir)/lib/intel_iosf.c
diff --git a/tools/quick_dump/intel_chipset.c b/tools/quick_dump/chipset_macro_wrap.c
similarity index 100%
rename from tools/quick_dump/intel_chipset.c
rename to tools/quick_dump/chipset_macro_wrap.c