diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 5ae064b649..0e196654a2 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -6110,9 +6110,9 @@ if not PkgSkip("PANDATOOL"):
   TargetAdd('pfm-trans.exe', opts=['ADVAPI'])
 
   TargetAdd('pfm-bba_pfmBba.obj', opts=OPTS, input='pfmBba.cxx')
-  TargetAdd('pfm-bba_config_pfm.obj', opts=OPTS, input='config_pfm.cxx')
+  TargetAdd('pfm-bba_config_pfmprogs.obj', opts=OPTS, input='config_pfmprogs.cxx')
   TargetAdd('pfm-bba.exe', input='pfm-bba_pfmBba.obj')
-  TargetAdd('pfm-bba.exe', input='pfm-bba_config_pfm.obj')
+  TargetAdd('pfm-bba.exe', input='pfm-bba_config_pfmprogs.obj')
   TargetAdd('pfm-bba.exe', input='libp3progbase.lib')
   TargetAdd('pfm-bba.exe', input='libp3pandatoolbase.lib')
   TargetAdd('pfm-bba.exe', input=COMMON_PANDA_LIBS)
diff --git a/pandatool/src/pfmprogs/config_pfm.cxx b/pandatool/src/pfmprogs/config_pfmprogs.cxx
similarity index 89%
rename from pandatool/src/pfmprogs/config_pfm.cxx
rename to pandatool/src/pfmprogs/config_pfmprogs.cxx
index fc8cea6bf3..afa49ef91b 100644
--- a/pandatool/src/pfmprogs/config_pfm.cxx
+++ b/pandatool/src/pfmprogs/config_pfmprogs.cxx
@@ -6,16 +6,16 @@
  * license.  You should have received a copy of this license along
  * with this source code in a file named "LICENSE."
  *
- * @file config_pfm.cxx
+ * @file config_pfmprogs.cxx
  * @author drose
  * @date 2010-12-23
  */
 
-#include "config_pfm.h"
+#include "config_pfmprogs.h"
 
 #include "dconfig.h"
 
-Configure(config_pfm);
+Configure(config_pfmprogs);
 NotifyCategoryDef(pfm, "");
 
 ConfigVariableDouble pfm_bba_dist
@@ -23,7 +23,7 @@ ConfigVariableDouble pfm_bba_dist
  PRC_DESC("Specifies the point_dist and sample_radius, in UV space, for "
           "compute bba files with pfm_trans."));
 
-ConfigureFn(config_pfm) {
+ConfigureFn(config_pfmprogs) {
   init_libpfm();
 }
 
diff --git a/pandatool/src/pfmprogs/config_pfm.h b/pandatool/src/pfmprogs/config_pfmprogs.h
similarity index 95%
rename from pandatool/src/pfmprogs/config_pfm.h
rename to pandatool/src/pfmprogs/config_pfmprogs.h
index 5da1fcbb4e..98777496e7 100644
--- a/pandatool/src/pfmprogs/config_pfm.h
+++ b/pandatool/src/pfmprogs/config_pfmprogs.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_pfm.h
+ * @file config_pfmprogs.h
  * @author drose
  * @date 2010-12-23
  */
diff --git a/pandatool/src/pfmprogs/pfmBba.cxx b/pandatool/src/pfmprogs/pfmBba.cxx
index 5517e45a63..5456efad27 100644
--- a/pandatool/src/pfmprogs/pfmBba.cxx
+++ b/pandatool/src/pfmprogs/pfmBba.cxx
@@ -12,7 +12,7 @@
  */
 
 #include "pfmBba.h"
-#include "config_pfm.h"
+#include "config_pfmprogs.h"
 #include "pfmFile.h"
 
 /**
diff --git a/pandatool/src/pfmprogs/pfmTrans.cxx b/pandatool/src/pfmprogs/pfmTrans.cxx
index 270d6a03af..123b098768 100644
--- a/pandatool/src/pfmprogs/pfmTrans.cxx
+++ b/pandatool/src/pfmprogs/pfmTrans.cxx
@@ -12,7 +12,7 @@
  */
 
 #include "pfmTrans.h"
-#include "config_pfm.h"
+#include "config_pfmprogs.h"
 #include "pfmFile.h"
 #include "pfmVizzer.h"
 #include "texture.h"