diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx
index 7c7db8d639..5c67d611b7 100644
--- a/panda/src/char/character.cxx
+++ b/panda/src/char/character.cxx
@@ -464,15 +464,15 @@ fillin(DatagramIterator& scan, BamReader* manager)
 //               pointers that this object made to BamReader.
 ////////////////////////////////////////////////////////////////////
 int Character::
-complete_pointers(vector_typedWritable &plist, BamReader* manager)
+complete_pointers(vector_typedWritable &p_list, BamReader* manager)
 {
-  int start = PartBundleNode::complete_pointers(plist, manager);
-  _computed_vertices = DCAST(ComputedVertices, plist[start]);
+  int start = PartBundleNode::complete_pointers(p_list, manager);
+  _computed_vertices = DCAST(ComputedVertices, p_list[start]);
   start++;
 
   int num_parts = _parts.size();
   for (int i = 0; i < num_parts; i++) {
-    _parts[i] = DCAST(PartGroup, plist[start + i]);
+    _parts[i] = DCAST(PartGroup, p_list[start + i]);
   }
   start += num_parts;
 
diff --git a/panda/src/char/character.h b/panda/src/char/character.h
index 5a8a10df62..048f78673b 100644
--- a/panda/src/char/character.h
+++ b/panda/src/char/character.h
@@ -99,7 +99,7 @@ private:
 public:
   static void register_with_read_factory(void);
   virtual void write_datagram(BamWriter* manager, Datagram &me);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
   static TypedWritable *make_Character(const FactoryParams &params);
diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx
index ae7d16faba..052b476e03 100644
--- a/panda/src/char/characterJoint.cxx
+++ b/panda/src/char/characterJoint.cxx
@@ -347,36 +347,36 @@ fillin(DatagramIterator& scan, BamReader* manager)
 //               pointers that this object made to BamReader.
 ////////////////////////////////////////////////////////////////////
 int CharacterJoint::
-complete_pointers(vector_typedWritable &plist, BamReader* manager)
+complete_pointers(vector_typedWritable &p_list, BamReader* manager)
 {
   int i;
-  int start = MovingPartMatrix::complete_pointers(plist, manager);
+  int start = MovingPartMatrix::complete_pointers(p_list, manager);
   int mid = start+_num_net_arcs;
   int end = start+_num_net_arcs+_num_local_arcs;
 
   for(i = start; i < mid; i++)
   {
-    if (plist[i] == TypedWritable::Null)
+    if (p_list[i] == TypedWritable::Null)
     {
       char_cat->warning() << get_name()
                           << " Ignoring null Net NodeRelation" << endl;
     }
     else
     {
-      add_net_transform(DCAST(NodeRelation, plist[i]));
+      add_net_transform(DCAST(NodeRelation, p_list[i]));
     }
   }
 
   for(i = mid; i < end; i++)
   {
-    if (plist[i] == TypedWritable::Null)
+    if (p_list[i] == TypedWritable::Null)
     {
       char_cat->warning() << get_name()
                           << " Ignoring null Local NodeRelation" << endl;
     }
     else
     {
-      add_local_transform(DCAST(NodeRelation, plist[i]));
+      add_local_transform(DCAST(NodeRelation, p_list[i]));
     }
   }
 
diff --git a/panda/src/char/characterJoint.h b/panda/src/char/characterJoint.h
index deed443286..4e4e46f24b 100644
--- a/panda/src/char/characterJoint.h
+++ b/panda/src/char/characterJoint.h
@@ -65,7 +65,7 @@ private:
 public:
   static void register_with_read_factory(void);
   virtual void write_datagram(BamWriter* manager, Datagram &me);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
   static TypedWritable *make_CharacterJoint(const FactoryParams &params);