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 b77239a5b4db..81b1294039d6 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
@@ -196,6 +196,13 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String name) {
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(toModelFilename(name));
+    }
+
+    @Override
+    public String toModelFilename(String name) {
         if (!StringUtils.isEmpty(modelNamePrefix)) {
             name = modelNamePrefix + "_" + name;
         }
@@ -212,15 +219,16 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
             name = "model_" + name; // e.g. return => ModelReturn (after camelize)
         }
 
-        // camelize the model name
-        // phone_number => PhoneNumber
-        return camelize(name);
+        return name;
     }
 
     @Override
-    public String toModelFilename(String name) {
-        // should be the same as the model name
-        return toModelName(name);
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        // e.g. PetApi.go => pet_api.go
+        return underscore(name) + "_api";
     }
 
     @Override
diff --git a/samples/client/petstore/go/swagger/ModelReturn.go b/samples/client/petstore/go/swagger/ModelReturn.go
deleted file mode 100644
index 8195d536e302..000000000000
--- a/samples/client/petstore/go/swagger/ModelReturn.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package swagger
-
-import (
-)
-
-type ModelReturn struct {
-    Return_  int32  `json:"return,omitempty"`
-}
diff --git a/samples/client/petstore/go/swagger/Name.go b/samples/client/petstore/go/swagger/Name.go
deleted file mode 100644
index bf106c0681ad..000000000000
--- a/samples/client/petstore/go/swagger/Name.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package swagger
-
-import (
-)
-
-type Name struct {
-    Name  int32  `json:"name,omitempty"`
-    SnakeCase  int32  `json:"snake_case,omitempty"`
-}
diff --git a/samples/client/petstore/go/swagger/PetApi.go b/samples/client/petstore/go/swagger/pet_api.go
similarity index 100%
rename from samples/client/petstore/go/swagger/PetApi.go
rename to samples/client/petstore/go/swagger/pet_api.go
diff --git a/samples/client/petstore/go/swagger/StoreApi.go b/samples/client/petstore/go/swagger/store_api.go
similarity index 100%
rename from samples/client/petstore/go/swagger/StoreApi.go
rename to samples/client/petstore/go/swagger/store_api.go
diff --git a/samples/client/petstore/go/swagger/UserApi.go b/samples/client/petstore/go/swagger/user_api.go
similarity index 100%
rename from samples/client/petstore/go/swagger/UserApi.go
rename to samples/client/petstore/go/swagger/user_api.go