diff --git a/makepanda/makepanda.vcproj b/makepanda/makepanda.vcproj
index c21322f94a..8041faf55c 100644
--- a/makepanda/makepanda.vcproj
+++ b/makepanda/makepanda.vcproj
@@ -2322,8 +2322,8 @@
 				<File RelativePath="..\panda\src\pstatclient\pStatCollectorForward.h"></File>
 				<File RelativePath="..\panda\src\pstatclient\pStatClientControlMessage.h"></File>
 				<File RelativePath="..\panda\src\pstatclient\pStatServerControlMessage.h"></File>
-				<File RelativePath="..\panda\src\pstatclient\config_pstats.h"></File>
-				<File RelativePath="..\panda\src\pstatclient\config_pstats.cxx"></File>
+				<File RelativePath="..\panda\src\pstatclient\config_pstatclient.h"></File>
+				<File RelativePath="..\panda\src\pstatclient\config_pstatclient.cxx"></File>
 				<File RelativePath="..\panda\src\pstatclient\pStatClient.cxx"></File>
 				<File RelativePath="..\panda\src\pstatclient\pStatFrameData.I"></File>
 				<File RelativePath="..\panda\src\pstatclient\test_client.cxx"></File>
diff --git a/panda/metalibs/panda/panda.cxx b/panda/metalibs/panda/panda.cxx
index d3a3b0c24a..8a193a8a28 100644
--- a/panda/metalibs/panda/panda.cxx
+++ b/panda/metalibs/panda/panda.cxx
@@ -11,7 +11,7 @@
 #include "config_display.h"
 #include "config_pgraph.h"
 #ifdef DO_PSTATS
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #endif
 
 // By including checkPandaVersion.h, we guarantee that runtime attempts to
diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index 5817b62e4a..5f282b82ce 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -58,7 +58,7 @@
 #include "colorScaleAttrib.h"
 #include "clipPlaneAttrib.h"
 #include "fogAttrib.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <algorithm>
 #include <limits.h>
diff --git a/panda/src/display/pStatGPUTimer.h b/panda/src/display/pStatGPUTimer.h
index f5185778ec..1e0accdc04 100644
--- a/panda/src/display/pStatGPUTimer.h
+++ b/panda/src/display/pStatGPUTimer.h
@@ -17,7 +17,7 @@
 #include "pandabase.h"
 #include "pStatTimer.h"
 #include "pStatCollector.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "timerQueryContext.h"
 
 class Thread;
diff --git a/panda/src/pstatclient/config_pstats.cxx b/panda/src/pstatclient/config_pstatclient.cxx
similarity index 96%
rename from panda/src/pstatclient/config_pstats.cxx
rename to panda/src/pstatclient/config_pstatclient.cxx
index dcd49a4365..4be7472441 100644
--- a/panda/src/pstatclient/config_pstats.cxx
+++ b/panda/src/pstatclient/config_pstatclient.cxx
@@ -6,12 +6,12 @@
  * license.  You should have received a copy of this license along
  * with this source code in a file named "LICENSE."
  *
- * @file config_pstats.cxx
+ * @file config_pstatclient.cxx
  * @author drose
  * @date 2000-07-09
  */
 
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include "dconfig.h"
 
@@ -19,10 +19,10 @@
   #error Buildsystem error: BUILDING_PANDA_PSTATCLIENT not defined
 #endif
 
-ConfigureDef(config_pstats);
+ConfigureDef(config_pstatclient);
 NotifyCategoryDef(pstats, "");
 
