diff --git a/panda/src/tinydisplay/config_tinydisplay.cxx b/panda/src/tinydisplay/config_tinydisplay.cxx
index 6cda14fd9e..221cf821c3 100644
--- a/panda/src/tinydisplay/config_tinydisplay.cxx
+++ b/panda/src/tinydisplay/config_tinydisplay.cxx
@@ -118,7 +118,7 @@ init_libtinydisplay() {
   TinyTextureContext::init_type();
 
   PandaSystem *ps = PandaSystem::get_global_ptr();
-  ps->add_system("TinyGL");
+  ps->add_system("TinyPanda");
 
   GraphicsPipeSelection *selection = GraphicsPipeSelection::get_global_ptr();
 
@@ -127,7 +127,7 @@ init_libtinydisplay() {
   TinyXGraphicsWindow::init_type();
   selection->add_pipe_type(TinyXGraphicsPipe::get_class_type(),
                            TinyXGraphicsPipe::pipe_constructor);
-  ps->set_system_tag("TinyGL", "native_window_system", "X");
+  ps->set_system_tag("TinyPanda", "native_window_system", "X");
 #endif
 
 #ifdef WIN32
@@ -135,7 +135,7 @@ init_libtinydisplay() {
   TinyWinGraphicsWindow::init_type();
   selection->add_pipe_type(TinyWinGraphicsPipe::get_class_type(),
                            TinyWinGraphicsPipe::pipe_constructor);
-  ps->set_system_tag("TinyGL", "native_window_system", "Win");
+  ps->set_system_tag("TinyPanda", "native_window_system", "Win");
 #endif
 
 #ifdef IS_OSX
@@ -143,7 +143,7 @@ init_libtinydisplay() {
   TinyOsxGraphicsWindow::init_type();
   selection->add_pipe_type(TinyOsxGraphicsPipe::get_class_type(),
                            TinyOsxGraphicsPipe::pipe_constructor);
-  ps->set_system_tag("TinyGL", "OSX", "OSX");
+  ps->set_system_tag("TinyPanda", "native_window_system", "OSX");
 #endif
 
 #ifdef HAVE_SDL
@@ -151,7 +151,7 @@ init_libtinydisplay() {
   TinySDLGraphicsWindow::init_type();
   selection->add_pipe_type(TinySDLGraphicsPipe::get_class_type(),
                            TinySDLGraphicsPipe::pipe_constructor);
-  ps->set_system_tag("TinyGL", "SDL", "SDL");
+  ps->set_system_tag("TinyPanda", "SDL", "SDL");
 #endif
 }
 
diff --git a/panda/src/tinydisplay/error.cxx b/panda/src/tinydisplay/error.cxx
index 1e1a566681..4bd79f9296 100644
--- a/panda/src/tinydisplay/error.cxx
+++ b/panda/src/tinydisplay/error.cxx
@@ -7,7 +7,7 @@ void gl_fatal_error(char *format, ...)
 
   va_start(ap,format);
 
-  fprintf(stderr,"TinyGL: fatal error: ");
+  fprintf(stderr,"TinyPanda: fatal error: ");
   vfprintf(stderr,format,ap);
   fprintf(stderr,"\n");
   exit(1);
diff --git a/panda/src/tinydisplay/tinyGeomMunger.cxx b/panda/src/tinydisplay/tinyGeomMunger.cxx
index 070dfced4a..4f2b4a903c 100644
--- a/panda/src/tinydisplay/tinyGeomMunger.cxx
+++ b/panda/src/tinydisplay/tinyGeomMunger.cxx
@@ -54,23 +54,6 @@ munge_format_impl(const GeomVertexFormat *orig,
   PT(GeomVertexFormat) new_format = new GeomVertexFormat(*orig);
   new_format->set_animation(animation);
 
-  /*
-  const GeomVertexColumn *color_type = orig->get_color_column();
-  if (color_type != (GeomVertexColumn *)NULL &&
-      color_type->get_numeric_type() == NT_packed_dabc) {
-    // We need to convert the color format; OpenGL doesn't support the
-    // byte order of DirectX's packed ARGB format.
-    int color_array = orig->get_array_with(InternalName::get_color());
-
-    PT(GeomVertexArrayFormat) new_array_format = new_format->modify_array(color_array);
-
-    // Replace the existing color format with the new format.
-    new_array_format->add_column
-      (InternalName::get_color(), 4, NT_uint8,
-       C_color, color_type->get_start());
-  }
-  */
-
   CPT(GeomVertexFormat) format = GeomVertexFormat::register_format(new_format);
 
   return format;
diff --git a/panda/src/tinydisplay/tinyGeomMunger.h b/panda/src/tinydisplay/tinyGeomMunger.h
index 7900cfc19c..0e8065d50f 100644
--- a/panda/src/tinydisplay/tinyGeomMunger.h
+++ b/panda/src/tinydisplay/tinyGeomMunger.h
@@ -23,8 +23,9 @@
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyGeomMunger
 // Description : This specialization on GeomMunger finesses vertices
-//               for TinyGL rendering.  In particular, it makes sure
-//               colors aren't stored in DirectX's packed_argb format.
+//               for TinyPanda rendering.  This actually doesn't have
+//               to do very much, since TinyPanda is not that
+//               particular.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyGeomMunger : public StandardMunger {
 public:
diff --git a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
index 505704ad33..fd94e7a662 100644
--- a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
+++ b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
@@ -2404,9 +2404,9 @@ set_scissor(float left, float right, float bottom, float top) {
 ////////////////////////////////////////////////////////////////////
 //     Function: TinyGraphicsStateGuardian::apply_texture
 //       Access: Protected
-//  Description: Updates TinyGL with the current information for this
-//               texture, and makes it the current texture available
-//               for rendering.
+//  Description: Updates the graphics state with the current
+//               information for this texture, and makes it the
+//               current texture available for rendering.
 ////////////////////////////////////////////////////////////////////
 bool TinyGraphicsStateGuardian::
 apply_texture(TextureContext *tc) {
@@ -2419,7 +2419,7 @@ apply_texture(TextureContext *tc) {
 ////////////////////////////////////////////////////////////////////
 //     Function: TinyGraphicsStateGuardian::upload_texture
 //       Access: Protected
-//  Description: Uploads the texture image to TinyGL.
+//  Description: Uploads the texture image to the graphics state.
 //
 //               The return value is true if successful, or false if
 //               the texture has no image.
diff --git a/panda/src/tinydisplay/tinyGraphicsStateGuardian.h b/panda/src/tinydisplay/tinyGraphicsStateGuardian.h
index 5ca6e6f8d9..216dbc33b2 100644
--- a/panda/src/tinydisplay/tinyGraphicsStateGuardian.h
+++ b/panda/src/tinydisplay/tinyGraphicsStateGuardian.h
@@ -29,8 +29,16 @@ class TinyTextureContext;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyGraphicsStateGuardian
-// Description : An interface to the TinyGL software rendering code
+// Description : An interface to the TinyPanda software rendering code
 //               within this module.
+//
+//               TinyPanda takes its name from TinyGL, the
+//               public-domain software renderer (see
+//               http://fabrice.bellard.free.fr/TinyGL/ ) from which
+//               this code originated.  It has since been heavily
+//               modified, to integrate it closely with Panda, and to
+//               add additional features such as blending, filtering,
+//               and multitexturing.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyGraphicsStateGuardian : public GraphicsStateGuardian {
 public:
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
index 3181ee0695..1d514ff1fe 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
@@ -54,7 +54,7 @@ TinyOsxGraphicsPipe::
 ////////////////////////////////////////////////////////////////////
 string TinyOsxGraphicsPipe::
 get_interface_name() const {
-  return "TinyGL OSX";
+  return "TinyPanda";
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
index abb4c74d49..ce7d270f05 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
@@ -30,8 +30,7 @@
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyOsxGraphicsPipe
 // Description : This graphics pipe represents the interface for
-//               creating TinyGL graphics windows on a Windows-based
-//               client.
+//               creating TinyPanda graphics windows on a Mac client.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyOsxGraphicsPipe : public GraphicsPipe {
 public:
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.h b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
index 1425a6fee5..4d5b3d9c6b 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
@@ -27,8 +27,8 @@
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyOsxGraphicsWindow
-// Description : Opens a window on OS X to display the TinyGL software
-//               rendering.
+// Description : Opens a window on OS X to display the TinyPanda
+//               software rendering.
 ////////////////////////////////////////////////////////////////////
 class TinyOsxGraphicsWindow : public GraphicsWindow {
 public:
diff --git a/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx b/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
index 4768c5710e..a867759395 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
@@ -66,7 +66,7 @@ TinySDLGraphicsPipe::
 ////////////////////////////////////////////////////////////////////
 string TinySDLGraphicsPipe::
 get_interface_name() const {
-  return "TinyGL SDL";
+  return "TinyPanda";
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/tinySDLGraphicsPipe.h b/panda/src/tinydisplay/tinySDLGraphicsPipe.h
index fb41e8f2f7..680a7749cc 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinySDLGraphicsPipe.h
@@ -27,7 +27,7 @@ class FrameBufferProperties;
 ////////////////////////////////////////////////////////////////////
 //       Class : TinySDLGraphicsPipe
 // Description : This graphics pipe manages SDL windows for rendering
-//               TinyGL software buffers.
+//               TinyPanda software buffers.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinySDLGraphicsPipe : public GraphicsPipe {
 public:
diff --git a/panda/src/tinydisplay/tinyWinGraphicsPipe.cxx b/panda/src/tinydisplay/tinyWinGraphicsPipe.cxx
index ffb7bf7de5..890512daf2 100755
--- a/panda/src/tinydisplay/tinyWinGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinyWinGraphicsPipe.cxx
@@ -54,7 +54,7 @@ TinyWinGraphicsPipe::
 ////////////////////////////////////////////////////////////////////
 string TinyWinGraphicsPipe::
 get_interface_name() const {
-  return "TinyGL Windows";
+  return "TinyPanda";
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/tinyWinGraphicsPipe.h b/panda/src/tinydisplay/tinyWinGraphicsPipe.h
index 9cab1bcdc2..606d7a810d 100755
--- a/panda/src/tinydisplay/tinyWinGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinyWinGraphicsPipe.h
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyWinGraphicsPipe
 // Description : This graphics pipe represents the interface for
-//               creating TinyGL graphics windows on a Windows-based
-//               client.
+//               creating TinyPanda graphics windows on a
+//               Windows-based client.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyWinGraphicsPipe : public WinGraphicsPipe {
 public:
diff --git a/panda/src/tinydisplay/tinyWinGraphicsWindow.h b/panda/src/tinydisplay/tinyWinGraphicsWindow.h
index 1f81526849..3a36b9f670 100755
--- a/panda/src/tinydisplay/tinyWinGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinyWinGraphicsWindow.h
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyWinGraphicsWindow
 // Description : Opens a window on Microsoft Windows to display the
-//               TinyGL software rendering.
+//               TinyPanda software rendering.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyWinGraphicsWindow : public WinGraphicsWindow {
 public:
diff --git a/panda/src/tinydisplay/tinyXGraphicsPipe.cxx b/panda/src/tinydisplay/tinyXGraphicsPipe.cxx
index f1de1710ef..b425e320dc 100644
--- a/panda/src/tinydisplay/tinyXGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinyXGraphicsPipe.cxx
@@ -148,7 +148,7 @@ TinyXGraphicsPipe::
 ////////////////////////////////////////////////////////////////////
 string TinyXGraphicsPipe::
 get_interface_name() const {
-  return "TinyGL X11";
+  return "TinyPanda";
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/tinyXGraphicsPipe.h b/panda/src/tinydisplay/tinyXGraphicsPipe.h
index 5418457030..a7db0bd6af 100644
--- a/panda/src/tinydisplay/tinyXGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinyXGraphicsPipe.h
@@ -46,7 +46,7 @@ typedef int XIC;
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyXGraphicsPipe
 // Description : This graphics pipe represents the interface for
-//               creating TinyGL graphics windows on an X11-based
+//               creating TinyPanda graphics windows on an X11-based
 //               (e.g. Unix) client.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyXGraphicsPipe : public GraphicsPipe {
diff --git a/panda/src/tinydisplay/tinyXGraphicsWindow.h b/panda/src/tinydisplay/tinyXGraphicsWindow.h
index b1c66f871b..42de1b1d3e 100644
--- a/panda/src/tinydisplay/tinyXGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinyXGraphicsWindow.h
@@ -25,8 +25,8 @@
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TinyXGraphicsWindow
-// Description : Opens a window on X11 to display the TinyGL software
-//               rendering.
+// Description : Opens a window on X11 to display the TinyPanda
+//               software rendering.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinyXGraphicsWindow : public GraphicsWindow {
 public: