diff --git a/auto.proto b/auto.proto
index 9ed008e..2549294 100644
--- a/auto.proto
+++ b/auto.proto
@@ -21,11 +21,11 @@ message Apple {	       	        	// `autogenpb:marshal`
 }
 
 message Apples {	        	// `autogenpb:marshal` `autogenpb:mutex`
-	string   uuid	        = 1;    // `autogen:default:b2a2de35-07b6-443b-8188-709e27bee8a7`
-	string   version        = 2;    // `autogen:default:2`
-        repeated Apple Apples   = 3;    // `autogen:sort`
-        repeated Pears  More    = 4;    // `autogen:sort`
-        repeated string  Color  = 5;    // `autogen:sort` `autogen:unique`
+	string   uuid	        = 1;    // `autogenpb:default:b2a2de35-07b6-443b-8188-709e27bee8a7`
+	string   version        = 2;    // `autogenpb:default:2`
+        repeated Apple Apples   = 3;    // `autogenpb:sort`
+        repeated Pears  More    = 4;    // `autogenpb:sort`
+        repeated string  Color  = 5;    // `autogenpb:sort` `autogenpb:unique`
 }
 
 message Pears {
@@ -70,7 +70,7 @@ message MsgName {
         repeated string unique	= 5;    // if the fields should have AppendUnique() functions
 }
 
-message File {                                  // `autogen:nomarshal`
+message File {                                  // `autogenpb:nomarshal`
         string   Package 	   = 1;    // whatever the package name is at the top of the .go file
         string   filename	   = 2;    // yellow.proto
         string   filebase	   = 3;    // yellow
@@ -78,7 +78,7 @@ message File {                                  // `autogen:nomarshal`
         int64    version           = 5;    // the version to use in a func NewMsgName()
 
         // every struct in this proto file, this file has: "Apple", "Apples", ... "File", etc...
-        repeated MsgName msgNames  = 6;    // `autogen:unique`  // in this file
+        repeated MsgName msgNames  = 6;    // `autogenpb:unique`  // in this file
 }
 
 // I know, I know, the whole point of using protobuf
@@ -87,7 +87,7 @@ message File {                                  // `autogen:nomarshal`
 // trivial and empty protobuf message can marshal and identify all the files
 // also, this could be used to modify /usr/bin/file /usr/share/magic to identify the files
 // maybe this is already been done and is pointless, but it seems like a good idea
-message Files {                           // `autogen:marshal`
+message Files {                           // `autogenpb:marshal`
         string   uuid	          = 1;    // if you use this scheme, autogen will be able to identify your
         int64    version          = 2;    // protobuf files from the command line.
         repeated File Files       = 3;    // an array of each .proto file in the working directory
@@ -95,7 +95,7 @@ message Files {                           // `autogen:marshal`
 
 // this generic message is used by autogen to identify and
 // then dump the uuid and version from any arbitrary .pb file
-message Identify {                        // `autogen:marshal`
+message Identify {                        // `autogenpb:marshal`
         string   uuid	          = 1;    //
         int64    version          = 2;    //
 }
diff --git a/parseProtoFile.go b/protoParse.go
similarity index 100%
rename from parseProtoFile.go
rename to protoParse.go