diff --git a/bin/go-petstore.sh b/bin/go-petstore.sh
index 35c5c0e6064..eea1aaaf6f3 100755
--- a/bin/go-petstore.sh
+++ b/bin/go-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/go -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go -o samples/client/petstore/go/go-petstore"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go -o samples/client/petstore/go/go-petstore -DpackageName=petstore "
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index 910888030a1..92a8f1b8685 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -1,4 +1,4 @@
-# Go API client for swagger
+# Go API client for petstore
 
 This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 
@@ -7,13 +7,13 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-04-23T17:00:49.475-07:00
+- Build date: 2016-04-27T21:14:49.805-07:00
 - Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation
 Put the package under your project folder and add the following in import:
 ```
-    "./swagger"
+    "./petstore"
 ```
 
 ## Documentation for API Endpoints
diff --git a/samples/client/petstore/go/go-petstore/api_client.go b/samples/client/petstore/go/go-petstore/api_client.go
index d4b53512c68..743b45a139d 100644
--- a/samples/client/petstore/go/go-petstore/api_client.go
+++ b/samples/client/petstore/go/go-petstore/api_client.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "strings"
diff --git a/samples/client/petstore/go/go-petstore/api_response.go b/samples/client/petstore/go/go-petstore/api_response.go
index 2a34a8cf35a..b670ad101a8 100644
--- a/samples/client/petstore/go/go-petstore/api_response.go
+++ b/samples/client/petstore/go/go-petstore/api_response.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
   "net/http"
diff --git a/samples/client/petstore/go/go-petstore/category.go b/samples/client/petstore/go/go-petstore/category.go
index 1853dfe7239..eb715721978 100644
--- a/samples/client/petstore/go/go-petstore/category.go
+++ b/samples/client/petstore/go/go-petstore/category.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
 )
diff --git a/samples/client/petstore/go/go-petstore/configuration.go b/samples/client/petstore/go/go-petstore/configuration.go
index 2a1b4096399..51aad379b42 100644
--- a/samples/client/petstore/go/go-petstore/configuration.go
+++ b/samples/client/petstore/go/go-petstore/configuration.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "encoding/base64"
diff --git a/samples/client/petstore/go/go-petstore/model_api_response.go b/samples/client/petstore/go/go-petstore/model_api_response.go
index 0905f55cf01..8183399abd9 100644
--- a/samples/client/petstore/go/go-petstore/model_api_response.go
+++ b/samples/client/petstore/go/go-petstore/model_api_response.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
 )
diff --git a/samples/client/petstore/go/go-petstore/order.go b/samples/client/petstore/go/go-petstore/order.go
index a199bcc857d..29b6cffeba0 100644
--- a/samples/client/petstore/go/go-petstore/order.go
+++ b/samples/client/petstore/go/go-petstore/order.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "time"
diff --git a/samples/client/petstore/go/go-petstore/pet.go b/samples/client/petstore/go/go-petstore/pet.go
index 32b9e6d97fc..99016d2d540 100644
--- a/samples/client/petstore/go/go-petstore/pet.go
+++ b/samples/client/petstore/go/go-petstore/pet.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
 )
diff --git a/samples/client/petstore/go/go-petstore/pet_api.go b/samples/client/petstore/go/go-petstore/pet_api.go
index 8bdc25596fe..ac4e23656be 100644
--- a/samples/client/petstore/go/go-petstore/pet_api.go
+++ b/samples/client/petstore/go/go-petstore/pet_api.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "strings"
diff --git a/samples/client/petstore/go/go-petstore/pom.xml b/samples/client/petstore/go/go-petstore/pom.xml
index 50bfe7f14f8..7680ed95cff 100644
--- a/samples/client/petstore/go/go-petstore/pom.xml
+++ b/samples/client/petstore/go/go-petstore/pom.xml
@@ -1,10 +1,10 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.wordnik</groupId>
-    <artifactId>Goswagger</artifactId>
+    <artifactId>Gopetstore</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0</version>
-    <name>Goswagger</name>
+    <name>Gopetstore</name>
  <build>
         <plugins>
             <plugin>
diff --git a/samples/client/petstore/go/go-petstore/store_api.go b/samples/client/petstore/go/go-petstore/store_api.go
index 4a9bd178522..ae011177354 100644
--- a/samples/client/petstore/go/go-petstore/store_api.go
+++ b/samples/client/petstore/go/go-petstore/store_api.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "strings"
diff --git a/samples/client/petstore/go/go-petstore/tag.go b/samples/client/petstore/go/go-petstore/tag.go
index 7347106078a..71bb9d198a4 100644
--- a/samples/client/petstore/go/go-petstore/tag.go
+++ b/samples/client/petstore/go/go-petstore/tag.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
 )
diff --git a/samples/client/petstore/go/go-petstore/user.go b/samples/client/petstore/go/go-petstore/user.go
index 8f459db4674..91a42e57a0e 100644
--- a/samples/client/petstore/go/go-petstore/user.go
+++ b/samples/client/petstore/go/go-petstore/user.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
 )
diff --git a/samples/client/petstore/go/go-petstore/user_api.go b/samples/client/petstore/go/go-petstore/user_api.go
index 405c7af99ae..8ac944e79fa 100644
--- a/samples/client/petstore/go/go-petstore/user_api.go
+++ b/samples/client/petstore/go/go-petstore/user_api.go
@@ -1,4 +1,4 @@
-package swagger
+package petstore
 
 import (
     "strings"