diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
index ebf8ba96e93..c1336e10cc4 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -283,15 +283,11 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelDocFilename(String name) {
-        //unable to use model file name because the mustache template does not have the model file name variable (python has the same issue)
-        //return toModelFilename(name);
         return toModelName(name);
     }
 
     @Override
     public String toApiDocFilename(String name) {
-        //unable to use api file name because the mustache template does not have the api file name variable
-        //return toApiFilename(name);
         return toApiName(name);
     }
 
diff --git a/modules/swagger-codegen/src/main/resources/go/README.mustache b/modules/swagger-codegen/src/main/resources/go/README.mustache
index d4d88cb8f42..026d0648ea6 100644
--- a/modules/swagger-codegen/src/main/resources/go/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/README.mustache
@@ -8,7 +8,7 @@
 This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
 
 - API version: {{appVersion}}
-- Package version: {{artifactVersion}}
+- Package version: {{packageVersion}}
 - Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}
diff --git a/samples/client/petstore/go/README.md b/samples/client/petstore/go/README.md
index 6dabac9024e..5af32ccefbb 100644
--- a/samples/client/petstore/go/README.md
+++ b/samples/client/petstore/go/README.md
@@ -6,8 +6,8 @@ This is a sample server Petstore server.  You can find out more about Swagger at
 This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
-- Package version: 
-- Build date: 2016-04-14T14:05:06.510-07:00
+- Package version: 1.0.0
+- Build date: 2016-04-16T15:44:50.329-07:00
 - Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation