diff --git a/modules/swagger-core/src/test/scala/specFiles/compositionTest.json b/modules/swagger-core/src/test/scala/specFiles/compositionTest.json
index b9adc5cee8..e28c255251 100644
--- a/modules/swagger-core/src/test/scala/specFiles/compositionTest.json
+++ b/modules/swagger-core/src/test/scala/specFiles/compositionTest.json
@@ -6,7 +6,7 @@
       "title": "Swagger Petstore",
       "termsOfService": "http://helloreverb.com/terms/",
       "contact": {
-        "name": "apiteam@wordnik.com"
+        "name": "apiteam@swagger.io"
       },
       "license": {
         "name": "Apache 2.0",
diff --git a/samples/java-grails2/web-app/WEB-INF/applicationContext.xml b/samples/java-grails2/web-app/WEB-INF/applicationContext.xml
index 975fade72b..95a72f5623 100644
--- a/samples/java-grails2/web-app/WEB-INF/applicationContext.xml
+++ b/samples/java-grails2/web-app/WEB-INF/applicationContext.xml
@@ -30,7 +30,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
     <property name="basePath" value="http://localhost:8080/java-grails2/api"/>
     <property name="title" value="Petstore sample app"/>
     <property name="description" value="This is a app."/>
-    <property name="contact" value="apiteam@wordnik.com"/>
+    <property name="contact" value="apiteam@swagger.io"/>
     <property name="license" value="Apache 2.0 License"/>
     <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
     <property name="scan" value="true"/>
diff --git a/samples/java-jaxrs-cxf/src/main/resources/applicationContext.xml b/samples/java-jaxrs-cxf/src/main/resources/applicationContext.xml
index f540cba7cc..e7df920e8e 100644
--- a/samples/java-jaxrs-cxf/src/main/resources/applicationContext.xml
+++ b/samples/java-jaxrs-cxf/src/main/resources/applicationContext.xml
@@ -45,7 +45,7 @@
     <property name="basePath" value="/api"/>
     <property name="title" value="Petstore sample app"/>
     <property name="description" value="This is a app."/>
-    <property name="contact" value="apiteam@wordnik.com"/>
+    <property name="contact" value="apiteam@swagger.io"/>
     <property name="license" value="Apache 2.0 License"/>
     <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
     <!-- <property name="filterClass" value="com.wordnik.swagger.sample.util.ApiAuthorizationFilterImpl"/> -->
diff --git a/samples/java-jaxrs-cxf/src/test/scala/ResourceListingIT.scala b/samples/java-jaxrs-cxf/src/test/scala/ResourceListingIT.scala
index ae38182db8..d34bbb0636 100644
--- a/samples/java-jaxrs-cxf/src/test/scala/ResourceListingIT.scala
+++ b/samples/java-jaxrs-cxf/src/test/scala/ResourceListingIT.scala
@@ -25,7 +25,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }
diff --git a/samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/Bootstrap.java b/samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
index 892506c9fa..b447a9b02f 100644
--- a/samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
+++ b/samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
@@ -24,7 +24,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
diff --git a/samples/java-jaxrs-no-webxml/src/test/scala/ResourceListingIT.scala b/samples/java-jaxrs-no-webxml/src/test/scala/ResourceListingIT.scala
index d611bb65af..a62fe2d06e 100644
--- a/samples/java-jaxrs-no-webxml/src/test/scala/ResourceListingIT.scala
+++ b/samples/java-jaxrs-no-webxml/src/test/scala/ResourceListingIT.scala
@@ -27,7 +27,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }
diff --git a/samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java b/samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
index ac6ad1348f..ef455be597 100644
--- a/samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
+++ b/samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
@@ -19,7 +19,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
diff --git a/samples/java-jaxrs/src/test/scala/ResourceListingIT.scala b/samples/java-jaxrs/src/test/scala/ResourceListingIT.scala
index d611bb65af..a62fe2d06e 100644
--- a/samples/java-jaxrs/src/test/scala/ResourceListingIT.scala
+++ b/samples/java-jaxrs/src/test/scala/ResourceListingIT.scala
@@ -27,7 +27,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }
diff --git a/samples/java-jersey-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java b/samples/java-jersey-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
index a611b9e15b..1a9a65c5d5 100644
--- a/samples/java-jersey-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
+++ b/samples/java-jersey-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
@@ -19,7 +19,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
diff --git a/samples/java-jersey2/src/main/java/com/wordnik/swagger/sample/Bootstrap.java b/samples/java-jersey2/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
index 073b87e9ce..a14ca6acf0 100644
--- a/samples/java-jersey2/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
+++ b/samples/java-jersey2/src/main/java/com/wordnik/swagger/sample/Bootstrap.java
@@ -19,7 +19,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));