-ConfigureFn(config_pstats) {
+ConfigureFn(config_pstatclient) {
   init_libpstatclient();
 }
 
diff --git a/panda/src/pstatclient/config_pstats.h b/panda/src/pstatclient/config_pstatclient.h
similarity index 93%
rename from panda/src/pstatclient/config_pstats.h
rename to panda/src/pstatclient/config_pstatclient.h
index d3136ad736..6de3c5c120 100644
--- a/panda/src/pstatclient/config_pstats.h
+++ b/panda/src/pstatclient/config_pstatclient.h
@@ -6,7 +6,7 @@
  * license.  You should have received a copy of this license along
  * with this source code in a file named "LICENSE."
  *
- * @file config_pstats.h
+ * @file config_pstatclient.h
  * @author drose
  * @date 2000-07-09
  */
@@ -25,7 +25,7 @@
 
 // Configure variables for pstats package.
 
-ConfigureDecl(config_pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
+ConfigureDecl(config_pstatclient, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
 NotifyCategoryDecl(pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
 
 extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_name;
diff --git a/panda/src/pstatclient/p3pstatclient_composite1.cxx b/panda/src/pstatclient/p3pstatclient_composite1.cxx
index e1a29761d7..b20594b02a 100644
--- a/panda/src/pstatclient/p3pstatclient_composite1.cxx
+++ b/panda/src/pstatclient/p3pstatclient_composite1.cxx
@@ -1,5 +1,5 @@
 
-#include "config_pstats.cxx"
+#include "config_pstatclient.cxx"
 #include "pStatClient.cxx"
 #include "pStatClientImpl.cxx"
 #include "pStatClientVersion.cxx"
diff --git a/panda/src/pstatclient/pStatClient.cxx b/panda/src/pstatclient/pStatClient.cxx
index 906d99a29a..a735ea080e 100644
--- a/panda/src/pstatclient/pStatClient.cxx
+++ b/panda/src/pstatclient/pStatClient.cxx
@@ -21,7 +21,7 @@
 #include "pStatServerControlMessage.h"
 #include "pStatCollector.h"
 #include "pStatThread.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "pStatProperties.h"
 #include "thread.h"
 #include "clockObject.h"
diff --git a/panda/src/pstatclient/pStatClientControlMessage.cxx b/panda/src/pstatclient/pStatClientControlMessage.cxx
index 0cecb2aead..e7fd765547 100644
--- a/panda/src/pstatclient/pStatClientControlMessage.cxx
+++ b/panda/src/pstatclient/pStatClientControlMessage.cxx
@@ -11,7 +11,7 @@
  * @date 2000-07-09
  */
 
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "pStatClientControlMessage.h"
 #include "pStatClientVersion.h"
 
diff --git a/panda/src/pstatclient/pStatClientImpl.cxx b/panda/src/pstatclient/pStatClientImpl.cxx
index 56f044d2a1..d126c6c753 100644
--- a/panda/src/pstatclient/pStatClientImpl.cxx
+++ b/panda/src/pstatclient/pStatClientImpl.cxx
@@ -21,7 +21,7 @@
 #include "pStatServerControlMessage.h"
 #include "pStatCollector.h"
 #include "pStatThread.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "pStatProperties.h"
 #include "cmath.h"
 
diff --git a/panda/src/pstatclient/pStatFrameData.cxx b/panda/src/pstatclient/pStatFrameData.cxx
index 835b30f1df..f15f6bc61e 100644
--- a/panda/src/pstatclient/pStatFrameData.cxx
+++ b/panda/src/pstatclient/pStatFrameData.cxx
@@ -13,7 +13,7 @@
 
 #include "pStatFrameData.h"
 #include "pStatClientVersion.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include "datagram.h"
 #include "datagramIterator.h"
diff --git a/panda/src/pstatclient/pStatProperties.cxx b/panda/src/pstatclient/pStatProperties.cxx
index 25d2bfd591..01411f3f74 100644
--- a/panda/src/pstatclient/pStatProperties.cxx
+++ b/panda/src/pstatclient/pStatProperties.cxx
@@ -14,7 +14,7 @@
 #include "pStatProperties.h"
 #include "pStatCollectorDef.h"
 #include "pStatClient.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "configVariableBool.h"
 #include "configVariableColor.h"
 #include "configVariableDouble.h"
diff --git a/panda/src/pstatclient/pStatServerControlMessage.cxx b/panda/src/pstatclient/pStatServerControlMessage.cxx
index f5003ba18c..e75f9eebec 100644
--- a/panda/src/pstatclient/pStatServerControlMessage.cxx
+++ b/panda/src/pstatclient/pStatServerControlMessage.cxx
@@ -11,7 +11,7 @@
  * @date 2000-07-09
  */
 
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "pStatServerControlMessage.h"
 
 #include "datagram.h"
diff --git a/panda/src/pstatclient/test_client.cxx b/panda/src/pstatclient/test_client.cxx
index 11f6f392fe..35a79a8cbd 100644
--- a/panda/src/pstatclient/test_client.cxx
+++ b/panda/src/pstatclient/test_client.cxx
@@ -11,7 +11,7 @@
  * @date 2000-07-09
  */
 
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 #include "pStatClient.h"
 #include "pStatCollector.h"
 #include "thread.h"
diff --git a/pandatool/src/gtk-stats/gtkStats.cxx b/pandatool/src/gtk-stats/gtkStats.cxx
index b76bc292f3..5f3cf83e82 100644
--- a/pandatool/src/gtk-stats/gtkStats.cxx
+++ b/pandatool/src/gtk-stats/gtkStats.cxx
@@ -14,7 +14,7 @@
 #include "pandatoolbase.h"
 #include "gtkStats.h"
 #include "gtkStatsServer.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 GtkWidget *main_window;
 static GtkStatsServer *server = NULL;
diff --git a/pandatool/src/pstatserver/pStatGraph.cxx b/pandatool/src/pstatserver/pStatGraph.cxx
index a216950117..f65dafbc3b 100644
--- a/pandatool/src/pstatserver/pStatGraph.cxx
+++ b/pandatool/src/pstatserver/pStatGraph.cxx
@@ -16,7 +16,7 @@
 #include "pStatFrameData.h"
 #include "pStatCollectorDef.h"
 #include "string_utils.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <stdio.h>  // for sprintf
 
diff --git a/pandatool/src/pstatserver/pStatPianoRoll.cxx b/pandatool/src/pstatserver/pStatPianoRoll.cxx
index 517fca358a..923c3991e7 100644
--- a/pandatool/src/pstatserver/pStatPianoRoll.cxx
+++ b/pandatool/src/pstatserver/pStatPianoRoll.cxx
@@ -16,7 +16,7 @@
 #include "pStatFrameData.h"
 #include "pStatCollectorDef.h"
 #include "string_utils.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <algorithm>
 
diff --git a/pandatool/src/pstatserver/pStatServer.cxx b/pandatool/src/pstatserver/pStatServer.cxx
index ddb6926995..1e295ee4f9 100644
--- a/pandatool/src/pstatserver/pStatServer.cxx
+++ b/pandatool/src/pstatserver/pStatServer.cxx
@@ -14,7 +14,7 @@
 #include "pStatServer.h"
 #include "pStatReader.h"
 #include "thread.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 /**
  *
diff --git a/pandatool/src/pstatserver/pStatStripChart.cxx b/pandatool/src/pstatserver/pStatStripChart.cxx
index 28b28d6240..9b64abaa02 100644
--- a/pandatool/src/pstatserver/pStatStripChart.cxx
+++ b/pandatool/src/pstatserver/pStatStripChart.cxx
@@ -18,7 +18,7 @@
 #include "pStatFrameData.h"
 #include "pStatCollectorDef.h"
 #include "string_utils.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <algorithm>
 
diff --git a/pandatool/src/pstatserver/pStatThreadData.cxx b/pandatool/src/pstatserver/pStatThreadData.cxx
index eb3aa92702..fd5e3f411b 100644
--- a/pandatool/src/pstatserver/pStatThreadData.cxx
+++ b/pandatool/src/pstatserver/pStatThreadData.cxx
@@ -15,7 +15,7 @@
 
 #include "pStatFrameData.h"
 #include "pStatCollectorDef.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 
 PStatFrameData PStatThreadData::_null_frame;
diff --git a/pandatool/src/text-stats/textStats.cxx b/pandatool/src/text-stats/textStats.cxx
index 2cbf69b4d9..cc1e2392c1 100644
--- a/pandatool/src/text-stats/textStats.cxx
+++ b/pandatool/src/text-stats/textStats.cxx
@@ -15,7 +15,7 @@
 #include "textMonitor.h"
 
 #include "pStatServer.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <signal.h>
 
diff --git a/pandatool/src/win-stats/winStats.cxx b/pandatool/src/win-stats/winStats.cxx
index e8995edaba..5c54535210 100644
--- a/pandatool/src/win-stats/winStats.cxx
+++ b/pandatool/src/win-stats/winStats.cxx
@@ -14,7 +14,7 @@
 #include "pandatoolbase.h"
 
 #include "winStatsServer.h"
-#include "config_pstats.h"
+#include "config_pstatclient.h"
 
 #include <windows.h>