diff --git a/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs b/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs
index 753cec8bfa5..7207d603310 100644
--- a/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs
+++ b/modules/swagger-codegen/src/test/resources/1_2/petstore-1.2/api-docs
@@ -31,18 +31,18 @@
       "grantTypes": {
         "implicit": {
           "loginEndpoint": {
-            "url": "http://petstore.swagger.wordnik.com/oauth/dialog"
+            "url": "http://petstore.swagger.io/api/oauth/dialog"
           },
           "tokenName": "access_token"
         },
         "authorization_code": {
           "tokenRequestEndpoint": {
-            "url": "http://petstore.swagger.wordnik.com/oauth/requestToken",
+            "url": "http://petstore.swagger.io/api/oauth/requestToken",
             "clientIdName": "client_id",
             "clientSecretName": "client_secret"
           },
           "tokenEndpoint": {
-            "url": "http://petstore.swagger.wordnik.com/oauth/token",
+            "url": "http://petstore.swagger.io/api/oauth/token",
             "tokenName": "access_code"
           }
         }
@@ -53,7 +53,7 @@
     "title": "Swagger Sample App",
     "description": "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.wordnik.com\">http://swagger.wordnik.com</a> or on irc.freenode.net, #swagger.  For this sample,\n    you can use the api key \"special-key\" to test the authorization filters",
     "termsOfServiceUrl": "http://swagger.io/terms/",
-    "contact": "apiteam@wordnik.com",
+    "contact": "apiteam@swagger.io",
     "license": "Apache 2.0",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html"
   }
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index 0dce7023772..66762d74b2b 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -6,7 +6,7 @@
     "title": "Swagger Petstore",
     "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "email": "apiteam@wordnik.com"
+      "email": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig b/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig
index c03d1860d24..7422817fea7 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json.orig
@@ -6,7 +6,7 @@
     "title": "Swagger Petstore",
     "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "email": "apiteam@wordnik.com"
+      "email": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",
diff --git a/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json b/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json
index 6f52139e9a4..89f1bf4f81c 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/postBodyTest.json
@@ -6,7 +6,7 @@
     "title": "Swagger Petstore",
     "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "name": "apiteam@wordnik.com"
+      "name": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",
diff --git a/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json b/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json
index fb48df82bfc..2939a50535a 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/requiredTest.json
@@ -6,7 +6,7 @@
     "title": "Swagger Petstore",
     "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "email": "apiteam@wordnik.com"
+      "email": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",
diff --git a/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json b/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json
index 42aa615c344..29d5b75d3d9 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/responseSelectionTest.json
@@ -6,7 +6,7 @@
     "title": "Swagger Petstore",
     "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "email": "apiteam@wordnik.com"
+      "email": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/setup.py b/samples/client/petstore/python/SwaggerPetstore-python/setup.py
index 50a6ffeb00c..fbd738be680 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/setup.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/setup.py
@@ -18,7 +18,7 @@ setup(
     name="SwaggerPetstore",
     version="1.0.0",
     description="Swagger Petstore",
-    author_email="apiteam@wordnik.com",
+    author_email="apiteam@swagger.io",
     url="",
     keywords=["Swagger", "Swagger Petstore"],
     install_requires=REQUIRES,
diff --git a/samples/html/index.html b/samples/html/index.html
index 6dd837bc3ee..068b0523f4e 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -7,7 +7,7 @@
   <h1>Swagger Petstore</h1>
     <div class="app-desc">This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters for </div>
     
-    <div class="app-desc">Contact Info: <a href="apiteam@wordnik.com">apiteam@wordnik.com</a></div>
+    <div class="app-desc">Contact Info: <a href="apiteam@swagger.io">apiteam@swagger.io</a></div>
     <div class="app-desc">Version: 1.0.0</div>
     <div class="license-info">Apache 2.0</div>
     <div class="license-url">http://www.apache.org/licenses/LICENSE-2.0.html</div>
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
index fb7361aa3f0..7b2de09cdd6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -26,7 +26,7 @@ public class SwaggerConfig {
         "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
         "1.0.0",
         "",
-        "apiteam@wordnik.com",
+        "apiteam@swagger.io",
         "Apache 2.0",
         "http://www.apache.org/licenses/LICENSE-2.0.html" );
         return apiInfo;
diff --git a/samples/yaml/api-docs.yml b/samples/yaml/api-docs.yml
index 68c159a35d6..d381f272532 100644
--- a/samples/yaml/api-docs.yml
+++ b/samples/yaml/api-docs.yml
@@ -32,6 +32,6 @@ info:
   title: Swagger Sample App
   description: "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.wordnik.com\">http://swagger.wordnik.com</a> or on irc.freenode.net, #swagger."
   termsOfServiceUrl: "http://swagger.io/terms/"
-  contact: "apiteam@wordnik.com"
+  contact: "apiteam@swagger.io"
   license: Apache 2.0
   licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.html"
\ No newline at end of file