diff --git a/TODO.md b/TODO.md
index eb6c9a0..b668cb8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,9 +1,8 @@
 To-Do List
 ==========
 
-- Reference streams
-- All of the object read/write code
-- All of the stream read/write code
+- All of the object write code
+- All of the stream write code
 - Page create method
 - Write out trailer
 - How to handle object references between documents, i.e., if I copy a page from
diff --git a/pdfio-file.c b/pdfio-file.c
index 25fedba..d8dffdd 100644
--- a/pdfio-file.c
+++ b/pdfio-file.c
@@ -218,7 +218,7 @@ pdfio_obj_t *				// O - New object
 pdfioFileCreatePage(pdfio_file_t *pdf,	// I - PDF file
                     pdfio_dict_t *dict)	// I - Page dictionary
 {
-  // TODO: Implement me
+  // TODO: Implement pdfioFileCreatePage
   (void)pdf;
   (void)dict;
   return (NULL);
diff --git a/pdfio-object.c b/pdfio-object.c
index 57efde7..996cb11 100644
--- a/pdfio-object.c
+++ b/pdfio-object.c
@@ -22,7 +22,7 @@
 bool					// O - `true` on success, `false` on failure
 pdfioObjClose(pdfio_obj_t *obj)		// I - Object
 {
-  // TODO: Implement me
+  // TODO: Implement pdfioObjClose
   (void)obj;
 
   return (false);
@@ -38,7 +38,7 @@ pdfioObjCreateStream(
     pdfio_obj_t    *obj,		// I - Object
     pdfio_filter_t filter)		// I - Type of compression to apply
 {
-  // TODO: Implement me
+  // TODO: Implement pdfioObjCreateStream
   (void)obj;
   (void)filter;
 
diff --git a/pdfio-page.c b/pdfio-page.c
index 5e2ed05..e55f12d 100644
--- a/pdfio-page.c
+++ b/pdfio-page.c
@@ -22,7 +22,7 @@ pdfio_obj_t *				// O - Destination page
 pdfioPageCopy(pdfio_file_t *pdf,	// I - PDF file
               pdfio_obj_t  *src)	// I - Source page
 {
-  // TODO: Implement me
+  // TODO: Implement pdfioPageCopy
   (void)pdf;
   (void)src;
 
diff --git a/pdfio-stream.c b/pdfio-stream.c
index 6bf89f4..cfcdd4d 100644
--- a/pdfio-stream.c
+++ b/pdfio-stream.c
@@ -64,7 +64,7 @@ _pdfioStreamCreate(
     pdfio_obj_t    *obj,		// I - Object
     pdfio_filter_t compression)		// I - Compression to apply
 {
-  // TODO: Implement me
+  // TODO: Implement _pdfioStreamCreate
   (void)obj;
   (void)compression;
 
@@ -478,7 +478,7 @@ pdfioStreamWrite(
   if (!st || st->pdf->mode != _PDFIO_MODE_WRITE || !buffer || !bytes)
     return (false);
 
-  // TODO: Implement me
+  // TODO: Implement pdfioStreamWrite
   return (false);
 }