diff --git a/bitblt_g4.c b/bitblt_g4.c
index 8516335..ea71065 100644
--- a/bitblt_g4.c
+++ b/bitblt_g4.c
@@ -2,10 +2,10 @@
 #include <string.h>
 
 
-#include "libpdf.h"
-#include "libpdf_util.h"
-#include "libpdf_prim.h"
-#include "libpdf_private.h"
+#include "pdf.h"
+#include "pdf_util.h"
+#include "pdf_prim.h"
+#include "pdf_private.h"
 
 
 struct pdf_g4_image
diff --git a/pdf.c b/pdf.c
index e7a328b..f89c711 100644
--- a/pdf.c
+++ b/pdf.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 
 
-#include "libpdf.h"
-#include "libpdf_util.h"
-#include "libpdf_prim.h"
-#include "libpdf_private.h"
+#include "pdf.h"
+#include "pdf_util.h"
+#include "pdf_prim.h"
+#include "pdf_private.h"
 
 
 static void pdf_set_info (pdf_file_handle pdf_file, char *key, char *val)
@@ -56,7 +56,7 @@ pdf_file_handle pdf_create (char *filename)
   pdf_set_dict_entry (pdf_file->catalog, "PageMode", pdf_new_name ("UseNone"));
 
   pdf_file->info    = pdf_new_ind_ref (pdf_file, pdf_new_obj (PT_DICTIONARY));
-  pdf_set_info (pdf_file, "Producer", "libpdf, Copyright 2003 Eric Smith <eric@brouhaha.com>");
+  pdf_set_info (pdf_file, "Producer", "t2p, Copyright 2003 Eric Smith <eric@brouhaha.com>");
 
   pdf_file->trailer_dict = pdf_new_obj (PT_DICTIONARY);
   /* Size key will be added later */
diff --git a/pdf_g4.c b/pdf_g4.c
index 8516335..ea71065 100644
--- a/pdf_g4.c
+++ b/pdf_g4.c
@@ -2,10 +2,10 @@
 #include <string.h>
 
 
-#include "libpdf.h"
-#include "libpdf_util.h"
-#include "libpdf_prim.h"
-#include "libpdf_private.h"
+#include "pdf.h"
+#include "pdf_util.h"
+#include "pdf_prim.h"
+#include "pdf_private.h"
 
 
 struct pdf_g4_image
diff --git a/pdf_prim.c b/pdf_prim.c
index 2ba81e8..fb469ca 100644
--- a/pdf_prim.c
+++ b/pdf_prim.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libpdf.h"
-#include "libpdf_util.h"
-#include "libpdf_prim.h"
-#include "libpdf_private.h"
+#include "pdf.h"
+#include "pdf_util.h"
+#include "pdf_prim.h"
+#include "pdf_private.h"
 
 
 struct pdf_array_elem
diff --git a/pdf_util.c b/pdf_util.c
index a07241d..7c4b020 100644
--- a/pdf_util.c
+++ b/pdf_util.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libpdf.h"
-#include "libpdf_util.h"
+#include "pdf.h"
+#include "pdf_util.h"
 
 
 void pdf_fatal (char *fmt, ...)