diff --git a/panda/src/chan/animBundle.cxx b/panda/src/chan/animBundle.cxx
index 8313516485..9b95b9fe4c 100644
--- a/panda/src/chan/animBundle.cxx
+++ b/panda/src/chan/animBundle.cxx
@@ -93,7 +93,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
  * Factory method to generate a AnimBundle object
  */
 TypedWritable *AnimBundle::
-make_AnimBundle(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   AnimBundle *me = new AnimBundle;
   DatagramIterator scan;
   BamReader *manager;
@@ -108,5 +108,5 @@ make_AnimBundle(const FactoryParams &params) {
  */
 void AnimBundle::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimBundle);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animBundle.h b/panda/src/chan/animBundle.h
index 77c07e26d7..0605381bff 100644
--- a/panda/src/chan/animBundle.h
+++ b/panda/src/chan/animBundle.h
@@ -56,7 +56,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_AnimBundle(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/chan/animChannelMatrixDynamic.cxx b/panda/src/chan/animChannelMatrixDynamic.cxx
index 53b2771685..731dcf8215 100644
--- a/panda/src/chan/animChannelMatrixDynamic.cxx
+++ b/panda/src/chan/animChannelMatrixDynamic.cxx
@@ -246,7 +246,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
  * Factory method to generate an AnimChannelMatrixDynamic object.
  */
 TypedWritable *AnimChannelMatrixDynamic::
-make_AnimChannelMatrixDynamic(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   AnimChannelMatrixDynamic *me = new AnimChannelMatrixDynamic;
   DatagramIterator scan;
   BamReader *manager;
@@ -261,5 +261,5 @@ make_AnimChannelMatrixDynamic(const FactoryParams &params) {
  */
 void AnimChannelMatrixDynamic::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelMatrixDynamic);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animChannelMatrixDynamic.h b/panda/src/chan/animChannelMatrixDynamic.h
index 5602f027c6..449819f367 100644
--- a/panda/src/chan/animChannelMatrixDynamic.h
+++ b/panda/src/chan/animChannelMatrixDynamic.h
@@ -78,7 +78,7 @@ public:
   virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
-  static TypedWritable *make_AnimChannelMatrixDynamic(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/chan/animChannelMatrixXfmTable.cxx b/panda/src/chan/animChannelMatrixXfmTable.cxx
index 5370a9833e..247f35512b 100644
--- a/panda/src/chan/animChannelMatrixXfmTable.cxx
+++ b/panda/src/chan/animChannelMatrixXfmTable.cxx
@@ -511,7 +511,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
  * Factory method to generate an AnimChannelMatrixXfmTable object.
  */
 TypedWritable *AnimChannelMatrixXfmTable::
-make_AnimChannelMatrixXfmTable(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   AnimChannelMatrixXfmTable *me = new AnimChannelMatrixXfmTable;
   DatagramIterator scan;
   BamReader *manager;
@@ -526,5 +526,5 @@ make_AnimChannelMatrixXfmTable(const FactoryParams &params) {
  */
 void AnimChannelMatrixXfmTable::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelMatrixXfmTable);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animChannelMatrixXfmTable.h b/panda/src/chan/animChannelMatrixXfmTable.h
index 047f145453..f02e3fd717 100644
--- a/panda/src/chan/animChannelMatrixXfmTable.h
+++ b/panda/src/chan/animChannelMatrixXfmTable.h
@@ -77,7 +77,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_AnimChannelMatrixXfmTable(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/chan/animChannelScalarDynamic.cxx b/panda/src/chan/animChannelScalarDynamic.cxx
index c69ad0e6b9..481f471fe1 100644
--- a/panda/src/chan/animChannelScalarDynamic.cxx
+++ b/panda/src/chan/animChannelScalarDynamic.cxx
@@ -174,7 +174,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
  * Factory method to generate a AnimChannelScalarDynamic object
  */
 TypedWritable *AnimChannelScalarDynamic::
-make_AnimChannelScalarDynamic(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   AnimChannelScalarDynamic *me = new AnimChannelScalarDynamic;
   DatagramIterator scan;
   BamReader *manager;
@@ -189,5 +189,5 @@ make_AnimChannelScalarDynamic(const FactoryParams &params) {
  */
 void AnimChannelScalarDynamic::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelScalarDynamic);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animChannelScalarDynamic.h b/panda/src/chan/animChannelScalarDynamic.h
index 7455adb4b9..c79a7651d9 100644
--- a/panda/src/chan/animChannelScalarDynamic.h
+++ b/panda/src/chan/animChannelScalarDynamic.h
@@ -72,7 +72,7 @@ public:
   virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
-  static TypedWritable *make_AnimChannelScalarDynamic(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/chan/animChannelScalarTable.cxx b/panda/src/chan/animChannelScalarTable.cxx
index ae95b3d1ea..886cb8db9a 100644
--- a/panda/src/chan/animChannelScalarTable.cxx
+++ b/panda/src/chan/animChannelScalarTable.cxx
@@ -324,8 +324,8 @@ fillin(DatagramIterator& scan, BamReader* manager) {
 /**
  * Factory method to generate a AnimChannelScalarTable object
  */
-TypedWritable* AnimChannelScalarTable::
-make_AnimChannelScalarTable(const FactoryParams &params) {
+TypedWritable *AnimChannelScalarTable::
+make_from_bam(const FactoryParams &params) {
   AnimChannelScalarTable *me = new AnimChannelScalarTable;
   DatagramIterator scan;
   BamReader *manager;
@@ -340,5 +340,5 @@ make_AnimChannelScalarTable(const FactoryParams &params) {
  */
 void AnimChannelScalarTable::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelScalarTable);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animChannelScalarTable.h b/panda/src/chan/animChannelScalarTable.h
index f9c626fc26..2c82ceb796 100644
--- a/panda/src/chan/animChannelScalarTable.h
+++ b/panda/src/chan/animChannelScalarTable.h
@@ -60,7 +60,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_AnimChannelScalarTable(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/chan/animGroup.cxx b/panda/src/chan/animGroup.cxx
index 57124d6ac2..5c9200ff70 100644
--- a/panda/src/chan/animGroup.cxx
+++ b/panda/src/chan/animGroup.cxx
@@ -290,8 +290,8 @@ complete_pointers(TypedWritable **p_list, BamReader *) {
 /**
  * Factory method to generate a AnimGroup object
  */
-TypedWritable* AnimGroup::
-make_AnimGroup(const FactoryParams &params) {
+TypedWritable *AnimGroup::
+make_from_bam(const FactoryParams &params) {
   AnimGroup *me = new AnimGroup;
   DatagramIterator scan;
   BamReader *manager;
@@ -306,5 +306,5 @@ make_AnimGroup(const FactoryParams &params) {
  */
 void AnimGroup::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_AnimGroup);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/animGroup.h b/panda/src/chan/animGroup.h
index cc3fdb3394..f49bb88fcf 100644
--- a/panda/src/chan/animGroup.h
+++ b/panda/src/chan/animGroup.h
@@ -74,7 +74,7 @@ public:
   virtual int complete_pointers(TypedWritable **p_list,
                                 BamReader *manager);
 
-  static TypedWritable *make_AnimGroup(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx
index 0c8c7bc7bd..db9d143bbb 100644
--- a/panda/src/chan/movingPartMatrix.cxx
+++ b/panda/src/chan/movingPartMatrix.cxx
@@ -387,8 +387,8 @@ apply_control(PandaNode *node) {
 /**
  * Factory method to generate a MovingPartMatrix object
  */
-TypedWritable* MovingPartMatrix::
-make_MovingPartMatrix(const FactoryParams &params) {
+TypedWritable *MovingPartMatrix::
+make_from_bam(const FactoryParams &params) {
   MovingPartMatrix *me = new MovingPartMatrix;
   DatagramIterator scan;
   BamReader *manager;
@@ -403,5 +403,5 @@ make_MovingPartMatrix(const FactoryParams &params) {
  */
 void MovingPartMatrix::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartMatrix);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/movingPartMatrix.h b/panda/src/chan/movingPartMatrix.h
index 364686555a..7e8aaa0e90 100644
--- a/panda/src/chan/movingPartMatrix.h
+++ b/panda/src/chan/movingPartMatrix.h
@@ -47,7 +47,7 @@ protected:
 public:
   static void register_with_read_factory();
 
-  static TypedWritable *make_MovingPartMatrix(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx
index d0d03b4152..612f02afce 100644
--- a/panda/src/chan/movingPartScalar.cxx
+++ b/panda/src/chan/movingPartScalar.cxx
@@ -133,8 +133,8 @@ apply_control(PandaNode *node) {
 /**
  * Factory method to generate a MovingPartScalar object
  */
-TypedWritable* MovingPartScalar::
-make_MovingPartScalar(const FactoryParams &params) {
+TypedWritable *MovingPartScalar::
+make_from_bam(const FactoryParams &params) {
   MovingPartScalar *me = new MovingPartScalar;
   DatagramIterator scan;
   BamReader *manager;
@@ -149,5 +149,5 @@ make_MovingPartScalar(const FactoryParams &params) {
  */
 void MovingPartScalar::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartScalar);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h
index ee55f2e7b8..8d3666ed87 100644
--- a/panda/src/chan/movingPartScalar.h
+++ b/panda/src/chan/movingPartScalar.h
@@ -45,7 +45,7 @@ protected:
 public:
   static void register_with_read_factory();
 
-  static TypedWritable *make_MovingPartScalar(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx
index f3bb114637..076482cdd9 100644
--- a/panda/src/chan/partBundle.cxx
+++ b/panda/src/chan/partBundle.cxx
@@ -772,7 +772,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
 /**
  * Factory method to generate a PartBundle object
  */
-TypedWritable* PartBundle::
+TypedWritable *PartBundle::
 make_from_bam(const FactoryParams &params) {
   PartBundle *me = new PartBundle;
   DatagramIterator scan;
diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx
index 52cee4ce19..2be55b7d68 100644
--- a/panda/src/chan/partGroup.cxx
+++ b/panda/src/chan/partGroup.cxx
@@ -677,8 +677,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
 /**
  * Factory method to generate a PartGroup object
  */
-TypedWritable* PartGroup::
-make_PartGroup(const FactoryParams &params) {
+TypedWritable *PartGroup::
+make_from_bam(const FactoryParams &params) {
   PartGroup *me = new PartGroup;
   DatagramIterator scan;
   BamReader *manager;
@@ -693,5 +693,5 @@ make_PartGroup(const FactoryParams &params) {
  */
 void PartGroup::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_PartGroup);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h
index 7c3cd47829..56bae67ac9 100644
--- a/panda/src/chan/partGroup.h
+++ b/panda/src/chan/partGroup.h
@@ -121,7 +121,7 @@ public:
   virtual int complete_pointers(TypedWritable **p_list,
                                 BamReader *manager);
 
-  static TypedWritable *make_PartGroup(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx
index 7e3e1c9b9a..c2dd79b3f9 100644
--- a/panda/src/char/characterJoint.cxx
+++ b/panda/src/char/characterJoint.cxx
@@ -534,8 +534,8 @@ complete_pointers(TypedWritable **p_list, BamReader* manager) {
 /**
  * Factory method to generate a CharacterJoint object
  */
-TypedWritable* CharacterJoint::
-make_CharacterJoint(const FactoryParams &params) {
+TypedWritable *CharacterJoint::
+make_from_bam(const FactoryParams &params) {
   CharacterJoint *me = new CharacterJoint;
   DatagramIterator scan;
   BamReader *manager;
@@ -550,5 +550,5 @@ make_CharacterJoint(const FactoryParams &params) {
  */
 void CharacterJoint::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJoint);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/char/characterJoint.h b/panda/src/char/characterJoint.h
index 49be4d145b..7d261578a3 100644
--- a/panda/src/char/characterJoint.h
+++ b/panda/src/char/characterJoint.h
@@ -91,7 +91,7 @@ public:
   virtual int complete_pointers(TypedWritable **p_list,
                                 BamReader *manager);
 
-  static TypedWritable *make_CharacterJoint(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/char/characterJointBundle.cxx b/panda/src/char/characterJointBundle.cxx
index 86a43f7e13..dda107a9a5 100644
--- a/panda/src/char/characterJointBundle.cxx
+++ b/panda/src/char/characterJointBundle.cxx
@@ -97,9 +97,8 @@ r_set_character(PartGroup *group, Character *character) {
 /**
  * Factory method to generate a CharacterJointBundle object
  */
-TypedWritable* CharacterJointBundle::
-make_CharacterJointBundle(const FactoryParams &params)
-{
+TypedWritable *CharacterJointBundle::
+make_from_bam(const FactoryParams &params) {
   CharacterJointBundle *me = new CharacterJointBundle;
   DatagramIterator scan;
   BamReader *manager;
@@ -114,7 +113,6 @@ make_CharacterJointBundle(const FactoryParams &params)
  * Factory method to generate a CharacterJointBundle object
  */
 void CharacterJointBundle::
-register_with_read_factory()
-{
-  BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJointBundle);
+register_with_read_factory() {
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/char/characterJointBundle.h b/panda/src/char/characterJointBundle.h
index e1c93e1842..7d799b44dc 100644
--- a/panda/src/char/characterJointBundle.h
+++ b/panda/src/char/characterJointBundle.h
@@ -47,7 +47,7 @@ private:
 public:
   static void register_with_read_factory();
 
-  static TypedWritable *make_CharacterJointBundle(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx
index 26d0f35053..0671bbdf79 100644
--- a/panda/src/char/characterSlider.cxx
+++ b/panda/src/char/characterSlider.cxx
@@ -85,9 +85,8 @@ update_internals(PartBundle *, PartGroup *, bool, bool, Thread *current_thread)
 /**
  * Factory method to generate a CharacterSlider object
  */
-TypedWritable* CharacterSlider::
-make_CharacterSlider(const FactoryParams &params)
-{
+TypedWritable *CharacterSlider::
+make_from_bam(const FactoryParams &params) {
   CharacterSlider *me = new CharacterSlider;
   DatagramIterator scan;
   BamReader *manager;
@@ -101,7 +100,6 @@ make_CharacterSlider(const FactoryParams &params)
  * Factory method to generate a CharacterSlider object
  */
 void CharacterSlider::
-register_with_read_factory()
-{
-  BamReader::get_factory()->register_factory(get_class_type(), make_CharacterSlider);
+register_with_read_factory() {
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/char/characterSlider.h b/panda/src/char/characterSlider.h
index 6a5da971b8..3184b2546a 100644
--- a/panda/src/char/characterSlider.h
+++ b/panda/src/char/characterSlider.h
@@ -49,7 +49,7 @@ private:
 public:
   static void register_with_read_factory();
 
-  static TypedWritable *make_CharacterSlider(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/collide/collisionBox.cxx b/panda/src/collide/collisionBox.cxx
index 5b6dff09e0..f4224f2d14 100644
--- a/panda/src/collide/collisionBox.cxx
+++ b/panda/src/collide/collisionBox.cxx
@@ -1414,7 +1414,7 @@ compute_vectors(Points &points) {
  */
 void CollisionBox::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionBox);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1457,7 +1457,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
  * Factory method to generate a CollisionBox object
  */
 TypedWritable *CollisionBox::
-make_CollisionBox(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   CollisionBox *me = new CollisionBox;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/collide/collisionBox.h b/panda/src/collide/collisionBox.h
index 69a0e13889..1b2489b9fc 100644
--- a/panda/src/collide/collisionBox.h
+++ b/panda/src/collide/collisionBox.h
@@ -155,7 +155,7 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &me);
 
 protected:
-  static TypedWritable *make_CollisionBox(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/panda/src/collide/collisionFloorMesh.cxx b/panda/src/collide/collisionFloorMesh.cxx
index 5f0ab0cabc..cde2eda522 100644
--- a/panda/src/collide/collisionFloorMesh.cxx
+++ b/panda/src/collide/collisionFloorMesh.cxx
@@ -386,8 +386,8 @@ fillin(DatagramIterator& scan, BamReader* manager)
 /**
  * Factory method to generate a CollisionPolygon object
  */
-TypedWritable* CollisionFloorMesh::
-make_CollisionFloorMesh(const FactoryParams &params) {
+TypedWritable *CollisionFloorMesh::
+make_from_bam(const FactoryParams &params) {
   CollisionFloorMesh *me = new CollisionFloorMesh;
   DatagramIterator scan;
   BamReader *manager;
@@ -402,10 +402,9 @@ make_CollisionFloorMesh(const FactoryParams &params) {
  */
 void CollisionFloorMesh::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionFloorMesh);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
-
 /**
  *
  */
diff --git a/panda/src/collide/collisionFloorMesh.h b/panda/src/collide/collisionFloorMesh.h
index 9304b79e11..67dfef43e2 100644
--- a/panda/src/collide/collisionFloorMesh.h
+++ b/panda/src/collide/collisionFloorMesh.h
@@ -101,7 +101,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_CollisionFloorMesh(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   static TypeHandle get_class_type() {
     return _type_handle;
   }
diff --git a/panda/src/collide/collisionHeightfield.cxx b/panda/src/collide/collisionHeightfield.cxx
index 6568163d31..f44c9eff8e 100644
--- a/panda/src/collide/collisionHeightfield.cxx
+++ b/panda/src/collide/collisionHeightfield.cxx
@@ -799,7 +799,7 @@ get_test_pcollector() {
 }
 
 TypedWritable *CollisionHeightfield::
-make_CollisionHeightfield(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   CollisionHeightfield *me = new CollisionHeightfield;
   DatagramIterator scan;
   BamReader *manager;
@@ -815,5 +815,5 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 
 void CollisionHeightfield::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionHeightfield);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/collide/collisionHeightfield.h b/panda/src/collide/collisionHeightfield.h
index bbeb6da34d..a593ca1b1d 100644
--- a/panda/src/collide/collisionHeightfield.h
+++ b/panda/src/collide/collisionHeightfield.h
@@ -151,7 +151,7 @@ private:
   static PStatCollector _test_pcollector;
 
 protected:
-  static TypedWritable *make_CollisionHeightfield(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/panda/src/collide/collisionInvSphere.cxx b/panda/src/collide/collisionInvSphere.cxx
index 3abd9ae451..edc4350df2 100644
--- a/panda/src/collide/collisionInvSphere.cxx
+++ b/panda/src/collide/collisionInvSphere.cxx
@@ -562,7 +562,7 @@ fill_viz_geom() {
  */
 void CollisionInvSphere::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionInvSphere);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -578,7 +578,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
  * Factory method to generate a CollisionInvSphere object
  */
 TypedWritable *CollisionInvSphere::
-make_CollisionInvSphere(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   CollisionInvSphere *me = new CollisionInvSphere;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/collide/collisionInvSphere.h b/panda/src/collide/collisionInvSphere.h
index 0bbc9e2121..5355cfd3cc 100644
--- a/panda/src/collide/collisionInvSphere.h
+++ b/panda/src/collide/collisionInvSphere.h
@@ -78,7 +78,7 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &me);
 
 protected:
-  static TypedWritable *make_CollisionInvSphere(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx
index 2e174d4aa8..2a133b1655 100644
--- a/panda/src/collide/collisionPlane.cxx
+++ b/panda/src/collide/collisionPlane.cxx
@@ -596,9 +596,8 @@ fillin(DatagramIterator& scan, BamReader* manager)
 /**
  * Factory method to generate a CollisionPlane object
  */
-TypedWritable* CollisionPlane::
-make_CollisionPlane(const FactoryParams &params)
-{
+TypedWritable *CollisionPlane::
+make_from_bam(const FactoryParams &params) {
   CollisionPlane *me = new CollisionPlane;
   DatagramIterator scan;
   BamReader *manager;
@@ -612,7 +611,6 @@ make_CollisionPlane(const FactoryParams &params)
  * Factory method to generate a CollisionPlane object
  */
 void CollisionPlane::
-register_with_read_factory()
-{
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionPlane);
+register_with_read_factory() {
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/collide/collisionPlane.h b/panda/src/collide/collisionPlane.h
index 719e33f489..2140fec93e 100644
--- a/panda/src/collide/collisionPlane.h
+++ b/panda/src/collide/collisionPlane.h
@@ -90,7 +90,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_CollisionPlane(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx
index c40fc04cb6..ab78a388c0 100644
--- a/panda/src/collide/collisionPolygon.cxx
+++ b/panda/src/collide/collisionPolygon.cxx
@@ -1877,8 +1877,8 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 /**
  * Factory method to generate a CollisionPolygon object
  */
-TypedWritable* CollisionPolygon::
-make_CollisionPolygon(const FactoryParams &params) {
+TypedWritable *CollisionPolygon::
+make_from_bam(const FactoryParams &params) {
   CollisionPolygon *me = new CollisionPolygon;
   DatagramIterator scan;
   BamReader *manager;
@@ -1893,5 +1893,5 @@ make_CollisionPolygon(const FactoryParams &params) {
  */
 void CollisionPolygon::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionPolygon);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
diff --git a/panda/src/collide/collisionPolygon.h b/panda/src/collide/collisionPolygon.h
index 3fc6c5a962..1189b5bfe9 100644
--- a/panda/src/collide/collisionPolygon.h
+++ b/panda/src/collide/collisionPolygon.h
@@ -154,7 +154,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_CollisionPolygon(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/collide/collisionSphere.cxx b/panda/src/collide/collisionSphere.cxx
index 631c0a5171..b8323faa63 100644
--- a/panda/src/collide/collisionSphere.cxx
+++ b/panda/src/collide/collisionSphere.cxx
@@ -771,7 +771,7 @@ compute_point(PN_stdfloat latitude, PN_stdfloat longitude) const {
  */
 void CollisionSphere::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CollisionSphere);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -789,7 +789,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
  * Factory method to generate a CollisionSphere object
  */
 TypedWritable *CollisionSphere::
-make_CollisionSphere(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   CollisionSphere *me = new CollisionSphere;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/collide/collisionSphere.h b/panda/src/collide/collisionSphere.h
index 39b21d59f1..bff8f279f9 100644
--- a/panda/src/collide/collisionSphere.h
+++ b/panda/src/collide/collisionSphere.h
@@ -101,7 +101,7 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &me);
 
 protected:
-  static TypedWritable *make_CollisionSphere(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/panda/src/gobj/material.cxx b/panda/src/gobj/material.cxx
index a87c978c1c..16496444f5 100644
--- a/panda/src/gobj/material.cxx
+++ b/panda/src/gobj/material.cxx
@@ -457,7 +457,7 @@ write(std::ostream &out, int indent_level) const {
  */
 void Material::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_Material);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -503,7 +503,7 @@ write_datagram(BamWriter *manager, Datagram &me) {
  * Factory method to generate a Material object
  */
 TypedWritable *Material::
-make_Material(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   Material *me = new Material;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/gobj/material.h b/panda/src/gobj/material.h
index 259d5d6874..b0c25de57b 100644
--- a/panda/src/gobj/material.h
+++ b/panda/src/gobj/material.h
@@ -170,7 +170,7 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &me);
 
 protected:
-  static TypedWritable *make_Material(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/panda/src/gobj/textureStage.cxx b/panda/src/gobj/textureStage.cxx
index fd46d1055f..3540deb92d 100644
--- a/panda/src/gobj/textureStage.cxx
+++ b/panda/src/gobj/textureStage.cxx
@@ -346,14 +346,14 @@ operand_valid_for_alpha(TextureStage::CombineOperand co) {
  */
 void TextureStage::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_TextureStage);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
  * Factory method to generate a TextureStage object
  */
-TypedWritable* TextureStage::
-make_TextureStage(const FactoryParams &params) {
+TypedWritable *TextureStage::
+make_from_bam(const FactoryParams &params) {
   DatagramIterator scan;
   BamReader *manager;
 
diff --git a/panda/src/gobj/textureStage.h b/panda/src/gobj/textureStage.h
index 22974874a0..10a9bc5251 100644
--- a/panda/src/gobj/textureStage.h
+++ b/panda/src/gobj/textureStage.h
@@ -262,7 +262,7 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &me);
   virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
 
-  static TypedWritable *make_TextureStage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 protected:
   void fillin(DatagramIterator& scan, BamReader* manager);
diff --git a/panda/src/parametrics/cubicCurveseg.cxx b/panda/src/parametrics/cubicCurveseg.cxx
index dcb5905cfa..fb68f25ed6 100644
--- a/panda/src/parametrics/cubicCurveseg.cxx
+++ b/panda/src/parametrics/cubicCurveseg.cxx
@@ -516,14 +516,14 @@ compute_seg(int rtype0, PN_stdfloat t0, const LVecBase4 &v0,
  */
 void CubicCurveseg::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_CubicCurveseg);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
  * Factory method to generate an object of this type.
  */
 TypedWritable *CubicCurveseg::
-make_CubicCurveseg(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   CubicCurveseg *me = new CubicCurveseg;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/parametrics/cubicCurveseg.h b/panda/src/parametrics/cubicCurveseg.h
index 16202ee732..c24de8d903 100644
--- a/panda/src/parametrics/cubicCurveseg.h
+++ b/panda/src/parametrics/cubicCurveseg.h
@@ -112,7 +112,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_CubicCurveseg(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   virtual void write_datagram(BamWriter *manager, Datagram &me);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
diff --git a/panda/src/parametrics/hermiteCurve.cxx b/panda/src/parametrics/hermiteCurve.cxx
index 7bb2399368..55f3bccd28 100644
--- a/panda/src/parametrics/hermiteCurve.cxx
+++ b/panda/src/parametrics/hermiteCurve.cxx
@@ -817,14 +817,14 @@ recompute_basis() {
  */
 void HermiteCurve::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_HermiteCurve);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
  * Factory method to generate an object of this type.
  */
 TypedWritable *HermiteCurve::
-make_HermiteCurve(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   HermiteCurve *me = new HermiteCurve;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/parametrics/hermiteCurve.h b/panda/src/parametrics/hermiteCurve.h
index eb991090cc..45e601de1b 100644
--- a/panda/src/parametrics/hermiteCurve.h
+++ b/panda/src/parametrics/hermiteCurve.h
@@ -154,7 +154,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_HermiteCurve(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   virtual void write_datagram(BamWriter *manager, Datagram &me);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
diff --git a/panda/src/parametrics/nurbsCurve.cxx b/panda/src/parametrics/nurbsCurve.cxx
index 09e6bf063e..5a60019f2e 100644
--- a/panda/src/parametrics/nurbsCurve.cxx
+++ b/panda/src/parametrics/nurbsCurve.cxx
@@ -485,14 +485,14 @@ find_cv(PN_stdfloat t) {
  */
 void NurbsCurve::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_NurbsCurve);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
  * Factory method to generate an object of this type.
  */
 TypedWritable *NurbsCurve::
-make_NurbsCurve(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   NurbsCurve *me = new NurbsCurve;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/panda/src/parametrics/nurbsCurve.h b/panda/src/parametrics/nurbsCurve.h
index 06f3177d72..2bd7bd9729 100644
--- a/panda/src/parametrics/nurbsCurve.h
+++ b/panda/src/parametrics/nurbsCurve.h
@@ -111,7 +111,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_NurbsCurve(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   virtual void write_datagram(BamWriter *manager, Datagram &me);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
diff --git a/panda/src/pnmimage/pnmFileType.h b/panda/src/pnmimage/pnmFileType.h
index ddf44c9992..93e409390f 100644
--- a/panda/src/pnmimage/pnmFileType.h
+++ b/panda/src/pnmimage/pnmFileType.h
@@ -58,12 +58,8 @@ public:
 
   // The TypedWritable interface follows.
 public:
-  static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
 
-protected:
-  static TypedWritable *make_PNMFileType(const FactoryParams &params);
-
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/pnmimagetypes/pnmFileTypeBMP.cxx b/panda/src/pnmimagetypes/pnmFileTypeBMP.cxx
index 28efd2feb2..13baa23d1f 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeBMP.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeBMP.cxx
@@ -119,7 +119,7 @@ make_writer(std::ostream *file, bool owns_file) {
 void PNMFileTypeBMP::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeBMP);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -131,7 +131,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeBMP::
-make_PNMFileTypeBMP(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeBMP.h b/panda/src/pnmimagetypes/pnmFileTypeBMP.h
index 87c4e8f629..8de5666208 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeBMP.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeBMP.h
@@ -78,7 +78,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeBMP(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeEXR.cxx b/panda/src/pnmimagetypes/pnmFileTypeEXR.cxx
index 6165241004..7541d41a8f 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeEXR.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeEXR.cxx
@@ -482,7 +482,7 @@ write_data(xel *array, xelval *alpha) {
 void PNMFileTypeEXR::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeEXR);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -494,7 +494,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeEXR::
-make_PNMFileTypeEXR(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeEXR.h b/panda/src/pnmimagetypes/pnmFileTypeEXR.h
index 23e211ee98..a1a095aeff 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeEXR.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeEXR.h
@@ -88,7 +88,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeEXR(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeIMG.cxx b/panda/src/pnmimagetypes/pnmFileTypeIMG.cxx
index 4f9390e53f..a46e82cc85 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeIMG.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeIMG.cxx
@@ -315,7 +315,7 @@ write_row(xel *row_data, xelval *) {
 void PNMFileTypeIMG::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeIMG);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -327,7 +327,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeIMG::
-make_PNMFileTypeIMG(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeIMG.h b/panda/src/pnmimagetypes/pnmFileTypeIMG.h
index e75aaeb972..8fb465af3c 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeIMG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeIMG.h
@@ -63,7 +63,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeIMG(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.cxx b/panda/src/pnmimagetypes/pnmFileTypeJPG.cxx
index 19d9cff18f..abc857e69e 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPG.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.cxx
@@ -120,7 +120,7 @@ make_writer(std::ostream *file, bool owns_file) {
 void PNMFileTypeJPG::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeJPG);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -132,7 +132,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeJPG::
-make_PNMFileTypeJPG(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.h b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
index d577e52bf6..f1e4268d8f 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
@@ -105,7 +105,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeJPG(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNG.cxx b/panda/src/pnmimagetypes/pnmFileTypePNG.cxx
index afb7dc1de2..dd4f4eaeb6 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNG.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypePNG.cxx
@@ -141,7 +141,7 @@ make_writer(ostream *file, bool owns_file) {
 void PNMFileTypePNG::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypePNG);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -153,7 +153,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypePNG::
-make_PNMFileTypePNG(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNG.h b/panda/src/pnmimagetypes/pnmFileTypePNG.h
index 8ed2b817e4..e423e26a21 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePNG.h
@@ -101,7 +101,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypePNG(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNM.cxx b/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
index 6995c70ca6..c61e0faf75 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
@@ -1219,7 +1219,7 @@ write_row(xel *row_data, xelval *) {
 void PNMFileTypePNM::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypePNM);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1231,7 +1231,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypePNM::
-make_PNMFileTypePNM(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNM.h b/panda/src/pnmimagetypes/pnmFileTypePNM.h
index 811661b1fa..ab42fe1ee0 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNM.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePNM.h
@@ -72,7 +72,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypePNM(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypePfm.cxx b/panda/src/pnmimagetypes/pnmFileTypePfm.cxx
index 1303cc9c6c..1933515785 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePfm.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypePfm.cxx
@@ -316,7 +316,7 @@ write_pfm(const PfmFile &pfm) {
 void PNMFileTypePfm::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypePfm);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -328,6 +328,6 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypePfm::
-make_PNMFileTypePfm(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
diff --git a/panda/src/pnmimagetypes/pnmFileTypePfm.h b/panda/src/pnmimagetypes/pnmFileTypePfm.h
index c97ec46eb6..096c1fc4da 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePfm.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePfm.h
@@ -69,7 +69,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypePfm(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSGI.cxx b/panda/src/pnmimagetypes/pnmFileTypeSGI.cxx
index 9a3e9c0f7e..eba81e8ccd 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSGI.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeSGI.cxx
@@ -123,7 +123,7 @@ make_writer(std::ostream *file, bool owns_file) {
 void PNMFileTypeSGI::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeSGI);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -135,7 +135,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeSGI::
-make_PNMFileTypeSGI(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSGI.h b/panda/src/pnmimagetypes/pnmFileTypeSGI.h
index dbced028e2..0152354251 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSGI.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeSGI.h
@@ -111,7 +111,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeSGI(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.cxx b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.cxx
index 9003dc8ad6..bb7fba20e8 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.cxx
@@ -725,7 +725,7 @@ write_row(xel *row_data, xelval *alpha_data) {
 void PNMFileTypeSoftImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeSoftImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -737,7 +737,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeSoftImage::
-make_PNMFileTypeSoftImage(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
index 55457bbfca..2597e77713 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
@@ -70,7 +70,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeSoftImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx b/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx
index 29f1d70315..612e8da641 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx
@@ -587,7 +587,7 @@ read_data(xel *array, xelval *alpha) {
 void PNMFileTypeStbImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeStbImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -599,7 +599,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeStbImage::
-make_PNMFileTypeStbImage(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeStbImage.h b/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
index 260d6dc61c..ecfd73ebaf 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
@@ -46,7 +46,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeStbImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTGA.cxx b/panda/src/pnmimagetypes/pnmFileTypeTGA.cxx
index c1322d4087..c881c1f085 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTGA.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeTGA.cxx
@@ -557,7 +557,7 @@ write_data(xel *array, xelval *) {
 void PNMFileTypeTGA::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeTGA);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -569,7 +569,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeTGA::
-make_PNMFileTypeTGA(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTGA.h b/panda/src/pnmimagetypes/pnmFileTypeTGA.h
index d4ce1426cd..4181a2a356 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTGA.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeTGA.h
@@ -100,7 +100,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeTGA(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx b/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
index 170d13af46..74216fa48f 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
@@ -1249,7 +1249,7 @@ tiff_error(const char *module, const char *format, va_list ap) {
 void PNMFileTypeTIFF::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PNMFileTypeTIFF);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1261,7 +1261,7 @@ register_with_read_factory() {
  * we just pull the object from the registry.
  */
 TypedWritable *PNMFileTypeTIFF::
-make_PNMFileTypeTIFF(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   return PNMFileTypeRegistry::get_global_ptr()->get_type_by_handle(get_class_type());
 }
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
index 36148a082e..7de62bf0f3 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
@@ -97,7 +97,7 @@ public:
   static void register_with_read_factory();
 
 protected:
-  static TypedWritable *make_PNMFileTypeTIFF(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/text/geomTextGlyph.cxx b/panda/src/text/geomTextGlyph.cxx
index 87751532f9..cdf2c92938 100644
--- a/panda/src/text/geomTextGlyph.cxx
+++ b/panda/src/text/geomTextGlyph.cxx
@@ -175,16 +175,15 @@ add_glyph(const TextGlyph *glyph) {
  */
 void GeomTextGlyph::
 register_with_read_factory() {
-  BamReader::get_factory()->register_factory(get_class_type(), make_GeomTextGlyph);
+  BamReader::get_factory()->register_factory(get_class_type(), make_from_bam);
 }
 
 /**
  * Factory method to generate a GeomTextGlyph object
  */
-TypedWritable* GeomTextGlyph::
-make_GeomTextGlyph(const FactoryParams &params) {
-  GeomTextGlyph *me = new GeomTextGlyph(nullptr,
-                                        nullptr);
+TypedWritable *GeomTextGlyph::
+make_from_bam(const FactoryParams &params) {
+  GeomTextGlyph *me = new GeomTextGlyph(nullptr, nullptr);
   DatagramIterator scan;
   BamReader *manager;
 
diff --git a/panda/src/text/geomTextGlyph.h b/panda/src/text/geomTextGlyph.h
index e9fa1245ae..0a9e679385 100644
--- a/panda/src/text/geomTextGlyph.h
+++ b/panda/src/text/geomTextGlyph.h
@@ -52,7 +52,7 @@ private:
 
 public:
   static void register_with_read_factory();
-  static TypedWritable *make_GeomTextGlyph(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 PUBLISHED:
   static TypeHandle get_class_type() {
diff --git a/pandatool/src/palettizer/destTextureImage.cxx b/pandatool/src/palettizer/destTextureImage.cxx
index 38f9a879d1..3c80f3d924 100644
--- a/pandatool/src/palettizer/destTextureImage.cxx
+++ b/pandatool/src/palettizer/destTextureImage.cxx
@@ -123,7 +123,7 @@ to_power_2(int value) {
 void DestTextureImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_DestTextureImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -140,8 +140,8 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* DestTextureImage::
-make_DestTextureImage(const FactoryParams &params) {
+TypedWritable *DestTextureImage::
+make_from_bam(const FactoryParams &params) {
   DestTextureImage *me = new DestTextureImage;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/destTextureImage.h b/pandatool/src/palettizer/destTextureImage.h
index 31075b8f99..860655b6a1 100644
--- a/pandatool/src/palettizer/destTextureImage.h
+++ b/pandatool/src/palettizer/destTextureImage.h
@@ -45,7 +45,7 @@ public:
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
 
 protected:
-  static TypedWritable *make_DestTextureImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/pandatool/src/palettizer/eggFile.cxx b/pandatool/src/palettizer/eggFile.cxx
index 40376a7988..c47eae2f3e 100644
--- a/pandatool/src/palettizer/eggFile.cxx
+++ b/pandatool/src/palettizer/eggFile.cxx
@@ -696,7 +696,7 @@ rescan_textures() {
 void EggFile::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_EggFile);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -764,8 +764,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* EggFile::
-make_EggFile(const FactoryParams &params) {
+TypedWritable *EggFile::
+make_from_bam(const FactoryParams &params) {
   EggFile *me = new EggFile();
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/eggFile.h b/pandatool/src/palettizer/eggFile.h
index cc3887242e..aa8e729e6d 100644
--- a/pandatool/src/palettizer/eggFile.h
+++ b/pandatool/src/palettizer/eggFile.h
@@ -107,7 +107,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_EggFile(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/paletteGroup.cxx b/pandatool/src/palettizer/paletteGroup.cxx
index 5f231b2e14..d7e583259d 100644
--- a/pandatool/src/palettizer/paletteGroup.cxx
+++ b/pandatool/src/palettizer/paletteGroup.cxx
@@ -560,7 +560,7 @@ update_images(bool redo_all) {
 void PaletteGroup::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PaletteGroup);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -654,7 +654,7 @@ finalize(BamReader *) {
  * all the data read.
  */
 TypedWritable *PaletteGroup::
-make_PaletteGroup(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   PaletteGroup *me = new PaletteGroup;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/paletteGroup.h b/pandatool/src/palettizer/paletteGroup.h
index 54eaa08fc0..5c20e1ca4d 100644
--- a/pandatool/src/palettizer/paletteGroup.h
+++ b/pandatool/src/palettizer/paletteGroup.h
@@ -115,7 +115,7 @@ public:
   virtual void finalize(BamReader *manager);
 
 protected:
-  static TypedWritable *make_PaletteGroup(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/paletteGroups.cxx b/pandatool/src/palettizer/paletteGroups.cxx
index c964f2b057..ada0702a9a 100644
--- a/pandatool/src/palettizer/paletteGroups.cxx
+++ b/pandatool/src/palettizer/paletteGroups.cxx
@@ -280,7 +280,7 @@ r_make_complete(PaletteGroups::Groups &result, PaletteGroup *group) {
 void PaletteGroups::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PaletteGroups);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -320,8 +320,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* PaletteGroups::
-make_PaletteGroups(const FactoryParams &params) {
+TypedWritable *PaletteGroups::
+make_from_bam(const FactoryParams &params) {
   PaletteGroups *me = new PaletteGroups;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/paletteGroups.h b/pandatool/src/palettizer/paletteGroups.h
index bdcfd248e1..b9858f8257 100644
--- a/pandatool/src/palettizer/paletteGroups.h
+++ b/pandatool/src/palettizer/paletteGroups.h
@@ -76,7 +76,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_PaletteGroups(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   void fillin(DatagramIterator &scan, BamReader *manager);
diff --git a/pandatool/src/palettizer/paletteImage.cxx b/pandatool/src/palettizer/paletteImage.cxx
index c02e13a2ad..3ceedbf553 100644
--- a/pandatool/src/palettizer/paletteImage.cxx
+++ b/pandatool/src/palettizer/paletteImage.cxx
@@ -969,7 +969,7 @@ remove_image() {
 void PaletteImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PaletteImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1037,7 +1037,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * all the data read.
  */
 TypedWritable *PaletteImage::
-make_PaletteImage(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   PaletteImage *me = new PaletteImage;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/paletteImage.h b/pandatool/src/palettizer/paletteImage.h
index 60395fdc39..cec32aa0f1 100644
--- a/pandatool/src/palettizer/paletteImage.h
+++ b/pandatool/src/palettizer/paletteImage.h
@@ -117,7 +117,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_PaletteImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/palettePage.cxx b/pandatool/src/palettizer/palettePage.cxx
index 9bdc74c57e..98fa9cb2be 100644
--- a/pandatool/src/palettizer/palettePage.cxx
+++ b/pandatool/src/palettizer/palettePage.cxx
@@ -214,7 +214,7 @@ update_images(bool redo_all) {
 void PalettePage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_PalettePage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -271,8 +271,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* PalettePage::
-make_PalettePage(const FactoryParams &params) {
+TypedWritable *PalettePage::
+make_from_bam(const FactoryParams &params) {
   PalettePage *me = new PalettePage;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/palettePage.h b/pandatool/src/palettizer/palettePage.h
index 91ba875219..8cac0f7adc 100644
--- a/pandatool/src/palettizer/palettePage.h
+++ b/pandatool/src/palettizer/palettePage.h
@@ -69,7 +69,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_PalettePage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/palettizer.cxx b/pandatool/src/palettizer/palettizer.cxx
index 2b9df0f1e1..0860cb3819 100644
--- a/pandatool/src/palettizer/palettizer.cxx
+++ b/pandatool/src/palettizer/palettizer.cxx
@@ -913,7 +913,7 @@ compute_statistics(std::ostream &out, int indent_level,
 void Palettizer::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_Palettizer);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1099,8 +1099,8 @@ finalize(BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* Palettizer::
-make_Palettizer(const FactoryParams &params) {
+TypedWritable *Palettizer::
+make_from_bam(const FactoryParams &params) {
   Palettizer *me = new Palettizer;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/palettizer.h b/pandatool/src/palettizer/palettizer.h
index 523968e952..93f211bb6b 100644
--- a/pandatool/src/palettizer/palettizer.h
+++ b/pandatool/src/palettizer/palettizer.h
@@ -152,7 +152,7 @@ public:
   virtual void finalize(BamReader *manager);
 
 protected:
-  static TypedWritable *make_Palettizer(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/sourceTextureImage.cxx b/pandatool/src/palettizer/sourceTextureImage.cxx
index aea0046ad1..c3aac42218 100644
--- a/pandatool/src/palettizer/sourceTextureImage.cxx
+++ b/pandatool/src/palettizer/sourceTextureImage.cxx
@@ -149,7 +149,7 @@ set_header(const PNMImageHeader &header) {
 void SourceTextureImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_SourceTextureImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -188,7 +188,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * all the data read.
  */
 TypedWritable *SourceTextureImage::
-make_SourceTextureImage(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   SourceTextureImage *me = new SourceTextureImage;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/sourceTextureImage.h b/pandatool/src/palettizer/sourceTextureImage.h
index 1f1f64b9dc..6c803a73f3 100644
--- a/pandatool/src/palettizer/sourceTextureImage.h
+++ b/pandatool/src/palettizer/sourceTextureImage.h
@@ -56,7 +56,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_SourceTextureImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public:
diff --git a/pandatool/src/palettizer/textureImage.cxx b/pandatool/src/palettizer/textureImage.cxx
index bbc47002d2..8eddd6bb4d 100644
--- a/pandatool/src/palettizer/textureImage.cxx
+++ b/pandatool/src/palettizer/textureImage.cxx
@@ -1236,7 +1236,7 @@ get_source_key(const Filename &filename, const Filename &alpha_filename,
 void TextureImage::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_TextureImage);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1346,7 +1346,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * all the data read.
  */
 TypedWritable *TextureImage::
-make_TextureImage(const FactoryParams &params) {
+make_from_bam(const FactoryParams &params) {
   TextureImage *me = new TextureImage;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/textureImage.h b/pandatool/src/palettizer/textureImage.h
index 1e590da621..3fd041d68a 100644
--- a/pandatool/src/palettizer/textureImage.h
+++ b/pandatool/src/palettizer/textureImage.h
@@ -161,7 +161,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_TextureImage(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/texturePlacement.cxx b/pandatool/src/palettizer/texturePlacement.cxx
index 01f47b42a1..b92583b6d6 100644
--- a/pandatool/src/palettizer/texturePlacement.cxx
+++ b/pandatool/src/palettizer/texturePlacement.cxx
@@ -987,7 +987,7 @@ compute_size_from_uvs(const LTexCoordd &min_uv, const LTexCoordd &max_uv) {
 void TexturePlacement::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_TexturePlacement);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -1077,8 +1077,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* TexturePlacement::
-make_TexturePlacement(const FactoryParams &params) {
+TypedWritable *TexturePlacement::
+make_from_bam(const FactoryParams &params) {
   TexturePlacement *me = new TexturePlacement;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/texturePlacement.h b/pandatool/src/palettizer/texturePlacement.h
index 552f50f3d6..efe90f858d 100644
--- a/pandatool/src/palettizer/texturePlacement.h
+++ b/pandatool/src/palettizer/texturePlacement.h
@@ -120,7 +120,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_TexturePlacement(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
diff --git a/pandatool/src/palettizer/texturePosition.cxx b/pandatool/src/palettizer/texturePosition.cxx
index dd7617d1d8..ea4f61ac2c 100644
--- a/pandatool/src/palettizer/texturePosition.cxx
+++ b/pandatool/src/palettizer/texturePosition.cxx
@@ -75,7 +75,7 @@ operator = (const TexturePosition &copy) {
 void TexturePosition::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_TexturePosition);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -103,8 +103,8 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* TexturePosition::
-make_TexturePosition(const FactoryParams &params) {
+TypedWritable *TexturePosition::
+make_from_bam(const FactoryParams &params) {
   TexturePosition *me = new TexturePosition;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/texturePosition.h b/pandatool/src/palettizer/texturePosition.h
index 08f373a644..c1edd40e20 100644
--- a/pandatool/src/palettizer/texturePosition.h
+++ b/pandatool/src/palettizer/texturePosition.h
@@ -50,7 +50,7 @@ public:
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
 
 protected:
-  static TypedWritable *make_TexturePosition(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   void fillin(DatagramIterator &scan, BamReader *manager);
diff --git a/pandatool/src/palettizer/textureProperties.cxx b/pandatool/src/palettizer/textureProperties.cxx
index bb670539b9..c5635409d2 100644
--- a/pandatool/src/palettizer/textureProperties.cxx
+++ b/pandatool/src/palettizer/textureProperties.cxx
@@ -834,7 +834,7 @@ union_quality_level(EggTexture::QualityLevel a, EggTexture::QualityLevel b) {
 void TextureProperties::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_TextureProperties);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -888,8 +888,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* TextureProperties::
-make_TextureProperties(const FactoryParams &params) {
+TypedWritable *TextureProperties::
+make_from_bam(const FactoryParams &params) {
   TextureProperties *me = new TextureProperties;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/textureProperties.h b/pandatool/src/palettizer/textureProperties.h
index 6d27e06216..f143bdcb4a 100644
--- a/pandatool/src/palettizer/textureProperties.h
+++ b/pandatool/src/palettizer/textureProperties.h
@@ -92,7 +92,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_TextureProperties(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public:
   void fillin(DatagramIterator &scan, BamReader *manager);
diff --git a/pandatool/src/palettizer/textureReference.cxx b/pandatool/src/palettizer/textureReference.cxx
index 4a11b5348d..3b6c2696fa 100644
--- a/pandatool/src/palettizer/textureReference.cxx
+++ b/pandatool/src/palettizer/textureReference.cxx
@@ -791,7 +791,7 @@ translate_uv(const LTexCoordd &min_uv, const LTexCoordd &max_uv) {
 void TextureReference::
 register_with_read_factory() {
   BamReader::get_factory()->
-    register_factory(get_class_type(), make_TextureReference);
+    register_factory(get_class_type(), make_from_bam);
 }
 
 /**
@@ -859,8 +859,8 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
  * encountered in a Bam file; it should allocate and return a new object with
  * all the data read.
  */
-TypedWritable* TextureReference::
-make_TextureReference(const FactoryParams &params) {
+TypedWritable *TextureReference::
+make_from_bam(const FactoryParams &params) {
   TextureReference *me = new TextureReference;
   DatagramIterator scan;
   BamReader *manager;
diff --git a/pandatool/src/palettizer/textureReference.h b/pandatool/src/palettizer/textureReference.h
index f17d8337b2..720994c9c6 100644
--- a/pandatool/src/palettizer/textureReference.h
+++ b/pandatool/src/palettizer/textureReference.h
@@ -114,7 +114,7 @@ public:
                                 BamReader *manager);
 
 protected:
-  static TypedWritable *make_TextureReference(const FactoryParams &params);
+  static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 public: