diff --git a/README.adoc b/README.adoc
index 7bda73e92..796182238 100644
--- a/README.adoc
+++ b/README.adoc
@@ -3,9 +3,9 @@
 > Please raise any issues found with the examples in our JIRA:
 > https://issues.jboss.org/browse/SWARM
 
-== WildFly Swarm
+== Thorntail
 
-This repository contains examples for the http://wildfly-swarm.io[WildFly Swarm] project.
+This repository contains examples for the http://wildfly-swarm.io[Thorntail] project.
 
 It is currently listed as *alpha* release software, subject to massive, possibly-breaking,
 changes as we determine exactly how it should all hang together.
@@ -16,12 +16,12 @@ These examples demonstrate utilizing and combining different parts of WildFly to
 a self-contained executable jar. They provide small, specific, working examples that can be used
 as a reference for your own project.
 
-By default, this repository uses `SNAPSHOT` versions of WildFly Swarm.  They are used to test
-particular aspects of the WildFly Swarm project in addition to being useful examples of what
+By default, this repository uses `SNAPSHOT` versions of Thorntail.  They are used to test
+particular aspects of the Thorntail project in addition to being useful examples of what
 you can do and how you can do it.
 
 Since these examples are `SNAPSHOT`-centric, our *snapshot* repository is added to the
-root `pom.xml`.  If you were to build https://github.com/wildfly-swarm/wildfly-swarm[WildFly Swarm]
+root `pom.xml`.  If you were to build https://github.com/wildfly-swarm/wildfly-swarm[Thorntail]
 directly, that would of course take precedence.
 
 If you want to build these examples as they stand (using the snapshot) then you should start by either
diff --git a/arjuna/arjuna/README.md b/arjuna/arjuna/README.md
index 42b553e5e..7ebedf5d9 100644
--- a/arjuna/arjuna/README.md
+++ b/arjuna/arjuna/README.md
@@ -6,12 +6,12 @@ Note, these are not Java EE compliant APIs and classes we're going to use. But t
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -23,15 +23,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>transactions</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
diff --git a/arjuna/arjuna/pom.xml b/arjuna/arjuna/pom.xml
index 58e48284a..122145f9a 100644
--- a/arjuna/arjuna/pom.xml
+++ b/arjuna/arjuna/pom.xml
@@ -25,16 +25,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-arjuna</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-arjuna</artifactId>
 
-  <name>WildFly Swarm Examples: Arjuna</name>
-  <description>WildFly Swarm Examples: Arjuna</description>
+  <name>Thorntail Examples: Arjuna</name>
+  <description>Thorntail Examples: Arjuna</description>
 
   <packaging>war</packaging>
 
@@ -45,8 +45,8 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -64,15 +64,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>transactions</artifactId>
     </dependency>
   </dependencies>
diff --git a/arjuna/pom.xml b/arjuna/pom.xml
index 1fd5734e5..ca9353ecb 100644
--- a/arjuna/pom.xml
+++ b/arjuna/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-arjuna</artifactId>
 
-  <name>WildFly Swarm Examples: Arjuna parent</name>
-  <description>WildFly Swarm Examples: Arjuna parent</description>
+  <name>Thorntail Examples: Arjuna parent</name>
+  <description>Thorntail Examples: Arjuna parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/arjuna/stm/README.md b/arjuna/stm/README.md
index 734dc97da..570041182 100644
--- a/arjuna/stm/README.md
+++ b/arjuna/stm/README.md
@@ -10,12 +10,12 @@ The project is a normal maven project with `war` packaging, not `jar`.
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the `.war`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -37,15 +37,15 @@ Additionally, the usual `maven-war-plugin` is provided.
         </configuration>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>transactions</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -56,7 +56,7 @@ To define the needed parts of WildFly Swarm, a dependency is added
 
 ## Run
 
-   mvn wildfly-swarm:run
+   mvn thorntail:run
 
 ## Use
 
@@ -79,7 +79,7 @@ Transactional object value incremented to 18
 Transactional object value incremented to 19
 Transactional object value incremented to 20
 
-What's happening is that we've created a recoverable STM-managed object (an integer state) within WildFly Swarm and given it an initial value
+What's happening is that we've created a recoverable STM-managed object (an integer state) within Thorntail and given it an initial value
 of 10; then we increment it by another 10, printing out each time we do.
 
 If you repeat the operation you will see a new instance created and the end state will always be 20.
diff --git a/arjuna/stm/pom.xml b/arjuna/stm/pom.xml
index ff2373186..9ae204df8 100644
--- a/arjuna/stm/pom.xml
+++ b/arjuna/stm/pom.xml
@@ -25,16 +25,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-arjuna</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-stm</artifactId>
 
-  <name>WildFly Swarm Examples: STM</name>
-  <description>WildFly Swarm Examples: STM</description>
+  <name>Thorntail Examples: STM</name>
+  <description>Thorntail Examples: STM</description>
 
   <packaging>war</packaging>
 
@@ -55,8 +55,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -74,7 +74,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
@@ -83,11 +83,11 @@
       <version>5.2.12.Final</version>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>transactions</artifactId>
     </dependency>
   </dependencies>
diff --git a/base/pom.xml b/base/pom.xml
index 6203d11f8..a09bfedc8 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-base</artifactId>
 
-  <name>WildFly Swarm Examples: Base</name>
-  <description>WildFly Swarm Examples: Base</description>
+  <name>Thorntail Examples: Base</name>
+  <description>Thorntail Examples: Base</description>
 
   <packaging>jar</packaging>
 
diff --git a/camel/camel-activemq/pom.xml b/camel/camel-activemq/pom.xml
index 0df740f19..a63b0c2c7 100644
--- a/camel/camel-activemq/pom.xml
+++ b/camel/camel-activemq/pom.xml
@@ -24,31 +24,31 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel ActiveMQ</name>
+  <name>Thorntail Examples: Camel ActiveMQ</name>
 
   <artifactId>example-camel-activemq</artifactId>
   <packaging>war</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-activemq</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
   </dependencies>
@@ -64,8 +64,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-cdi/README.md b/camel/camel-cdi/README.md
index 3baab6fd4..188a9d4d9 100644
--- a/camel/camel-cdi/README.md
+++ b/camel/camel-cdi/README.md
@@ -4,18 +4,18 @@ This example uses camel-cdi for enabling CDI beans to participate in a Camel rou
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>camel-cdi</artifactId>
     </dependency>
 
@@ -27,7 +27,7 @@ project does *not* need to specify those.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-camel-cdi-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/camel/camel-cdi/pom.xml b/camel/camel-cdi/pom.xml
index 454fd32fe..687d0aab7 100644
--- a/camel/camel-cdi/pom.xml
+++ b/camel/camel-cdi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,26 +24,26 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel CDI</name>
+  <name>Thorntail Examples: Camel CDI</name>
   <artifactId>example-camel-cdi</artifactId>
   <packaging>war</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-undertow</artifactId>
     </dependency>
   </dependencies>
@@ -51,8 +51,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
diff --git a/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/CdiRouteBuilder.java b/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/CdiRouteBuilder.java
index 2deccaf75..90428b2fb 100644
--- a/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/CdiRouteBuilder.java
+++ b/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/CdiRouteBuilder.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel CDI
+ * Thorntail :: Examples :: Camel CDI
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/HelloBean.java b/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/HelloBean.java
index e87bff89d..c8b163335 100644
--- a/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/HelloBean.java
+++ b/camel/camel-cdi/src/main/java/org/wildfly/swarm/examples/camel/cdi/HelloBean.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel CDI
+ * Thorntail :: Examples :: Camel CDI
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-cdi/src/main/resources/META-INF/beans.xml b/camel/camel-cdi/src/main/resources/META-INF/beans.xml
index 6532ee2c6..6b459047c 100644
--- a/camel/camel-cdi/src/main/resources/META-INF/beans.xml
+++ b/camel/camel-cdi/src/main/resources/META-INF/beans.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Examples :: Camel CDI
+  Thorntail :: Examples :: Camel CDI
   %%
   Copyright (C) 2016 RedHat
   %%
diff --git a/camel/camel-cdi/src/test/java/org/wildfly/swarm/examples/camel/cdi/CamelCdiIT.java b/camel/camel-cdi/src/test/java/org/wildfly/swarm/examples/camel/cdi/CamelCdiIT.java
index cc96caa1b..0ea6bc7f7 100644
--- a/camel/camel-cdi/src/test/java/org/wildfly/swarm/examples/camel/cdi/CamelCdiIT.java
+++ b/camel/camel-cdi/src/test/java/org/wildfly/swarm/examples/camel/cdi/CamelCdiIT.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel CDI
+ * Thorntail :: Examples :: Camel CDI
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-core/pom.xml b/camel/camel-core/pom.xml
index 1e7a8c370..13afed084 100644
--- a/camel/camel-core/pom.xml
+++ b/camel/camel-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,22 +24,22 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel Core</name>
+  <name>Thorntail Examples: Camel Core</name>
   
   <artifactId>example-camel-core</artifactId>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
   </dependencies>
@@ -47,8 +47,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-core/src/main/java/org/wildfly/swarm/examples/camel/core/RouteBuilderA.java b/camel/camel-core/src/main/java/org/wildfly/swarm/examples/camel/core/RouteBuilderA.java
index f40cdbea6..3c34dd80b 100644
--- a/camel/camel-core/src/main/java/org/wildfly/swarm/examples/camel/core/RouteBuilderA.java
+++ b/camel/camel-core/src/main/java/org/wildfly/swarm/examples/camel/core/RouteBuilderA.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Camel Core Test
+ * Thorntail :: Camel Core Test
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-core/src/main/resources/spring/simple-camel-context.xml b/camel/camel-core/src/main/resources/spring/simple-camel-context.xml
index 2d8aed62a..173e27a4c 100644
--- a/camel/camel-core/src/main/resources/spring/simple-camel-context.xml
+++ b/camel/camel-core/src/main/resources/spring/simple-camel-context.xml
@@ -1,6 +1,6 @@
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Test
+  Thorntail :: Camel Core Test
   %%
   Copyright (C) 2016 RedHat
   %%
diff --git a/camel/camel-core/src/test/java/org/wildfly/swarm/examples/camel/core/SimpleCoreTransformIT.java b/camel/camel-core/src/test/java/org/wildfly/swarm/examples/camel/core/SimpleCoreTransformIT.java
index 06a2f564f..ca12b8d62 100644
--- a/camel/camel-core/src/test/java/org/wildfly/swarm/examples/camel/core/SimpleCoreTransformIT.java
+++ b/camel/camel-core/src/test/java/org/wildfly/swarm/examples/camel/core/SimpleCoreTransformIT.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel CDI
+ * Thorntail :: Examples :: Camel CDI
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-cxf-jaxrs/README.md b/camel/camel-cxf-jaxrs/README.md
index ffceb2814..fe02226fd 100644
--- a/camel/camel-cxf-jaxrs/README.md
+++ b/camel/camel-cxf-jaxrs/README.md
@@ -4,18 +4,18 @@ This example uses camel-cxf to expose a JAX-RS REST consumer.
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>camel-cxf</artifactId>
     </dependency>
 
@@ -27,7 +27,7 @@ project does *not* need to specify those.
 You can run it many ways:
 
 * java -jar ./target/example-camel-cxf-jaxrs-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/camel/camel-cxf-jaxrs/pom.xml b/camel/camel-cxf-jaxrs/pom.xml
index cf88d4f15..33e02da4e 100644
--- a/camel/camel-cxf-jaxrs/pom.xml
+++ b/camel/camel-cxf-jaxrs/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,12 +24,12 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel CXF-JAXRS</name>
+  <name>Thorntail Examples: Camel CXF-JAXRS</name>
   
   <artifactId>example-camel-cxf-jaxrs</artifactId>
 
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cxf</artifactId>
     </dependency>
   </dependencies>
@@ -49,8 +49,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-cxf-jaxws/README.md b/camel/camel-cxf-jaxws/README.md
index 1545f281e..02e20e1ab 100644
--- a/camel/camel-cxf-jaxws/README.md
+++ b/camel/camel-cxf-jaxws/README.md
@@ -4,18 +4,18 @@ This example uses camel-cxf to expose a JAX-WS consumer.
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>camel-cxf</artifactId>
     </dependency>
 
@@ -27,7 +27,7 @@ project does *not* need to specify those.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-camel-cxf-jaxws-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/camel/camel-cxf-jaxws/pom.xml b/camel/camel-cxf-jaxws/pom.xml
index 138614ae6..0c922d15e 100644
--- a/camel/camel-cxf-jaxws/pom.xml
+++ b/camel/camel-cxf-jaxws/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,12 +24,12 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel CXF-JAXWS</name>
+  <name>Thorntail Examples: Camel CXF-JAXWS</name>
 
   <artifactId>example-camel-cxf-jaxws</artifactId>
 
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cxf</artifactId>
     </dependency>
   </dependencies>
@@ -49,8 +49,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-jms/README.md b/camel/camel-jms/README.md
index d4ecbdfff..27c550abb 100644
--- a/camel/camel-jms/README.md
+++ b/camel/camel-jms/README.md
@@ -4,18 +4,18 @@ This example uses camel-jms to produce and consume messages via the messaging su
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>camel-full</artifactId>
     </dependency>
 
@@ -27,7 +27,7 @@ project does *not* need to specify those.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-camel-jms-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/camel/camel-jms/pom.xml b/camel/camel-jms/pom.xml
index fbf1327c9..810a4f629 100644
--- a/camel/camel-jms/pom.xml
+++ b/camel/camel-jms/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,12 +24,12 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel JMS</name>
+  <name>Thorntail Examples: Camel JMS</name>
 
   <artifactId>example-camel-jms</artifactId>
 
@@ -37,19 +37,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-jms</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-undertow</artifactId>
     </dependency>
   </dependencies>
@@ -57,8 +57,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-jms/src/main/java/org/wildfly/swarm/examples/camel/jms/JmsRouteBuilder.java b/camel/camel-jms/src/main/java/org/wildfly/swarm/examples/camel/jms/JmsRouteBuilder.java
index 93e1fc8e0..c79f37273 100644
--- a/camel/camel-jms/src/main/java/org/wildfly/swarm/examples/camel/jms/JmsRouteBuilder.java
+++ b/camel/camel-jms/src/main/java/org/wildfly/swarm/examples/camel/jms/JmsRouteBuilder.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel JMS
+ * Thorntail :: Examples :: Camel JMS
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-jms/src/test/java/org/wildfly/swarm/examples/camel/jms/CamelJmsIT.java b/camel/camel-jms/src/test/java/org/wildfly/swarm/examples/camel/jms/CamelJmsIT.java
index 033aadf2c..8f9a59c9f 100644
--- a/camel/camel-jms/src/test/java/org/wildfly/swarm/examples/camel/jms/CamelJmsIT.java
+++ b/camel/camel-jms/src/test/java/org/wildfly/swarm/examples/camel/jms/CamelJmsIT.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel JMS
+ * Thorntail :: Examples :: Camel JMS
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-jpa/pom.xml b/camel/camel-jpa/pom.xml
index e48f88999..2d090dac0 100644
--- a/camel/camel-jpa/pom.xml
+++ b/camel/camel-jpa/pom.xml
@@ -9,43 +9,43 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel JPA</name>
+  <name>Thorntail Examples: Camel JPA</name>
 
   <artifactId>example-camel-jpa</artifactId>
   <packaging>war</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-jaxb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-jpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
@@ -71,8 +71,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-mail/README.md b/camel/camel-mail/README.md
index 2bd81d9bc..dabc58e73 100644
--- a/camel/camel-mail/README.md
+++ b/camel/camel-mail/README.md
@@ -4,18 +4,18 @@ This example uses camel-mail to send and receive email.
 
 ## Project `pom.xml`
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>camel-full</artifactId>
     </dependency>
 
@@ -27,7 +27,7 @@ project does *not* need to specify those.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-camel-mail-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/camel/camel-mail/pom.xml b/camel/camel-mail/pom.xml
index dda34f08b..e175d74e8 100644
--- a/camel/camel-mail/pom.xml
+++ b/camel/camel-mail/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Wildfly Swarm :: Camel Core Runtime
+  Thorntail :: Camel Core Runtime
   %%
   Copyright (C) 2016 RedHat
   %%
@@ -24,30 +24,30 @@
     <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-camel</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>Wildfly Swarm Examples: Camel Mail</name>
+  <name>Thorntail Examples: Camel Mail</name>
 
   <artifactId>example-camel-mail</artifactId>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-mail</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>camel-undertow</artifactId>
     </dependency>
     <dependency>
@@ -70,8 +70,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/camel/camel-mail/src/main/java/org/wildfly/swarm/examples/camel/mail/MailRouteBuilder.java b/camel/camel-mail/src/main/java/org/wildfly/swarm/examples/camel/mail/MailRouteBuilder.java
index 408a0a6d8..1f73dc75a 100644
--- a/camel/camel-mail/src/main/java/org/wildfly/swarm/examples/camel/mail/MailRouteBuilder.java
+++ b/camel/camel-mail/src/main/java/org/wildfly/swarm/examples/camel/mail/MailRouteBuilder.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel Mail
+ * Thorntail :: Examples :: Camel Mail
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/camel-mail/src/test/java/org/wildfly/swarm/examples/camel/mail/CamelMailIT.java b/camel/camel-mail/src/test/java/org/wildfly/swarm/examples/camel/mail/CamelMailIT.java
index aaaef5570..0e3279562 100644
--- a/camel/camel-mail/src/test/java/org/wildfly/swarm/examples/camel/mail/CamelMailIT.java
+++ b/camel/camel-mail/src/test/java/org/wildfly/swarm/examples/camel/mail/CamelMailIT.java
@@ -1,6 +1,6 @@
 /*
  * #%L
- * Wildfly Swarm :: Examples :: Camel Mail
+ * Thorntail :: Examples :: Camel Mail
  * %%
  * Copyright (C) 2016 RedHat
  * %%
diff --git a/camel/pom.xml b/camel/pom.xml
index 40397cbbc..9fed9fd39 100644
--- a/camel/pom.xml
+++ b/camel/pom.xml
@@ -9,12 +9,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
-  <name>WildFly Swarm Examples: Camel</name>
+  <name>Thorntail Examples: Camel</name>
 
   <artifactId>examples-camel</artifactId>
   <packaging>pom</packaging>
diff --git a/config-options/README.adoc b/config-options/README.adoc
index a4811e418..e7e5ed860 100644
--- a/config-options/README.adoc
+++ b/config-options/README.adoc
@@ -1,7 +1,7 @@
 = Configuration Examples
 
-There's a variety of ways to configure WildFly Swarm
+There's a variety of ways to configure Thorntail
 
 First, CDI Injection can be used to inject property values into code.
 
-Alternatively, XML configuration can be used to cofigure WildFly Swarm, for example using a custom `standalone.xml` file.
\ No newline at end of file
+Alternatively, XML configuration can be used to cofigure Thorntail, for example using a custom `standalone.xml` file.
\ No newline at end of file
diff --git a/config-options/cdi-injection/README.adoc b/config-options/cdi-injection/README.adoc
index b442fdc96..609b5ce7c 100644
--- a/config-options/cdi-injection/README.adoc
+++ b/config-options/cdi-injection/README.adoc
@@ -2,7 +2,7 @@
 
 This examples takes a normal JAX-RS build, and wraps it into a `-swarm` runnable jar.
 
-The example shows how to use CDI injection to configure WildFly Swarm.
+The example shows how to use CDI injection to configure Thorntail.
 
 > Please raise any issues found with this example in our JIRA:
 > https://issues.jboss.org/browse/SWARM[https://issues.jboss.org/browse/SWARM]
@@ -41,7 +41,7 @@ create the runnable `.jar`.
 </plugin>
 ----
 
-To define the required parts of WildFly Swarm, some dependencies are added
+To define the required parts of Thorntail, some dependencies are added
 
 [source,xml]
 ----
diff --git a/config-options/cdi-injection/pom.xml b/config-options/cdi-injection/pom.xml
index c385f0cec..26987759e 100644
--- a/config-options/cdi-injection/pom.xml
+++ b/config-options/cdi-injection/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-configuration</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>cdi-injection</artifactId>
 
-  <name>WildFly Swarm Examples: CDI Configuration Properties</name>
-  <description>WildFly Swarm Examples: CDI Configuration Properties</description>
+  <name>Thorntail Examples: CDI Configuration Properties</name>
+  <description>Thorntail Examples: CDI Configuration Properties</description>
 
   <packaging>war</packaging>
 
@@ -34,8 +34,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <bundleDependencies>true</bundleDependencies>
         </configuration>
@@ -57,26 +57,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>monitor</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>logging</artifactId>
     </dependency>
   </dependencies>
diff --git a/config-options/pom.xml b/config-options/pom.xml
index 3b8f2ac2d..2982ad93a 100644
--- a/config-options/pom.xml
+++ b/config-options/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-configuration</artifactId>
 
-  <name>WildFly Swarm Examples: Config Options</name>
-  <description>WildFly Swarm Examples: Config Options</description>
+  <name>Thorntail Examples: Config Options</name>
+  <description>Thorntail Examples: Config Options</description>
 
   <packaging>pom</packaging>
 
diff --git a/config-options/xml-configuration/README.adoc b/config-options/xml-configuration/README.adoc
index 0a3a7ce5f..abaa43555 100644
--- a/config-options/xml-configuration/README.adoc
+++ b/config-options/xml-configuration/README.adoc
@@ -1,7 +1,7 @@
 = XML Configuration
 
 This example demonstrates how to use XML configuration instead of the java config-api,
-to configure WildFly Swarm. This might be useful, when you are migrating from a traditional
+to configure Thorntail. This might be useful, when you are migrating from a traditional
 WildFly deployment and you have your `standalone.xml` file ready.
 
 To build this example, execute `mvn package` on the command line in the directory where
@@ -19,7 +19,7 @@ cd xml-configuration
 java -jar target/example-xml-config-swarm.jar -c ../standalone.xml
 ----
 
-2. Place your `standalone.xml` in the directory from which you are starting the WildFly Swarm
+2. Place your `standalone.xml` in the directory from which you are starting the Thorntail
 executable jar:
 
 [source,sh,subs="quotes"]
@@ -30,7 +30,7 @@ cdi-injection  pom.xml  *standalone.xml*  xml-configuration
 java -jar xml-configuration/target/example-xml-config-swarm.jar
 ----
 
-3. Package your `standalone.xml` in the root directory of your WildFly Swarm
+3. Package your `standalone.xml` in the root directory of your Thorntail
 executable jar:
 
 [source,sh]
diff --git a/config-options/xml-configuration/pom.xml b/config-options/xml-configuration/pom.xml
index debe316b2..74271cfd8 100644
--- a/config-options/xml-configuration/pom.xml
+++ b/config-options/xml-configuration/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-configuration</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-xml-config</artifactId>
 
-  <name>WildFly Swarm Examples: XML Configuration</name>
-  <description>WildFly Swarm Examples: XML Configuration</description>
+  <name>Thorntail Examples: XML Configuration</name>
+  <description>Thorntail Examples: XML Configuration</description>
 
   <packaging>war</packaging>
 
@@ -35,8 +35,8 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <arguments>
             <argument>-c</argument>
@@ -60,19 +60,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>datasources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>logging</artifactId>
     </dependency>
 
diff --git a/datasource/README.adoc b/datasource/README.adoc
index 675a27abd..f31ffe117 100644
--- a/datasource/README.adoc
+++ b/datasource/README.adoc
@@ -1,7 +1,7 @@
 = Datasource Examples
 
 JDBC Drivers and datasources can be configured in two
-different ways within a WildFly Swarm application.
+different ways within a Thorntail application.
 
 The first is through a *deployment*, which is, as you might
 guess, a deployment-time creation of a datasource. Through
diff --git a/datasource/datasource-auto-detect/README.adoc b/datasource/datasource-auto-detect/README.adoc
index 6d3c0aa0d..a9d9664c6 100644
--- a/datasource/datasource-auto-detect/README.adoc
+++ b/datasource/datasource-auto-detect/README.adoc
@@ -7,7 +7,7 @@ This example demonstrates driver auto-detect functionality.
 
 If a user application includes the appropriate vendor JDBC
 library in their normal dependencies, they will be detected
-and installed by WildFly Swarm without any additional effort.
+and installed by Thorntail without any additional effort.
 An `ExampleDS` also will be auto register if only one verdor's
 driver be detected.
 
@@ -35,7 +35,7 @@ create the runnable `.jar`.
 As with the other examples, this one inherits a few standard executions
 from the parent `pom.xml`, particularly the `package` execution.
     
-To define the needed parts of WildFly Swarm, a few dependencies are added.
+To define the needed parts of Thorntail, a few dependencies are added.
 The first is not strictly required for configuring datasources, but is
 needed for the example to demonstrate usage of the datasource:
 
diff --git a/datasource/datasource-auto-detect/pom.xml b/datasource/datasource-auto-detect/pom.xml
index 0fa1f96f6..bf13e7b3c 100644
--- a/datasource/datasource-auto-detect/pom.xml
+++ b/datasource/datasource-auto-detect/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-datasource</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-datasource-auto-detect</artifactId>
 
-  <name>WildFly Swarm Examples: Datasource Auto-detected</name>
-  <description>WildFly Swarm Examples: Datasource Auto-detected</description>
+  <name>Thorntail Examples: Datasource Auto-detected</name>
+  <description>Thorntail Examples: Datasource Auto-detected</description>
 
   <packaging>war</packaging>
 
@@ -29,8 +29,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -48,15 +48,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>datasources</artifactId>
     </dependency>
 
diff --git a/datasource/datasource-war/pom.xml b/datasource/datasource-war/pom.xml
index a90515180..320e88a38 100644
--- a/datasource/datasource-war/pom.xml
+++ b/datasource/datasource-war/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-datasource</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-datasource-war</artifactId>
 
-  <name>WildFly Swarm Examples: Datasource War</name>
-  <description>WildFly Swarm Examples: Datasource War</description>
+  <name>Thorntail Examples: Datasource War</name>
+  <description>Thorntail Examples: Datasource War</description>
 
   <packaging>war</packaging>
 
@@ -44,8 +44,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -66,15 +66,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>datasources</artifactId>
     </dependency>
 
diff --git a/datasource/pom.xml b/datasource/pom.xml
index 44ceb1509..31e0fb4d4 100644
--- a/datasource/pom.xml
+++ b/datasource/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-datasource</artifactId>
 
-  <name>WildFly Swarm Examples: Datasource parent</name>
-  <description>WildFly Swarm Examples: Datasource parent</description>
+  <name>Thorntail Examples: Datasource parent</name>
+  <description>Thorntail Examples: Datasource parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/docker-wrapper/README.md b/docker-wrapper/README.md
index cea9e11e3..24685dfcf 100644
--- a/docker-wrapper/README.md
+++ b/docker-wrapper/README.md
@@ -1,6 +1,6 @@
 # Run a WildFly-Swarm example in Docker
 
-You need to have docker and docker-compose installed, and the WildFly Swarm example you want to bundle in a
+You need to have docker and docker-compose installed, and the Thorntail example you want to bundle in a
 Docker image needs to be built with Maven first.
 
 ## Building the Docker image
@@ -11,7 +11,7 @@ If we wanted to build the `jpa-jaxrs-cdi` example we would run the following:
 
 This will copy the `jar` file of the `jpa-jaxrs-cdi` example to this directory, add it to the Docker image and build it.
 
-You can use `build.sh` with any of the examples by passing a different path to a WildFly Swarm jar into the script.
+You can use `build.sh` with any of the examples by passing a different path to a Thorntail jar into the script.
 
 ## Running Docker image
 
diff --git a/docker/docker-jaxrs-dockerfile/pom.xml b/docker/docker-jaxrs-dockerfile/pom.xml
index 1a50e3eb3..2580cf779 100644
--- a/docker/docker-jaxrs-dockerfile/pom.xml
+++ b/docker/docker-jaxrs-dockerfile/pom.xml
@@ -9,16 +9,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>examples-docker</artifactId>
-    <groupId>org.wildfly.swarm.examples</groupId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <groupId>io.thorntail.examples</groupId>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>example-docker-jaxrs-dockerfile</artifactId>
 
-  <name>WildFly Swarm Examples: Docker and JAX-RS using Dockerfile</name>
-  <description>WildFly Swarm Examples: JAX-RS in Docker container using a Dockerfile</description>
+  <name>Thorntail Examples: Docker and JAX-RS using Dockerfile</name>
+  <description>Thorntail Examples: JAX-RS in Docker container using a Dockerfile</description>
   <packaging>war</packaging>
 
   <properties>
@@ -29,11 +29,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
   </dependencies>
@@ -41,8 +41,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
diff --git a/docker/docker-jaxrs/pom.xml b/docker/docker-jaxrs/pom.xml
index ccd5d39f8..7229f5a5a 100644
--- a/docker/docker-jaxrs/pom.xml
+++ b/docker/docker-jaxrs/pom.xml
@@ -9,25 +9,25 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>examples-docker</artifactId>
-    <groupId>org.wildfly.swarm.examples</groupId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <groupId>io.thorntail.examples</groupId>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>example-docker-jaxrs</artifactId>
 
-  <name>WildFly Swarm Examples: Docker and JAX-RS</name>
-  <description>WildFly Swarm Examples: JAX-RS in Docker container</description>
+  <name>Thorntail Examples: Docker and JAX-RS</name>
+  <description>Thorntail Examples: JAX-RS in Docker container</description>
   <packaging>war</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
@@ -49,8 +49,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
diff --git a/docker/pom.xml b/docker/pom.xml
index a449534a6..cf221e86b 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-docker</artifactId>
 
-  <name>WildFly Swarm Examples: Docker parent</name>
-  <description>WildFly Swarm Examples: Docker parent</description>
+  <name>Thorntail Examples: Docker parent</name>
+  <description>Thorntail Examples: Docker parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/flyway/README.md b/flyway/README.md
index 93774a8e2..92cea3800 100644
--- a/flyway/README.md
+++ b/flyway/README.md
@@ -5,7 +5,7 @@ will be executed when the application starts. By default it uses the primary
 configured DataSource.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ This project is a simple `.war` project
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,10 +29,10 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>flyway</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -40,7 +40,7 @@ To define the needed parts of WildFly Swarm, a dependency is added
 ## Run
 
 * `mvn package && java -jar ./target/example-flyway-swarm.jar`
-* Or `mvn wildfly-swarm:run`
+* Or `mvn thorntail:run`
 
 ## Use
 
diff --git a/flyway/pom.xml b/flyway/pom.xml
index 351ac8365..923bf7128 100644
--- a/flyway/pom.xml
+++ b/flyway/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-flyway</artifactId>
 
-  <name>WildFly Swarm Examples: Flyway</name>
-  <description>WildFly Swarm Examples: Flyway</description>
+  <name>Thorntail Examples: Flyway</name>
+  <description>Thorntail Examples: Flyway</description>
 
   <packaging>war</packaging>
 
@@ -30,8 +30,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -43,11 +43,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>flyway</artifactId>
     </dependency>
     <dependency>
diff --git a/gradle/README.md b/gradle/README.md
index 5283057e2..3d492f09a 100644
--- a/gradle/README.md
+++ b/gradle/README.md
@@ -15,7 +15,7 @@ Beginning of a Gradle plugin example.
 
 ## Configuration
 
-If you're using the default `application` plugin, The `wildfly-swarm-plugin`
+If you're using the default `application` plugin, The `thorntail-maven-plugin`
 can piggy-back on the `mainClassName` build property.
 
 Else, you can set `swarm.mainClassName` to specify the main-class for you
diff --git a/gradle/pom.xml b/gradle/pom.xml
index 295e7eacf..32b24c274 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -9,9 +9,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -22,14 +22,14 @@
 
   <artifactId>example-gradle</artifactId>
 
-  <name>WildFly Swarm Examples: Gradle</name>
-  <description>WildFly Swarm Examples: Gradle</description>
+  <name>Thorntail Examples: Gradle</name>
+  <description>Thorntail Examples: Gradle</description>
 
   <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
       <scope>test</scope>
     </dependency>
@@ -44,7 +44,7 @@
         <configuration>
           <gradleVersion>2.14.1</gradleVersion>
           <tasks>
-            <task>wildfly-swarm-package</task>
+            <task>thorntail-package</task>
           </tasks>
           <args>
             <arg>--stacktrace</arg>
@@ -61,8 +61,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <useUberJar>true</useUberJar>
           <projectBuildDir>build/libs</projectBuildDir>
diff --git a/gradle/src/it/java/org/wildfly/swarm/examples/jaxrs/cdi/GradlePackagedApplicationIT.java b/gradle/src/it/java/org/wildfly/swarm/examples/jaxrs/cdi/GradlePackagedApplicationIT.java
index dcdf5cbce..e44950c98 100644
--- a/gradle/src/it/java/org/wildfly/swarm/examples/jaxrs/cdi/GradlePackagedApplicationIT.java
+++ b/gradle/src/it/java/org/wildfly/swarm/examples/jaxrs/cdi/GradlePackagedApplicationIT.java
@@ -21,6 +21,6 @@ public class GradlePackagedApplicationIT extends AbstractIntegrationTest {
     @Test
     public void testIt() {
         browser.navigate().to("http://localhost:8181/");
-        assertThat(browser.getPageSource()).contains("hello: wildfly swarm + gradle + java");
+        assertThat(browser.getPageSource()).contains("hello: Thorntail + gradle + java");
     }
 }
diff --git a/gradle/src/main/java/org/wildfly/swarm/examples/gradle/HelloRest.java b/gradle/src/main/java/org/wildfly/swarm/examples/gradle/HelloRest.java
index d6c29b2a0..b514470f6 100644
--- a/gradle/src/main/java/org/wildfly/swarm/examples/gradle/HelloRest.java
+++ b/gradle/src/main/java/org/wildfly/swarm/examples/gradle/HelloRest.java
@@ -16,7 +16,7 @@ public class HelloRest {
     @Produces(MediaType.APPLICATION_JSON)
     public String hello() {
 
-        return "hello: wildfly swarm + gradle + java";
+        return "hello: Thorntail + gradle + java";
     }
 
 }
diff --git a/jaeger/jaeger-servlet/README.md b/jaeger/jaeger-servlet/README.md
index 2c4e7217a..5e3606733 100644
--- a/jaeger/jaeger-servlet/README.md
+++ b/jaeger/jaeger-servlet/README.md
@@ -5,7 +5,7 @@ the Jaeger fraction instead. Refer to the README on that example to understand
 the basics of how it works.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -34,7 +34,7 @@ export JAEGER_SAMPLER_TYPE=const
 export JAEGER_SAMPLER_PARAM=1 
 ```
 
-Alternatively, you can use the following Wildfly Swarm properties to configure 
+Alternatively, you can use the following Thorntail properties to configure 
 the Tracer. Note that these can also be changed at runtime by your application,
 by using the `org.wildfly.swarm.jaeger.JaegerFraction` or via all regular Wildfly
 Swarm procedures:
@@ -68,7 +68,7 @@ Jaeger will be available at [http://localhost:16686](http://localhost:16686)
 You are now ready to run the example and have span data reported to Jaeger:
 
 * mvn package && java -jar ./target/example-jaeger-servlet-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 You may now make HTTP calls to the application, like:
diff --git a/jaeger/jaeger-servlet/pom.xml b/jaeger/jaeger-servlet/pom.xml
index ca62adbd0..c23f9cad3 100644
--- a/jaeger/jaeger-servlet/pom.xml
+++ b/jaeger/jaeger-servlet/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaeger-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaeger-servlet</artifactId>
 
-  <name>WildFly Swarm Examples: Jaeger Servlet</name>
-  <description>WildFly Swarm Examples: Jaeger Servlet</description>
+  <name>Thorntail Examples: Jaeger Servlet</name>
+  <description>Thorntail Examples: Jaeger Servlet</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,11 +44,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaeger</artifactId>
     </dependency>
     <dependency>
diff --git a/jaeger/pom.xml b/jaeger/pom.xml
index 003160b6f..a2dd79a31 100644
--- a/jaeger/pom.xml
+++ b/jaeger/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-jaeger-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Jaeger parent</name>
-  <description>WildFly Swarm Examples: Jaeger parent</description>
+  <name>Thorntail Examples: Jaeger parent</name>
+  <description>Thorntail Examples: Jaeger parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/jaxrs/contract-based-testing/README.md b/jaxrs/contract-based-testing/README.md
index 4335f0703..4ce6748a3 100644
--- a/jaxrs/contract-based-testing/README.md
+++ b/jaxrs/contract-based-testing/README.md
@@ -1,7 +1,7 @@
 # Contract based testing example
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 This is an example that demonstrates how consumer driven contracts can be used to verify the contract between a service consumer and a service provider.
 
diff --git a/jaxrs/contract-based-testing/jaxrs-consumer/pom.xml b/jaxrs/contract-based-testing/jaxrs-consumer/pom.xml
index ab3b4efd5..87df3fb8e 100644
--- a/jaxrs/contract-based-testing/jaxrs-consumer/pom.xml
+++ b/jaxrs/contract-based-testing/jaxrs-consumer/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs-cdc</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-cdc-consumer</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS Contracts: Consumer Example</name>
+  <name>Thorntail Examples: JAX-RS Contracts: Consumer Example</name>
   <description>Demonstrates how service consumers creates and verify pact files.</description>
 
   <packaging>war</packaging>
@@ -25,8 +25,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/contract-based-testing/jaxrs-provider/pom.xml b/jaxrs/contract-based-testing/jaxrs-provider/pom.xml
index ff6de2c87..cf1c61399 100644
--- a/jaxrs/contract-based-testing/jaxrs-provider/pom.xml
+++ b/jaxrs/contract-based-testing/jaxrs-provider/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs-cdc</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-cdc-provider</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS Contracts: Provider Example</name>
+  <name>Thorntail Examples: JAX-RS Contracts: Provider Example</name>
   <description>Demonstrates how service providers are being tested based on pact files.</description>
 
   <packaging>war</packaging>
@@ -25,8 +25,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/contract-based-testing/pom.xml b/jaxrs/contract-based-testing/pom.xml
index c10db0842..984e3ebf6 100644
--- a/jaxrs/contract-based-testing/pom.xml
+++ b/jaxrs/contract-based-testing/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-jaxrs-cdc</artifactId>
 
-  <name>WildFly Swarm Examples: Consumer Driven Contracts</name>
+  <name>Thorntail Examples: Consumer Driven Contracts</name>
   <description>Demonstrates a setup for contract based testing</description>
 
   <packaging>pom</packaging>
diff --git a/jaxrs/health/README.adoc b/jaxrs/health/README.adoc
index 52f3a972d..074db886d 100644
--- a/jaxrs/health/README.adoc
+++ b/jaxrs/health/README.adoc
@@ -30,7 +30,7 @@ create the runnable `.jar`.
 </plugin>
 ----
 
-To define the needed parts of WildFly Swarm, dependencies are added
+To define the needed parts of Thorntail, dependencies are added
 
 [source,xml]
 ----
diff --git a/jaxrs/health/pom.xml b/jaxrs/health/pom.xml
index 2a3bcb0f7..3f04637aa 100644
--- a/jaxrs/health/pom.xml
+++ b/jaxrs/health/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-health</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS Health Endpoint</name>
-  <description>WildFly Swarm Examples: JAX-RS Health Endpoint</description>
+  <name>Thorntail Examples: JAX-RS Health Endpoint</name>
+  <description>Thorntail Examples: JAX-RS Health Endpoint</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,19 +44,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>monitor</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>logging</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/jaxrs-ajp/pom.xml b/jaxrs/jaxrs-ajp/pom.xml
index f79a5aa1e..8ce66f0cf 100644
--- a/jaxrs/jaxrs-ajp/pom.xml
+++ b/jaxrs/jaxrs-ajp/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-ajp</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS over AJP</name>
-  <description>WildFly Swarm Examples: JAX-RS over AJP</description>
+  <name>Thorntail Examples: JAX-RS over AJP</name>
+  <description>Thorntail Examples: JAX-RS over AJP</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,11 +44,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/jaxrs-cdi-deltaspike/README.md b/jaxrs/jaxrs-cdi-deltaspike/README.md
index 84b0ab94d..61516e1c7 100644
--- a/jaxrs/jaxrs-cdi-deltaspike/README.md
+++ b/jaxrs/jaxrs-cdi-deltaspike/README.md
@@ -4,7 +4,7 @@ This example takes a normal JAX-RS and CDI build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,15 +29,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependency is added
+To define the needed parts of Thorntail, the following dependency is added
 
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -47,19 +47,19 @@ project does *not* need to specify those.
 
 Additional application dependencies (in this case `lombok`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jaxrs-deltaspike-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/jaxrs/jaxrs-cdi-deltaspike/pom.xml b/jaxrs/jaxrs-cdi-deltaspike/pom.xml
index d74ffef51..2eba0b32f 100644
--- a/jaxrs/jaxrs-cdi-deltaspike/pom.xml
+++ b/jaxrs/jaxrs-cdi-deltaspike/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-deltaspike</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS and Deltaspike</name>
-  <description>WildFly Swarm Examples: JAX-RS and Deltaspike</description>
+  <name>Thorntail Examples: JAX-RS and Deltaspike</name>
+  <description>Thorntail Examples: JAX-RS and Deltaspike</description>
 
   <packaging>war</packaging>
 
@@ -29,8 +29,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -60,15 +60,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/jaxrs-cdi/README.md b/jaxrs/jaxrs-cdi/README.md
index d4ded37b0..f1421345a 100644
--- a/jaxrs/jaxrs-cdi/README.md
+++ b/jaxrs/jaxrs-cdi/README.md
@@ -4,7 +4,7 @@ This example takes a normal JAX-RS and CDI build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -30,24 +30,24 @@ create the runnable `.jar`.
     </plugin>
 
 For this example we're letting the plugin auto detect what dependencies
-we might need for our application, so no WildFly Swarm specific dependencies
+we might need for our application, so no Thorntail specific dependencies
 need to be added.
 
 Additional application dependencies (in this case `lombok`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jaxrs-cdi-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/jaxrs/jaxrs-cdi/pom.xml b/jaxrs/jaxrs-cdi/pom.xml
index 78ced5332..0390f9f74 100644
--- a/jaxrs/jaxrs-cdi/pom.xml
+++ b/jaxrs/jaxrs-cdi/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-cdi</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS and CDI</name>
-  <description>WildFly Swarm Examples: JAX-RS and CDI</description>
+  <name>Thorntail Examples: JAX-RS and CDI</name>
+  <description>Thorntail Examples: JAX-RS and CDI</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/jaxrs-deltaspike-data/README.md b/jaxrs/jaxrs-deltaspike-data/README.md
index 2025a1fa9..11be5d06a 100644
--- a/jaxrs/jaxrs-deltaspike-data/README.md
+++ b/jaxrs/jaxrs-deltaspike-data/README.md
@@ -7,7 +7,7 @@ This example uses Apache Deltaspike Data Module with JAXRS.
 This project is intented for use with the following approaches:
 
 1. `org.wildfly.swarm.Swarm` class
-2. Wildfly Swarm Plugin
+2. Thorntail Plugin
 
 In order to achieve these objectives the packaging type must be:
 
@@ -16,8 +16,8 @@ In order to achieve these objectives the packaging type must be:
 Additionally you must include wildfly-swarm maven plugin in your `pom.xml`
 
             <plugin>
-                <groupId>org.wildfly.swarm</groupId>
-                <artifactId>wildfly-swarm-plugin</artifactId>
+                <groupid>io.thorntail</groupId>
+                <artifactId>thorntail-maven-plugin</artifactId>
                 <version>${version.wildfly.swarm}</version>
                 <executions>
                     <execution>
@@ -52,7 +52,7 @@ From your IDE run the `org.wildfly.swarm.Swarm` class
     
 From your shell/prompt console just enter the following command
     
-    mvn wildfly-swarm:run
+    mvn thorntail:run
    
 
 ## Testing with curl
diff --git a/jaxrs/jaxrs-deltaspike-data/pom.xml b/jaxrs/jaxrs-deltaspike-data/pom.xml
index a0ce3a0e1..246641ec4 100644
--- a/jaxrs/jaxrs-deltaspike-data/pom.xml
+++ b/jaxrs/jaxrs-deltaspike-data/pom.xml
@@ -5,17 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-deltaspike-data</artifactId>
   <packaging>war</packaging>
 
-  <name>WildFly Swarm Examples: JAX-RS and Deltaspike Data</name>
-  <description>WildFly Swarm Examples: JAX-RS and Deltaspike Data</description>
+  <name>Thorntail Examples: JAX-RS and Deltaspike Data</name>
+  <description>Thorntail Examples: JAX-RS and Deltaspike Data</description>
 
   <properties>
     <deltaspike.version>1.7.1</deltaspike.version>
@@ -46,8 +46,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <goals>
@@ -68,21 +68,21 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
 
-    <!-- Wildfly Swarm Fractions -->
+    <!-- Thorntail Fractions -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
     </dependency>
 
diff --git a/jaxrs/jaxrs-https/pom.xml b/jaxrs/jaxrs-https/pom.xml
index f0e4c6eb4..6168a9f4e 100644
--- a/jaxrs/jaxrs-https/pom.xml
+++ b/jaxrs/jaxrs-https/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-https</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS over HTTPS</name>
-  <description>WildFly Swarm Examples: JAX-RS over HTTPS</description>
+  <name>Thorntail Examples: JAX-RS over HTTPS</name>
+  <description>Thorntail Examples: JAX-RS over HTTPS</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,15 +44,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>management</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/jaxrs/README.md b/jaxrs/jaxrs/README.md
index 1c09114ac..eefb98d56 100644
--- a/jaxrs/jaxrs/README.md
+++ b/jaxrs/jaxrs/README.md
@@ -4,7 +4,7 @@ This example takes a normal JAX-RS build, and wraps it into
 a `-swarm` runnable jar with `swagger` enabled on the resources.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,10 +29,10 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -42,17 +42,17 @@ project does *not* need to specify those.
 
 Additional application dependencies (in this case `joda-time`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 * mvn package && java -jar ./target/example-jaxrs-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/jaxrs/jaxrs/pom.xml b/jaxrs/jaxrs/pom.xml
index 23007814a..9b93c9639 100644
--- a/jaxrs/jaxrs/pom.xml
+++ b/jaxrs/jaxrs/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-war</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS</name>
-  <description>WildFly Swarm Examples: JAX-RS</description>
+  <name>Thorntail Examples: JAX-RS</name>
+  <description>Thorntail Examples: JAX-RS</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,11 +44,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/kotlin/README.adoc b/jaxrs/kotlin/README.adoc
index ce289f59a..b43664ef5 100644
--- a/jaxrs/kotlin/README.adoc
+++ b/jaxrs/kotlin/README.adoc
@@ -27,7 +27,7 @@ create the runnable `.jar`.
 As with the other examples, this one inherits a few standard executions
 from the parent `pom.xml`, particularly the `package` execution.
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
 [source,xml]
 ----
diff --git a/jaxrs/kotlin/pom.xml b/jaxrs/kotlin/pom.xml
index 33ee39475..f7622c59c 100644
--- a/jaxrs/kotlin/pom.xml
+++ b/jaxrs/kotlin/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-kotlin</artifactId>
 
-  <name>WildFly Swarm Examples: Kotlin</name>
+  <name>Thorntail Examples: Kotlin</name>
 
   <packaging>war</packaging>
 
@@ -28,9 +28,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
-        <version>${version.wildfly-swarm}</version>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
+        <version>${version.thorntail}</version>
         <executions>
           <execution>
             <goals>
@@ -62,11 +62,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 210fd1ead..43b170866 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-jaxrs</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS parent</name>
-  <description>WildFly Swarm Examples: JAX-RS parent</description>
+  <name>Thorntail Examples: JAX-RS parent</name>
+  <description>Thorntail Examples: JAX-RS parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/jaxrs/scala/README.adoc b/jaxrs/scala/README.adoc
index e2fc008d2..af050c7e5 100644
--- a/jaxrs/scala/README.adoc
+++ b/jaxrs/scala/README.adoc
@@ -27,7 +27,7 @@ create the runnable `.jar`.
 As with the other examples, this one inherits a few standard executions
 from the parent `pom.xml`, particularly the `package` execution.
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
 [source,xml]
 ----
diff --git a/jaxrs/scala/pom.xml b/jaxrs/scala/pom.xml
index 3b6a9714c..faaae2481 100644
--- a/jaxrs/scala/pom.xml
+++ b/jaxrs/scala/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-scala</artifactId>
 
-  <name>WildFly Swarm Examples: Scala</name>
+  <name>Thorntail Examples: Scala</name>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
-        <version>${version.wildfly-swarm}</version>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
+        <version>${version.thorntail}</version>
         <executions>
           <execution>
             <goals>
@@ -53,11 +53,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/swagger/README.adoc b/jaxrs/swagger/README.adoc
index b184f581d..07972b089 100644
--- a/jaxrs/swagger/README.adoc
+++ b/jaxrs/swagger/README.adoc
@@ -40,7 +40,7 @@ create the runnable `.jar`.
 </plugin>
 ----
 
-To define the needed parts of WildFly Swarm, dependencies are added
+To define the needed parts of Thorntail, dependencies are added
 
 [source,xml]
 ----
diff --git a/jaxrs/swagger/pom.xml b/jaxrs/swagger/pom.xml
index 95dd5217c..2d47e635f 100644
--- a/jaxrs/swagger/pom.xml
+++ b/jaxrs/swagger/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxrs-swagger</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS swagger</name>
-  <description>WildFly Swarm Examples: JAX-RS swagger</description>
+  <name>Thorntail Examples: JAX-RS swagger</name>
+  <description>Thorntail Examples: JAX-RS swagger</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,19 +44,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>swagger</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>logging</artifactId>
     </dependency>
     <dependency>
diff --git a/jaxrs/zipkin/README.md b/jaxrs/zipkin/README.md
index 3e7c9131d..1c3225f12 100644
--- a/jaxrs/zipkin/README.md
+++ b/jaxrs/zipkin/README.md
@@ -1,4 +1,4 @@
-# Wildfly Swarm Zipkin JAX-RS Fraction Example
+# Thorntail Zipkin JAX-RS Fraction Example
 
 Swarm JAX-RS application instrumented with Zipkin.
 
diff --git a/jaxrs/zipkin/pom.xml b/jaxrs/zipkin/pom.xml
index 5ae702e6c..e9a92e921 100644
--- a/jaxrs/zipkin/pom.xml
+++ b/jaxrs/zipkin/pom.xml
@@ -5,15 +5,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jaxrs</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>examples-zipkin-jaxrs</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-RS with Zipkin tracing</name>
-  <description>WildFly Swarm Examples: JAX-RS with Zipkin tracing</description>
+  <name>Thorntail Examples: JAX-RS with Zipkin tracing</name>
+  <description>Thorntail Examples: JAX-RS with Zipkin tracing</description>
 
   <packaging>war</packaging>
 
@@ -25,9 +25,9 @@
       <version>7.0</version>
       <scope>provided</scope>
     </dependency>
-    <!-- WildFly Swarm Fractions -->
+    <!-- Thorntail Fractions -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>zipkin-jaxrs</artifactId>
     </dependency>
   </dependencies>
@@ -35,8 +35,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
diff --git a/jaxrs/zipkin/src/main/java/org/wildfly/swarm/examples/zipkin/HelloEndpoint.java b/jaxrs/zipkin/src/main/java/org/wildfly/swarm/examples/zipkin/HelloEndpoint.java
index 23dcdedb5..4d4855a8f 100644
--- a/jaxrs/zipkin/src/main/java/org/wildfly/swarm/examples/zipkin/HelloEndpoint.java
+++ b/jaxrs/zipkin/src/main/java/org/wildfly/swarm/examples/zipkin/HelloEndpoint.java
@@ -14,6 +14,6 @@ public class HelloEndpoint {
     @GET
     @Produces("text/plain")
     public Response doGet() {
-        return Response.ok("Hello from WildFly Swarm!").build();
+        return Response.ok("Hello from Thorntail!").build();
     }
 }
diff --git a/jaxws/README.md b/jaxws/README.md
index 634409075..99b37f9fe 100644
--- a/jaxws/README.md
+++ b/jaxws/README.md
@@ -6,7 +6,7 @@ a `-swarm` runnable jar.
 It is originally from [wildfly-quickstart helloworld-ws](https://github.com/wildfly/quickstart/tree/10.x/helloworld-ws).
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -17,13 +17,13 @@ of `war` in the `pom.xml`
 <packaging>war</packaging>
 ```
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
 ``` xml
 <plugin>
-  <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-plugin</artifactId>
+  <groupid>io.thorntail</groupId>
+  <artifactId>thorntail-maven-plugin</artifactId>
   <version>${version.wildfly-swarm}</version>
   <executions>
     <execution>
@@ -35,11 +35,11 @@ create the runnable `.jar`.
 </plugin>
 ```
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
 ``` xml
 <dependency>
-  <groupId>org.wildfly.swarm</groupId>
+  <groupid>io.thorntail</groupId>
   <artifactId>webservices</artifactId>
   <version>${version.wildfly-swarm}</version>
 </dependency>
@@ -51,12 +51,12 @@ project does *not* need to specify those.
 ## Run
 
 * mvn package && java -jar ./target/example-jaxws-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/jaxws/pom.xml b/jaxws/pom.xml
index e40c8aff2..27f9fc9d8 100644
--- a/jaxws/pom.xml
+++ b/jaxws/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaxws</artifactId>
 
-  <name>WildFly Swarm Examples: JAX-WS</name>
-  <description>WildFly Swarm Examples: JAX-WS</description>
+  <name>Thorntail Examples: JAX-WS</name>
+  <description>Thorntail Examples: JAX-WS</description>
 
   <packaging>war</packaging>
 
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -51,7 +51,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
   </dependencies>
diff --git a/jaxws/src/main/webapp/index.html b/jaxws/src/main/webapp/index.html
index 27282afbb..e2b008276 100644
--- a/jaxws/src/main/webapp/index.html
+++ b/jaxws/src/main/webapp/index.html
@@ -14,11 +14,11 @@
     limitations under the License.
 -->
 <html>
-<head><title>jboss-helloworld-ws Quickstart with WildFly Swarm</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+<head><title>jboss-helloworld-ws Quickstart with Thorntail</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
 <body>
 
-<h1>helloworld-ws Quickstart with WildFly Swarm</h1>
+<h1>helloworld-ws Quickstart with Thorntail</h1>
 
 <p>
   The <i>helloworld-ws</i> quickstart demonstrates the use of <b>JAX-WS</b> in
diff --git a/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/README.md b/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/README.md
index 2732d30b5..8d4ba597c 100644
--- a/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/README.md
+++ b/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/README.md
@@ -4,7 +4,7 @@ This example takes a normal JPA, JTA (transaction), CDI, JAX-RS build, and wraps
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -12,12 +12,12 @@ This project is a normal maven project with `war` packaging.
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupid>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -31,7 +31,7 @@ create the runnable `.jar`.
         </executions>
       </plugin>
       
-To define the needed parts of WildFly Swarm, a few dependencies are added
+To define the needed parts of Thorntail, a few dependencies are added
 
     <dependency>
       <groupId>org.jboss.spec.javax.ws.rs</groupId>
@@ -76,7 +76,7 @@ The `org.jboss.logging:jboss-logging` provides JBoss Logging required by observe
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jpa-jaxrs-cdi-jta-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/pom.xml b/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/pom.xml
index e61c1ed4e..8c23f5666 100644
--- a/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/pom.xml
+++ b/jpa-jaxrs-cdi/jpa-jaxrs-cdi-jta/pom.xml
@@ -10,23 +10,23 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>examples-jpa-jaxrs-cdi-parent</artifactId>
-    <groupId>org.wildfly.swarm.examples</groupId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <groupId>io.thorntail.examples</groupId>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jpa-jaxrs-cdi-jta</artifactId>
 
-  <name>WildFly Swarm Examples: JPA + JAX-RS + CDI + JTA</name>
-  <description>WildFly Swarm Examples: JPA + JAX-RS + CDI + JTA</description>
+  <name>Thorntail Examples: JPA + JAX-RS + CDI + JTA</name>
+  <description>Thorntail Examples: JPA + JAX-RS + CDI + JTA</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jpa-jaxrs-cdi/jpa-jaxrs-cdi/README.md b/jpa-jaxrs-cdi/jpa-jaxrs-cdi/README.md
index 44776b3f9..27acb0e33 100644
--- a/jpa-jaxrs-cdi/jpa-jaxrs-cdi/README.md
+++ b/jpa-jaxrs-cdi/jpa-jaxrs-cdi/README.md
@@ -4,7 +4,7 @@ This example takes a normal JPA, CDI and JAX-RS build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -12,12 +12,12 @@ This project is a normal maven project with `war` packaging.
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -28,7 +28,7 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-We let the plugin define the parts of WildFly Swarm that we need based on the
+We let the plugin define the parts of Thorntail that we need based on the
 APIs our code uses, so we don't need to define any dependencies explicitly.
 
 ## Run
@@ -36,7 +36,7 @@ APIs our code uses, so we don't need to define any dependencies explicitly.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jpa-jaxrs-cdi-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/jpa-jaxrs-cdi/jpa-jaxrs-cdi/pom.xml b/jpa-jaxrs-cdi/jpa-jaxrs-cdi/pom.xml
index ee7392560..db480854b 100644
--- a/jpa-jaxrs-cdi/jpa-jaxrs-cdi/pom.xml
+++ b/jpa-jaxrs-cdi/jpa-jaxrs-cdi/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jpa-jaxrs-cdi-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jpa-jaxrs-cdi</artifactId>
 
-  <name>WildFly Swarm Examples: JPA + JAX-RS + CDI</name>
-  <description>WildFly Swarm Examples: JPA + JAX-RS + CDI</description>
+  <name>Thorntail Examples: JPA + JAX-RS + CDI</name>
+  <description>Thorntail Examples: JPA + JAX-RS + CDI</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jpa-jaxrs-cdi/pom.xml b/jpa-jaxrs-cdi/pom.xml
index caaf41a80..8b6e5ad37 100644
--- a/jpa-jaxrs-cdi/pom.xml
+++ b/jpa-jaxrs-cdi/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-jpa-jaxrs-cdi-parent</artifactId>
 
-  <name>WildFly Swarm Examples: JPA + JAX-RS + CDI parent</name>
-  <description>WildFly Swarm Examples: JPA + JAX-RS + CDI parent</description>
+  <name>Thorntail Examples: JPA + JAX-RS + CDI parent</name>
+  <description>Thorntail Examples: JPA + JAX-RS + CDI parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/jpa/jpa-eclipselink/README.md b/jpa/jpa-eclipselink/README.md
index ddc0dbc50..d68dcb012 100644
--- a/jpa/jpa-eclipselink/README.md
+++ b/jpa/jpa-eclipselink/README.md
@@ -4,7 +4,7 @@ This example takes a normal JPA and Servlet build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -12,12 +12,12 @@ This project is a traditional JPA project with `war` packaging.
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -28,15 +28,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a few dependencies are added
+To define the needed parts of Thorntail, a few dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jpa-eclipselink</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>undertow</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -49,7 +49,7 @@ APIs.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jpa-eclipselink-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 ## Use
diff --git a/jpa/jpa-eclipselink/pom.xml b/jpa/jpa-eclipselink/pom.xml
index 6d5c5ed2b..7f8079a27 100644
--- a/jpa/jpa-eclipselink/pom.xml
+++ b/jpa/jpa-eclipselink/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jpa</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jpa-eclipselink</artifactId>
 
-  <name>WildFly Swarm Examples: JPA via EclipseLink .war</name>
-  <description>WildFly Swarm Examples: JPA via EclipseLink .war</description>
+  <name>Thorntail Examples: JPA via EclipseLink .war</name>
+  <description>Thorntail Examples: JPA via EclipseLink .war</description>
 
   <packaging>war</packaging>
   <build>
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -51,7 +51,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
@@ -66,11 +66,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa-eclipselink</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>undertow</artifactId>
     </dependency>
   </dependencies>
diff --git a/jpa/jpa/README.md b/jpa/jpa/README.md
index 619cae40a..274559148 100644
--- a/jpa/jpa/README.md
+++ b/jpa/jpa/README.md
@@ -4,7 +4,7 @@ This example takes a normal JPA and Servlet build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -12,12 +12,12 @@ This project is a traditional JPA project with `war` packaging.
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -28,15 +28,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a few dependencies are added
+To define the needed parts of Thorntail, a few dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jpa</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>undertow</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -49,7 +49,7 @@ APIs.
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jpa-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 ## Use
diff --git a/jpa/jpa/pom.xml b/jpa/jpa/pom.xml
index aede06868..184a92543 100644
--- a/jpa/jpa/pom.xml
+++ b/jpa/jpa/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-jpa</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jpa</artifactId>
 
-  <name>WildFly Swarm Examples: JPA</name>
-  <description>WildFly Swarm Examples: JPA</description>
+  <name>Thorntail Examples: JPA</name>
+  <description>Thorntail Examples: JPA</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 8f2ceca94..f93ad0391 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-jpa</artifactId>
 
-  <name>WildFly Swarm Examples: JPA parent</name>
-  <description>WildFly Swarm Examples: JPA parent</description>
+  <name>Thorntail Examples: JPA parent</name>
+  <description>Thorntail Examples: JPA parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/jsf/README.md b/jsf/README.md
index 37e447ce3..a53aaee5e 100644
--- a/jsf/README.md
+++ b/jsf/README.md
@@ -4,7 +4,7 @@ This example takes a normal JSF build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,13 +13,13 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
 ``` xml
 <plugin>
-  <groupId>org.wildfly.swarm</groupId>
-  <artifactId>wildfly-swarm-plugin</artifactId>
+  <groupid>io.thorntail</groupId>
+  <artifactId>thorntail-maven-plugin</artifactId>
   <version>${version.wildfly-swarm}</version>
   <executions>
     <execution>
@@ -31,16 +31,16 @@ create the runnable `.jar`.
 </plugin>
 ```
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
 ``` xml
 <dependency>
-  <groupId>org.wildfly.swarm</groupId>
+  <groupid>io.thorntail</groupId>
   <artifactId>jsf</artifactId>
   <version>${version.wildfly-swarm}</version>
 </dependency>
 <dependency>
-  <groupId>org.wildfly.swarm</groupId>
+  <groupid>io.thorntail</groupId>
   <artifactId>cdi</artifactId>
   <version>${version.wildfly-swarm}</version>
 </dependency>
@@ -52,12 +52,12 @@ project does *not* need to specify those.
 ## Run
 
 * mvn package && java -jar ./target/example-jsf-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
@@ -68,15 +68,15 @@ $ curl localhost:8080/index.xhtml
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"><head id="j_idt2">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>WildFly Swarm Facelet</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>
+    <title>Thorntail Facelet</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>
 
-    <div id="top"><h1>WildFly Swarm Facelet</h1>
+    <div id="top"><h1>Thorntail Facelet</h1>
     </div>
 
     <div id="content">Hello from JSF
     </div>
 
-    <div id="bottom">Powered by WildFly Swarm
+    <div id="bottom">Powered by Thorntail
     </div></body>
 
 </html>%
diff --git a/jsf/pom.xml b/jsf/pom.xml
index 1c61e3254..9df0160d7 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jsf</artifactId>
 
-  <name>WildFly Swarm Examples: JSF</name>
-  <description>WildFly Swarm Examples: JSF</description>
+  <name>Thorntail Examples: JSF</name>
+  <description>Thorntail Examples: JSF</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <fractions>
             <fraction>jsf</fraction>
@@ -49,7 +49,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/jsf/src/it/java/org/wildfly/swarm/it/jsf/JSFApplicationIT.java b/jsf/src/it/java/org/wildfly/swarm/it/jsf/JSFApplicationIT.java
index fb21f77e1..c55de4de3 100644
--- a/jsf/src/it/java/org/wildfly/swarm/it/jsf/JSFApplicationIT.java
+++ b/jsf/src/it/java/org/wildfly/swarm/it/jsf/JSFApplicationIT.java
@@ -21,8 +21,8 @@ public class JSFApplicationIT extends AbstractIntegrationTest {
     @Test
     public void testIt() {
         browser.navigate().to("http://localhost:8080/");
-        assertThat(browser.getPageSource()).contains("WildFly Swarm Facelet");
+        assertThat(browser.getPageSource()).contains("Thorntail Facelet");
         assertThat(browser.getPageSource()).contains("Hello from JSF");
-        assertThat(browser.getPageSource()).contains("Powered by WildFly Swarm");
+        assertThat(browser.getPageSource()).contains("Powered by Thorntail");
     }
 }
diff --git a/jsf/src/main/webapp/WEB-INF/template.xhtml b/jsf/src/main/webapp/WEB-INF/template.xhtml
index 186b838a8..c07e8bf2c 100644
--- a/jsf/src/main/webapp/WEB-INF/template.xhtml
+++ b/jsf/src/main/webapp/WEB-INF/template.xhtml
@@ -6,13 +6,13 @@
 
 <h:head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>WildFly Swarm Facelet</title>
+    <title>Thorntail Facelet</title>
 </h:head>
 
 <h:body>
 
     <div id="top">
-        <ui:insert name="top"><h1>WildFly Swarm Facelet</h1></ui:insert>
+        <ui:insert name="top"><h1>Thorntail Facelet</h1></ui:insert>
     </div>
 
     <div id="content">
@@ -20,7 +20,7 @@
     </div>
 
     <div id="bottom">
-        <ui:insert name="bottom">Powered by WildFly Swarm</ui:insert>
+        <ui:insert name="bottom">Powered by Thorntail</ui:insert>
     </div>
 
 </h:body>
diff --git a/kitchensink-html5-mobile/README.md b/kitchensink-html5-mobile/README.md
index c9c39858a..6bbd6f487 100644
--- a/kitchensink-html5-mobile/README.md
+++ b/kitchensink-html5-mobile/README.md
@@ -4,7 +4,7 @@ This example takes the [kitchensick-html5-mobile](https://github.com/wildfly/qui
 quickstart from WildFly, and wraps it into a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,25 +29,25 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>jaxrs-weld</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>ejb</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupid>io.thorntail</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -57,19 +57,19 @@ project does *not* need to specify those.
 
 Additional application dependencies can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/wildfly-swarm-example-kitchensink-html5-mobile-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/kitchensink-html5-mobile/pom.xml b/kitchensink-html5-mobile/pom.xml
index 892ce5757..55b8b182c 100644
--- a/kitchensink-html5-mobile/pom.xml
+++ b/kitchensink-html5-mobile/pom.xml
@@ -9,14 +9,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
     <version>1.0.0.Alpha7-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-kitchensink-html5-mobile</artifactId>
-  <name>WildFly Swarm Examples: Kitchensink HTML5/Mobile</name>
+  <name>Thorntail Examples: Kitchensink HTML5/Mobile</name>
   <description> Java EE HTML5 mobile web application for use on WildFly, that was converted from the WildFly Quickstart</description>
 
   <packaging>war</packaging>
@@ -49,32 +49,32 @@
     <!-- Import the JAX-RS API -->
     <!-- Import the Servlet API -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs-cdi</artifactId>
-      <version>${version.wildfly-swarm}</version>
+      <version>${version.thorntail}</version>
     </dependency>
 
     <!-- Import the JPA API -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
-      <version>${version.wildfly-swarm}</version>
+      <version>${version.thorntail}</version>
     </dependency>
 
     <!-- Import the EJB API -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ejb</artifactId>
-      <version>${version.wildfly-swarm}</version>
+      <version>${version.thorntail}</version>
     </dependency>
 
     <!-- JSR-303 (Bean Validation) Implementation -->
     <!-- Provides portable constraints such as @Email -->
     <!-- Import the Hibernate Validator API -->
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>${version.wildfly-swarm}</version>
+      <version>${version.thorntail}</version>
     </dependency>
 
   </dependencies>
@@ -90,8 +90,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <goals>
diff --git a/logstash/README.md b/logstash/README.md
index 2c2ffdc14..916505907 100644
--- a/logstash/README.md
+++ b/logstash/README.md
@@ -3,7 +3,7 @@
 This example sends log messages to Logstash.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Start Logstash
 
diff --git a/logstash/pom.xml b/logstash/pom.xml
index 1d9b881b1..a57747445 100644
--- a/logstash/pom.xml
+++ b/logstash/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-logstash</artifactId>
 
-  <name>WildFly Swarm Examples: Logstash</name>
-  <description>WildFly Swarm Examples: Logstash</description>
+  <name>Thorntail Examples: Logstash</name>
+  <description>Thorntail Examples: Logstash</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -38,11 +38,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>logstash</artifactId>
     </dependency>
   </dependencies>
diff --git a/management-console/README.md b/management-console/README.md
index 5fd65603d..3c31aeae9 100644
--- a/management-console/README.md
+++ b/management-console/README.md
@@ -1,7 +1,7 @@
 # Management Console
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -9,12 +9,12 @@ The project is a normal maven project with `jar` packaging, not `war`.
 
     <packaging>jar</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -25,15 +25,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, some dependencies are added
+To define the needed parts of Thorntail, some dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>management-console</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>management</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
diff --git a/management-console/pom.xml b/management-console/pom.xml
index c1d0feb22..208a8ec74 100644
--- a/management-console/pom.xml
+++ b/management-console/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -13,8 +13,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -27,15 +27,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>management-console</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
   </dependencies>
diff --git a/messaging/messaging-clustering/README.md b/messaging/messaging-clustering/README.md
index 84fa51b32..368897b52 100644
--- a/messaging/messaging-clustering/README.md
+++ b/messaging/messaging-clustering/README.md
@@ -1,7 +1,7 @@
 # Messaging & Clustering
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -9,12 +9,12 @@ The project is a normal maven project with `jar` packaging, not `war`.
 
     <packaging>jar</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <configuration>
         <mainClass>org.wildfly.swarm.examples.messaging.clustering.Main</mainClass>
@@ -28,20 +28,20 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, some dependencies are added
+To define the needed parts of Thorntail, some dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jaxrs</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>messaging</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>msc</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
diff --git a/messaging/messaging-clustering/pom.xml b/messaging/messaging-clustering/pom.xml
index 5fb1c259c..3f0fb1d83 100644
--- a/messaging/messaging-clustering/pom.xml
+++ b/messaging/messaging-clustering/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-messaging</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-messaging-clustering</artifactId>
 
-  <name>WildFly Swarm Examples: Messaging (Clustering)</name>
-  <description>WildFly Swarm Examples: Messaging (Clustering)</description>
+  <name>Thorntail Examples: Messaging (Clustering)</name>
+  <description>Thorntail Examples: Messaging (Clustering)</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
@@ -50,19 +50,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ejb</artifactId>
     </dependency>
   </dependencies>
diff --git a/messaging/messaging-mdb/README.adoc b/messaging/messaging-mdb/README.adoc
index 5951948b8..d58cc7658 100644
--- a/messaging/messaging-mdb/README.adoc
+++ b/messaging/messaging-mdb/README.adoc
@@ -40,7 +40,7 @@ create the runnable `.jar`.
 </plugin>
 ----
 
-To define the required parts of WildFly Swarm, some dependencies are added
+To define the required parts of Thorntail, some dependencies are added
 
 [source,xml]
 ----
diff --git a/messaging/messaging-mdb/pom.xml b/messaging/messaging-mdb/pom.xml
index af5ce8a16..75feb79b6 100644
--- a/messaging/messaging-mdb/pom.xml
+++ b/messaging/messaging-mdb/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-messaging</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-messaging-mdb</artifactId>
 
-  <name>WildFly Swarm Examples: Messaging MDB</name>
-  <description>WildFly Swarm Examples: Messaging MDB</description>
+  <name>Thorntail Examples: Messaging MDB</name>
+  <description>Thorntail Examples: Messaging MDB</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,23 +44,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ejb</artifactId>
     </dependency>
   </dependencies>
diff --git a/messaging/pom.xml b/messaging/pom.xml
index a58a9b095..15eee420c 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-messaging</artifactId>
 
-  <name>WildFly Swarm Examples: Messaging parent</name>
-  <description>WildFly Swarm Examples: Messaging parent</description>
+  <name>Thorntail Examples: Messaging parent</name>
+  <description>Thorntail Examples: Messaging parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/microprofile/README.md b/microprofile/README.md
index bef05b3ae..5144d77e8 100644
--- a/microprofile/README.md
+++ b/microprofile/README.md
@@ -4,7 +4,7 @@ This example takes a normal [MicroProfile](http://microprofile.io) WAR, and wrap
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,10 +29,10 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>microprofile</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -42,12 +42,12 @@ to your application, so the project does *not* need to specify those.
 
 Additional application dependencies (in this case `joda-time`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 * mvn package && java -jar ./target/example-microprofile-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * From your IDE, run class `org.wildfly.swarm.Swarm`
 
 For build and deployment to OpenShift, will deploy to active OpenShift project.
@@ -56,7 +56,7 @@ For build and deployment to OpenShift, will deploy to active OpenShift project.
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/microprofile/pom.xml b/microprofile/pom.xml
index 5af9ff444..fb5d2f503 100644
--- a/microprofile/pom.xml
+++ b/microprofile/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-microprofile</artifactId>
 
-  <name>WildFly Swarm Examples: Microprofile</name>
-  <description>WildFly Swarm Examples: Microprofile</description>
+  <name>Thorntail Examples: Microprofile</name>
+  <description>Thorntail Examples: Microprofile</description>
 
   <packaging>war</packaging>
 
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -62,9 +62,9 @@
               <include>wildfly-swarm</include>
             </includes>
             <config>
-              <wildfly-swarm>
+              <thorntail>
                 <from>registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift</from>
-              </wildfly-swarm>
+              </thorntail>
             </config>
           </generator>
         </configuration>
@@ -74,11 +74,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>microprofile</artifactId>
     </dependency>
     <dependency>
diff --git a/opentracing/opentracing-servlet/README.md b/opentracing/opentracing-servlet/README.md
index a626b1607..087ed973c 100644
--- a/opentracing/opentracing-servlet/README.md
+++ b/opentracing/opentracing-servlet/README.md
@@ -5,7 +5,7 @@ capabilities to it. Refer to the README on that example to understand
 the basics of how it works.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -66,7 +66,7 @@ uncomment the Jaeger dependencies.
 You are now ready to run the example and have span data reported to Jaeger:
 
 * mvn package && java -jar ./target/example-opentracing-servlet-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 You may now make HTTP calls to the application, like:
diff --git a/opentracing/opentracing-servlet/pom.xml b/opentracing/opentracing-servlet/pom.xml
index abb18f01b..fb4691d11 100644
--- a/opentracing/opentracing-servlet/pom.xml
+++ b/opentracing/opentracing-servlet/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-opentracing-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-opentracing-servlet</artifactId>
 
-  <name>WildFly Swarm Examples: OpenTracing Servlet</name>
-  <description>WildFly Swarm Examples: OpenTracing Servlet</description>
+  <name>Thorntail Examples: OpenTracing Servlet</name>
+  <description>Thorntail Examples: OpenTracing Servlet</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,11 +44,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>opentracing</artifactId>
     </dependency>
     <dependency>
diff --git a/opentracing/pom.xml b/opentracing/pom.xml
index f91ae13aa..a0172ca43 100644
--- a/opentracing/pom.xml
+++ b/opentracing/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-opentracing-parent</artifactId>
 
-  <name>WildFly Swarm Examples: OpenTracing parent</name>
-  <description>WildFly Swarm Examples: OpenTracing parent</description>
+  <name>Thorntail Examples: OpenTracing parent</name>
+  <description>Thorntail Examples: OpenTracing parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/pom.xml b/pom.xml
index 6cfb72f09..4ef16eea9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.wildfly.swarm.examples</groupId>
+  <groupId>io.thorntail.examples</groupId>
   <artifactId>examples-parent</artifactId>
-  <version>2018.6.0-SNAPSHOT</version>
+  <version>2.0.0.Final-SNAPSHOT</version>
 
-  <name>WildFly Swarm Examples: Parent</name>
-  <description>WildFly Swarm Examples: Parent</description>
+  <name>Thorntail Examples: Parent</name>
+  <description>Thorntail Examples: Parent</description>
 
   <packaging>pom</packaging>
 
   <properties>
-    <version.wildfly-swarm>${project.version}</version.wildfly-swarm>
+    <version.thorntail>${project.version}</version.thorntail>
 
     <maven.min.version>3.2.1</maven.min.version>
 
@@ -89,9 +89,9 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.wildfly.swarm</groupId>
-          <artifactId>wildfly-swarm-plugin</artifactId>
-          <version>${version.wildfly-swarm}</version>
+          <groupId>io.thorntail</groupId>
+          <artifactId>thorntail-maven-plugin</artifactId>
+          <version>${version.thorntail}</version>
           <configuration>
             <jvmArguments>
               <jvmArgument>-Xmx128m</jvmArgument>
@@ -199,7 +199,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>arquillian</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -220,7 +220,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
@@ -241,7 +241,7 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.wildfly.swarm.examples</groupId>
+        <groupId>io.thorntail.examples</groupId>
         <artifactId>examples-base</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>
@@ -292,7 +292,7 @@
     <profile>
       <id>uberjar</id>
       <properties>
-        <wildfly-swarm.useUberJar>true</wildfly-swarm.useUberJar>
+        <thorntail.useUberJar>true</thorntail.useUberJar>
       </properties>
     </profile>
     <profile>
@@ -306,9 +306,9 @@
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>org.wildfly.swarm</groupId>
-              <artifactId>wildfly-swarm-plugin</artifactId>
-              <version>${version.wildfly-swarm}</version>
+              <groupId>io.thorntail</groupId>
+              <artifactId>thorntail-maven-plugin</artifactId>
+              <version>${version.thorntail}</version>
               <executions>
                 <execution>
                   <id>start</id>
diff --git a/resource-adapter/README.adoc b/resource-adapter/README.adoc
index 8018cb2dc..0756564d4 100644
--- a/resource-adapter/README.adoc
+++ b/resource-adapter/README.adoc
@@ -1,7 +1,7 @@
 = Resource Adapter Example
 
 Resource adapters can be configured in two
-different ways within a WildFly Swarm application.
+different ways within a Thorntail application.
 
 The first is through a *deployment*, which is, as you might
 guess, a deployment-time creation of a resource adapter. Through
diff --git a/resource-adapter/pom.xml b/resource-adapter/pom.xml
index 7c0b1ed47..a32f04452 100644
--- a/resource-adapter/pom.xml
+++ b/resource-adapter/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-resource-adapter</artifactId>
 
-  <name>WildFly Swarm Examples: Resource Adapter parent</name>
-  <description>WildFly Swarm Examples: Resource Adapter parent</description>
+  <name>Thorntail Examples: Resource Adapter parent</name>
+  <description>Thorntail Examples: Resource Adapter parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/resource-adapter/resource-adapter-deployment/README.adoc b/resource-adapter/resource-adapter-deployment/README.adoc
index 732ef0240..c492e2a6e 100644
--- a/resource-adapter/resource-adapter-deployment/README.adoc
+++ b/resource-adapter/resource-adapter-deployment/README.adoc
@@ -33,7 +33,7 @@ create the runnable `.jar`.
 As with the other examples, this one inherits a few standard executions
 from the parent `pom.xml`, particularly the `package` execution.
 
-To define the needed parts of WildFly Swarm, a few dependencies are added.
+To define the needed parts of Thorntail, a few dependencies are added.
 To support resource adapters in general, the next dependency is required:
     
 [source,xml]
diff --git a/resource-adapter/resource-adapter-deployment/pom.xml b/resource-adapter/resource-adapter-deployment/pom.xml
index 1377f9369..5003f21e2 100644
--- a/resource-adapter/resource-adapter-deployment/pom.xml
+++ b/resource-adapter/resource-adapter-deployment/pom.xml
@@ -7,24 +7,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-resource-adapter</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-resource-adapter-deployment</artifactId>
 
-  <name>WildFly Swarm Examples: Resource Adapter Deployment</name>
-  <description>WildFly Swarm Examples: Resource Adapter Deployment</description>
+  <name>Thorntail Examples: Resource Adapter Deployment</name>
+  <description>Thorntail Examples: Resource Adapter Deployment</description>
 
   <packaging>jar</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -42,19 +42,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupId>io.thorntail</groupId>
         <artifactId>ejb</artifactId>
       </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>resource-adapters</artifactId>
     </dependency>
         
diff --git a/ribbon-consul/README.md b/ribbon-consul/README.md
index f04616280..dffe63363 100644
--- a/ribbon-consul/README.md
+++ b/ribbon-consul/README.md
@@ -1,7 +1,7 @@
 # Multiple services plus NetFlixOSS Ribbon
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 This example is like the `ribbon` example, but instead of using
 JGroups, it relies upon Hashicorp's Consul service-discovery mechanisms.
diff --git a/ribbon-consul/events/pom.xml b/ribbon-consul/events/pom.xml
index ce563724d..b6a75c08e 100644
--- a/ribbon-consul/events/pom.xml
+++ b/ribbon-consul/events/pom.xml
@@ -9,35 +9,35 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-consul-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-consul-events</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon using Consul: Events</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon using Consul: Events</description>
+  <name>Thorntail Examples: Netflix Ribbon using Consul: Events</name>
+  <description>Thorntail Examples: Netflix Ribbon using Consul: Events</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
diff --git a/ribbon-consul/frontend/pom.xml b/ribbon-consul/frontend/pom.xml
index a84cb819f..0f435f9cd 100644
--- a/ribbon-consul/frontend/pom.xml
+++ b/ribbon-consul/frontend/pom.xml
@@ -9,35 +9,35 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-consul-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-consul-frontend</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon using Consul: Front End</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon using Consul: Front End</description>
+  <name>Thorntail Examples: Netflix Ribbon using Consul: Front End</name>
+  <description>Thorntail Examples: Netflix Ribbon using Consul: Front End</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>topology-webapp</artifactId>
     </dependency>
   </dependencies>
diff --git a/ribbon-consul/frontend/src/main/resources/index.html b/ribbon-consul/frontend/src/main/resources/index.html
index c5c7f1684..0d13c2590 100644
--- a/ribbon-consul/frontend/src/main/resources/index.html
+++ b/ribbon-consul/frontend/src/main/resources/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>WildFly Swarm Ribbon Example</title>
+    <title>Thorntail Ribbon Example</title>
     <link rel="stylesheet" href="/css/app.css"/>
     <script src="/js/phantomjs-shims.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.3/react.js"></script>
diff --git a/ribbon-consul/frontend/src/main/resources/js/app.js b/ribbon-consul/frontend/src/main/resources/js/app.js
index 7c3c6cb4a..03b6d2052 100644
--- a/ribbon-consul/frontend/src/main/resources/js/app.js
+++ b/ribbon-consul/frontend/src/main/resources/js/app.js
@@ -3,7 +3,7 @@ topology().then(function(topo) {
     render: function() {
       return (
           <div>
-            <h1>WildFly Swarm Ribbon Example</h1>
+            <h1>Thorntail Ribbon Example</h1>
             <Topology />
           </div>
       );
diff --git a/ribbon-consul/pom.xml b/ribbon-consul/pom.xml
index 47f8f8c66..6731236b9 100644
--- a/ribbon-consul/pom.xml
+++ b/ribbon-consul/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-ribbon-consul-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon using Consul Parent</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon using Consul Parent</description>
+  <name>Thorntail Examples: Netflix Ribbon using Consul Parent</name>
+  <description>Thorntail Examples: Netflix Ribbon using Consul Parent</description>
 
   <packaging>pom</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
@@ -52,7 +52,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>topology-consul</artifactId>
     </dependency>
   </dependencies>
diff --git a/ribbon-consul/test/pom.xml b/ribbon-consul/test/pom.xml
index b4591d1b5..25f604be5 100644
--- a/ribbon-consul/test/pom.xml
+++ b/ribbon-consul/test/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-consul-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-consul-test</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon using Consul: Multi-service Test </name>
-  <description>WildFly Swarm Examples: Netflix Ribbon using Consul: Multi-service Test</description>
+  <name>Thorntail Examples: Netflix Ribbon using Consul: Multi-service Test </name>
+  <description>Thorntail Examples: Netflix Ribbon using Consul: Multi-service Test</description>
 
   <packaging>pom</packaging>
 
@@ -38,8 +38,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -91,8 +91,8 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.wildfly.swarm</groupId>
-            <artifactId>wildfly-swarm-plugin</artifactId>
+            <groupId>io.thorntail</groupId>
+            <artifactId>thorntail-maven-plugin</artifactId>
             <executions>
               <execution>
                 <id>package</id>
@@ -147,23 +147,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-consul-frontend</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-consul-time</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-consul-events</artifactId>
       <version>${project.version}</version>
       <type>war</type>
diff --git a/ribbon-consul/time/pom.xml b/ribbon-consul/time/pom.xml
index 2b5f0661a..c2a5e6503 100644
--- a/ribbon-consul/time/pom.xml
+++ b/ribbon-consul/time/pom.xml
@@ -9,35 +9,35 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-consul-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-consul-time</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon using Consul: Time</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon using Consul: Time</description>
+  <name>Thorntail Examples: Netflix Ribbon using Consul: Time</name>
+  <description>Thorntail Examples: Netflix Ribbon using Consul: Time</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
diff --git a/ribbon/README.md b/ribbon/README.md
index 4a605c1a9..e3a4c758c 100644
--- a/ribbon/README.md
+++ b/ribbon/README.md
@@ -1,7 +1,7 @@
 # Multiple services plus NetFlixOSS Ribbon
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Services
 
@@ -39,7 +39,7 @@ First, start up the front end, so you can watch the Ribbon topology get updated
 in real time. Open a terminal window.
 
     $ cd frontend
-    $ mvn wildfly-swarm:run
+    $ mvn thorntail:run
 
 Then open a browser to `http://127.0.0.1:8080`. There will be nothing to see there
 yet. Leave this window open and visible while you bring up the two services.
@@ -47,7 +47,7 @@ yet. Leave this window open and visible while you bring up the two services.
 Open another terminal window to build and run the time service:
 
     $ cd time
-    $ mvn -Dswarm.port.offset=1 wildfly-swarm:run
+    $ mvn -Dswarm.port.offset=1 thorntail:run
 
 You should see the Ribbon topology update in the browser as the time service
 comes up. Now, open another terminal window, and run the `time` service again,
@@ -55,13 +55,13 @@ but this time give it a different port number. Notice how the web UI updates
 itself as the service comes up.
 
     $ cd time
-    $ mvn -Dswarm.port.offset=2 wildfly-swarm:run
+    $ mvn -Dswarm.port.offset=2 thorntail:run
 
 Finally, open yet another terminal window and run the events service,
 which consumes the time service(s). Again, note the UI changes.
 
     $ cd events
-    $ mvn -Dswarm.port.offset=3 wildfly-swarm:run
+    $ mvn -Dswarm.port.offset=3 thorntail:run
 
 Now you can kill and restart one or both of the `time` services, and witness the
 UI changes. You can also `GET` time and event service data, and `POST` new events.
diff --git a/ribbon/events/pom.xml b/ribbon/events/pom.xml
index 7515d42a1..a15d7c21e 100644
--- a/ribbon/events/pom.xml
+++ b/ribbon/events/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-events</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon: Events</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon: Events</description>
+  <name>Thorntail Examples: Netflix Ribbon: Events</name>
+  <description>Thorntail Examples: Netflix Ribbon: Events</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -46,11 +46,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
diff --git a/ribbon/frontend/pom.xml b/ribbon/frontend/pom.xml
index 18222cdf2..56b5a0557 100644
--- a/ribbon/frontend/pom.xml
+++ b/ribbon/frontend/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-frontend</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon: Front End</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon: Front End</description>
+  <name>Thorntail Examples: Netflix Ribbon: Front End</name>
+  <description>Thorntail Examples: Netflix Ribbon: Front End</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -46,15 +46,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>topology-webapp</artifactId>
     </dependency>
   </dependencies>
diff --git a/ribbon/frontend/src/main/resources/index.html b/ribbon/frontend/src/main/resources/index.html
index c5c7f1684..0d13c2590 100644
--- a/ribbon/frontend/src/main/resources/index.html
+++ b/ribbon/frontend/src/main/resources/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>WildFly Swarm Ribbon Example</title>
+    <title>Thorntail Ribbon Example</title>
     <link rel="stylesheet" href="/css/app.css"/>
     <script src="/js/phantomjs-shims.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.3/react.js"></script>
diff --git a/ribbon/frontend/src/main/resources/js/app.js b/ribbon/frontend/src/main/resources/js/app.js
index 7c3c6cb4a..03b6d2052 100644
--- a/ribbon/frontend/src/main/resources/js/app.js
+++ b/ribbon/frontend/src/main/resources/js/app.js
@@ -3,7 +3,7 @@ topology().then(function(topo) {
     render: function() {
       return (
           <div>
-            <h1>WildFly Swarm Ribbon Example</h1>
+            <h1>Thorntail Ribbon Example</h1>
             <Topology />
           </div>
       );
diff --git a/ribbon/pom.xml b/ribbon/pom.xml
index 69a3ae756..b3620a948 100644
--- a/ribbon/pom.xml
+++ b/ribbon/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-ribbon-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon Parent</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon Parent</description>
+  <name>Thorntail Examples: Netflix Ribbon Parent</name>
+  <description>Thorntail Examples: Netflix Ribbon Parent</description>
 
   <packaging>pom</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -53,11 +53,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>topology-jgroups</artifactId>
     </dependency>
   </dependencies>
diff --git a/ribbon/test/pom.xml b/ribbon/test/pom.xml
index 69436d21c..6f67c8e0d 100644
--- a/ribbon/test/pom.xml
+++ b/ribbon/test/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-test</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon: Multi-service Test </name>
-  <description>WildFly Swarm Examples: Netflix Ribbon: Multi-service Test</description>
+  <name>Thorntail Examples: Netflix Ribbon: Multi-service Test </name>
+  <description>Thorntail Examples: Netflix Ribbon: Multi-service Test</description>
 
   <packaging>pom</packaging>
 
@@ -49,8 +49,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -109,26 +109,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-frontend</artifactId>
       <version>${project.version}</version>
-      <classifier>swarm</classifier>
+      <classifier>thorntail</classifier>
       <scope>runtime</scope>
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-time</artifactId>
       <version>${project.version}</version>
-      <classifier>swarm</classifier>
+      <classifier>thorntail</classifier>
       <scope>runtime</scope>
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>example-ribbon-events</artifactId>
       <version>${project.version}</version>
-      <classifier>swarm</classifier>
+      <classifier>thorntail</classifier>
       <scope>runtime</scope>
       <type>jar</type>
     </dependency>
diff --git a/ribbon/time/pom.xml b/ribbon/time/pom.xml
index 081f28e7f..20d2ab108 100644
--- a/ribbon/time/pom.xml
+++ b/ribbon/time/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-ribbon-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-ribbon-time</artifactId>
 
-  <name>WildFly Swarm Examples: Netflix Ribbon: Time</name>
-  <description>WildFly Swarm Examples: Netflix Ribbon: Time</description>
+  <name>Thorntail Examples: Netflix Ribbon: Time</name>
+  <description>Thorntail Examples: Netflix Ribbon: Time</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <configuration>
           <properties>
             <swarm.bind.address>127.0.0.1</swarm.bind.address>
@@ -46,11 +46,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ribbon</artifactId>
     </dependency>
     <dependency>
diff --git a/security/jaas/basic/README.md b/security/jaas/basic/README.md
index 3a99b014e..26d7f29a0 100644
--- a/security/jaas/basic/README.md
+++ b/security/jaas/basic/README.md
@@ -8,7 +8,7 @@ with the addition of setting up Java Authentication and Authorization Service(JA
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jaas-basic-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/security/jaas/basic/pom.xml b/security/jaas/basic/pom.xml
index e40fb1f9f..f6b9d2951 100644
--- a/security/jaas/basic/pom.xml
+++ b/security/jaas/basic/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>example-jaas-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>example-jaas-basic</artifactId>
 
-  <name>WildFly Swarm Examples: Security JAAS Basic</name>
-  <description>WildFly Swarm Examples: Security JAAS Basic</description>
+  <name>Thorntail Examples: Security JAAS Basic</name>
+  <description>Thorntail Examples: Security JAAS Basic</description>
 
   <packaging>war</packaging>
 
@@ -28,8 +28,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -47,19 +47,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
diff --git a/security/jaas/form/README.md b/security/jaas/form/README.md
index 6bfbb459d..1b1be32b9 100644
--- a/security/jaas/form/README.md
+++ b/security/jaas/form/README.md
@@ -8,7 +8,7 @@ with the addition of setting up Java Authentication and Authorization Service(JA
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-jaas-form-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
diff --git a/security/jaas/form/pom.xml b/security/jaas/form/pom.xml
index f8b80d3e4..a3df4b2c2 100644
--- a/security/jaas/form/pom.xml
+++ b/security/jaas/form/pom.xml
@@ -9,23 +9,23 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>example-jaas-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>example-jaas-form</artifactId>
 
-  <name>WildFly Swarm Examples: Security JAAS Form</name>
-  <description>WildFly Swarm Examples: Security JAAS Form</description>
+  <name>Thorntail Examples: Security JAAS Form</name>
+  <description>Thorntail Examples: Security JAAS Form</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -43,19 +43,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>undertow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
diff --git a/security/jaas/pom.xml b/security/jaas/pom.xml
index 73b528d35..1ffbf7a3e 100644
--- a/security/jaas/pom.xml
+++ b/security/jaas/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-security</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-jaas-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Security JAAS parent</name>
-  <description>WildFly Swarm Examples: Security JAAS</description>
+  <name>Thorntail Examples: Security JAAS parent</name>
+  <description>Thorntail Examples: Security JAAS</description>
 
   <packaging>pom</packaging>
 
diff --git a/security/keycloak-multitenancy/pom.xml b/security/keycloak-multitenancy/pom.xml
index b0d980e27..81f0a845b 100644
--- a/security/keycloak-multitenancy/pom.xml
+++ b/security/keycloak-multitenancy/pom.xml
@@ -9,15 +9,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-security</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>example-keycloak-multitenancy</artifactId>
 
-  <name>WildFly Swarm Examples: Keycloak Multitenancy</name>
-  <description>WildFly Swarm Examples: Multitenancy</description>
+  <name>Thorntail Examples: Keycloak Multitenancy</name>
+  <description>Thorntail Examples: Multitenancy</description>
 
   <packaging>war</packaging>
 
@@ -28,8 +28,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -41,15 +41,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>keycloak</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>microprofile-health</artifactId>
     </dependency>
     <dependency>
diff --git a/security/keycloak/README.md b/security/keycloak/README.md
index 1b63a6637..b1ab5b8a7 100644
--- a/security/keycloak/README.md
+++ b/security/keycloak/README.md
@@ -3,7 +3,7 @@
 Simple JAX-RS application with Keycloak example.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 This example shows how the command-line and browser clients can access a JAX-RS service
 secured by Keycloak.
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index 87362dd9f..1c762deef 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -9,23 +9,23 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-security</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
   </parent>
 
   <artifactId>example-keycloak</artifactId>
 
-  <name>WildFly Swarm Examples: Keycloak</name>
-  <description>WildFly Swarm Examples: Keycloak</description>
+  <name>Thorntail Examples: Keycloak</name>
+  <description>Thorntail Examples: Keycloak</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>keycloak</artifactId>
     </dependency>
   </dependencies>
diff --git a/security/keycloak/src/main/resources/index.html b/security/keycloak/src/main/resources/index.html
index 0a338b5a4..b588c324c 100644
--- a/security/keycloak/src/main/resources/index.html
+++ b/security/keycloak/src/main/resources/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>WildFly Swarm Keycloak Example</title>
+    <title>Thorntail Keycloak Example</title>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.3/react.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.3/react-dom.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.23/browser.min.js"></script>
diff --git a/security/keycloak/src/main/resources/js/app.js b/security/keycloak/src/main/resources/js/app.js
index 5a9941819..42e03b7c4 100644
--- a/security/keycloak/src/main/resources/js/app.js
+++ b/security/keycloak/src/main/resources/js/app.js
@@ -15,7 +15,7 @@ var App = React.createClass({
   render: function() {
     return (
         <div>
-          <h1>WildFly Swarm Keycloak Example</h1>
+          <h1>Thorntail Keycloak Example</h1>
           <Auth keycloak={this.props.keycloak}/>
           <Secured keycloak={this.props.keycloak}/>
         </div>
diff --git a/security/pom.xml b/security/pom.xml
index 8ccc3c2f2..f2f86144a 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-security</artifactId>
 
-  <name>WildFly Swarm Examples: Security parent</name>
-  <description>WildFly Swarm Examples: Security parent</description>
+  <name>Thorntail Examples: Security parent</name>
+  <description>Thorntail Examples: Security parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/servlet/pom.xml b/servlet/pom.xml
index 53ceca339..e91cb0af6 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-servlet-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Servlet parent</name>
-  <description>WildFly Swarm Examples: Servlet parent</description>
+  <name>Thorntail Examples: Servlet parent</name>
+  <description>Thorntail Examples: Servlet parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/servlet/servlet-cdi/README.md b/servlet/servlet-cdi/README.md
index 61969c17a..9227bd9b0 100644
--- a/servlet/servlet-cdi/README.md
+++ b/servlet/servlet-cdi/README.md
@@ -4,7 +4,7 @@ This example takes a normal Servlet and CDI build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,15 +29,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>undertow</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>weld</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -47,19 +47,19 @@ project does *not* need to specify those.
 
 Additional application dependencies can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-servlet-cdi-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/servlet/servlet-cdi/pom.xml b/servlet/servlet-cdi/pom.xml
index 5acc6d128..4f11a72d9 100644
--- a/servlet/servlet-cdi/pom.xml
+++ b/servlet/servlet-cdi/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-servlet-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-servlet-cdi</artifactId>
 
-  <name>WildFly Swarm Examples: Servlet with CDI</name>
-  <description>WildFly Swarm Examples: Servlet with CDI</description>
+  <name>Thorntail Examples: Servlet with CDI</name>
+  <description>Thorntail Examples: Servlet with CDI</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/servlet/servlet/README.md b/servlet/servlet/README.md
index 2abc023fd..5696f0a3c 100644
--- a/servlet/servlet/README.md
+++ b/servlet/servlet/README.md
@@ -4,7 +4,7 @@ This example takes a normal servlet build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,10 +29,10 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>undertow</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -42,19 +42,19 @@ project does *not* need to specify those.
 
 Additional application dependencies (in this case `joda-time`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-servlet-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/servlet/servlet/pom.xml b/servlet/servlet/pom.xml
index b543946ab..75ced064c 100644
--- a/servlet/servlet/pom.xml
+++ b/servlet/servlet/pom.xml
@@ -9,24 +9,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-servlet-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-servlet</artifactId>
 
-  <name>WildFly Swarm Examples: Servlet</name>
-  <description>WildFly Swarm Examples: Servlet</description>
+  <name>Thorntail Examples: Servlet</name>
+  <description>Thorntail Examples: Servlet</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/spring/pom.xml b/spring/pom.xml
index b4ff37f9d..7975e36a1 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -4,16 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-spring</artifactId>
 
-  <name>WildFly Swarm Examples: Spring parent</name>
-  <description>WildFly Swarm Examples: Spring parent</description>
+  <name>Thorntail Examples: Spring parent</name>
+  <description>Thorntail Examples: Spring parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/spring/spring-data/README.md b/spring/spring-data/README.md
index 031b15585..984484e71 100644
--- a/spring/spring-data/README.md
+++ b/spring/spring-data/README.md
@@ -4,7 +4,7 @@ This example takes a normal Spring and Spring Data build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,15 +29,15 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, the following dependencies are added
+To define the needed parts of Thorntail, the following dependencies are added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>spring</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>jpa</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -47,19 +47,19 @@ project does *not* need to specify those, and some extra pieces for Spring.
 
 Additional application dependencies (in this case `spring-data-jpa` and `spring-webmvc`) can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-spring-data-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/spring/spring-data/pom.xml b/spring/spring-data/pom.xml
index 2f50a1a94..c8ba72ac6 100644
--- a/spring/spring-data/pom.xml
+++ b/spring/spring-data/pom.xml
@@ -4,24 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-spring</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-spring-data</artifactId>
 
-  <name>WildFly Swarm Examples: Spring Data</name>
-  <description>WildFly Swarm Examples: Spring Data</description>
+  <name>Thorntail Examples: Spring Data</name>
+  <description>Thorntail Examples: Spring Data</description>
 
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -39,15 +39,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>spring</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jpa</artifactId>
     </dependency>
     <dependency>
diff --git a/static/pom.xml b/static/pom.xml
index 033e69646..e0676baa9 100644
--- a/static/pom.xml
+++ b/static/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-static</artifactId>
 
-  <name>WildFly Swarm Examples: Static parent</name>
-  <description>WildFly Swarm Examples: Static parent</description>
+  <name>Thorntail Examples: Static parent</name>
+  <description>Thorntail Examples: Static parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/static/static-war/README.md b/static/static-war/README.md
index e6b174c5e..58125fb17 100644
--- a/static/static-war/README.md
+++ b/static/static-war/README.md
@@ -4,7 +4,7 @@ This example takes a normal WAR build, and wraps it into
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -29,10 +29,10 @@ create the runnable `.jar`.
       </executions>
     </plugin>
 
-To define the needed parts of WildFly Swarm, a dependency is added
+To define the needed parts of Thorntail, a dependency is added
 
     <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupid>io.thorntail</groupId>
         <artifactId>undertow</artifactId>
         <version>${version.wildfly-swarm}</version>
     </dependency>
@@ -45,12 +45,12 @@ statically from within the `.war`
 You can run it many ways:
 
 * mvn package && java -jar ./target/example-static-war-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/static/static-war/pom.xml b/static/static-war/pom.xml
index 31a1e1134..855e57c88 100644
--- a/static/static-war/pom.xml
+++ b/static/static-war/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-static</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-static-war</artifactId>
 
-  <name>WildFly Swarm Examples: Static Content .war</name>
-  <description>WildFly Swarm Examples: Static Content .war</description>
+  <name>Thorntail Examples: Static Content .war</name>
+  <description>Thorntail Examples: Static Content .war</description>
 
   <packaging>war</packaging>
 
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -59,11 +59,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>undertow</artifactId>
     </dependency>
   </dependencies>
diff --git a/transactions/pom.xml b/transactions/pom.xml
index 6e7ce27a5..a26987d26 100644
--- a/transactions/pom.xml
+++ b/transactions/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>examples-transactions-parent</artifactId>
 
-  <name>WildFly Swarm Examples: Transactions parent</name>
-  <description>WildFly Swarm Examples: Transactions parent</description>
+  <name>Thorntail Examples: Transactions parent</name>
+  <description>Thorntail Examples: Transactions parent</description>
 
   <packaging>pom</packaging>
 
diff --git a/transactions/transactions/README.adoc b/transactions/transactions/README.adoc
index 95993e527..8e4ebaf34 100644
--- a/transactions/transactions/README.adoc
+++ b/transactions/transactions/README.adoc
@@ -37,7 +37,7 @@ create the runnable `.jar`.
 </plugin>
 ----
 
-To define the needed parts of WildFly Swarm, a few dependencies are added
+To define the needed parts of Thorntail, a few dependencies are added
 
 [source,xml]
 ----
diff --git a/transactions/transactions/pom.xml b/transactions/transactions/pom.xml
index 56cf0b506..89e812e44 100644
--- a/transactions/transactions/pom.xml
+++ b/transactions/transactions/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-transactions-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-transactions</artifactId>
 
-  <name>WildFly Swarm Examples: Transactions</name>
-  <description>WildFly Swarm Examples: Transactions</description>
+  <name>Thorntail Examples: Transactions</name>
+  <description>Thorntail Examples: Transactions</description>
 
   <packaging>war</packaging>
 
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -51,7 +51,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/vaadin/README.md b/vaadin/README.md
index 350f8c2fe..3f8ce7bc9 100644
--- a/vaadin/README.md
+++ b/vaadin/README.md
@@ -4,7 +4,7 @@ This example takes a simple Vaadin application with CDI service, and wraps it in
 a `-swarm` runnable jar.
 
 > Please raise any issues found with this example in our JIRA:
-> https://issues.jboss.org/browse/SWARM
+> https://issues.jboss.org/browse/THORN
 
 ## Project `pom.xml`
 
@@ -13,12 +13,12 @@ of `war` in the `pom.xml`
 
     <packaging>war</packaging>
 
-The project adds a `<plugin>` to configure `wildfly-swarm-plugin` to
+The project adds a `<plugin>` to configure `thorntail-maven-plugin` to
 create the runnable `.jar`.
 
     <plugin>
-      <groupId>org.wildfly.swarm</groupId>
-      <artifactId>wildfly-swarm-plugin</artifactId>
+      <groupid>io.thorntail</groupId>
+      <artifactId>thorntail-maven-plugin</artifactId>
       <version>${version.wildfly-swarm}</version>
       <executions>
         <execution>
@@ -51,19 +51,19 @@ To add Vaadin (and Vaadin CDI) support there are also these dependencies:
 
 Additional application dependencies can be
 specified and will be included in the normal `.war` construction and available
-within the WildFly Swarm application `.jar`.
+within the Thorntail application `.jar`.
 
 ## Run
 
 You can run it many ways:
 
 * mvn package && java -jar target/example-vaadin-swarm.jar
-* mvn wildfly-swarm:run
+* mvn thorntail:run
 * In your IDE run the `org.wildfly.swarm.Swarm` class
 
 ## Use
 
-Since WildFly Swarm apps tend to support one deployment per executable, it
+Since Thorntail apps tend to support one deployment per executable, it
 automatically adds a `jboss-web.xml` to the deployment if it doesn't already
 exist.  This is used to bind the deployment to the root of the web-server,
 instead of using the `.war`'s own name as the application context.
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index 28f32b7d1..92b9b108b 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -9,16 +9,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>example-vaadin</artifactId>
 
-  <name>WildFly Swarm Examples: CDI and Vaadin</name>
-  <description>WildFly Swarm Examples: CDI and Vaadin</description>
+  <name>Thorntail Examples: CDI and Vaadin</name>
+  <description>Thorntail Examples: CDI and Vaadin</description>
 
   <packaging>war</packaging>
   
@@ -32,8 +32,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>package</id>
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm.examples</groupId>
+      <groupId>io.thorntail.examples</groupId>
       <artifactId>examples-base</artifactId>
     </dependency>
     <dependency>
diff --git a/vertx/README.adoc b/vertx/README.adoc
index 852e6c4f8..2f66b997d 100644
--- a/vertx/README.adoc
+++ b/vertx/README.adoc
@@ -1,4 +1,4 @@
-= WildFly Swarm - Vert.x
+= Thorntail - Vert.x
 
 This example shows how to add support for the Vert.x API in Java EE applications by enabling the https://github.com/vert-x3/vertx-jca[Vert.x JCA adapter].
 
diff --git a/vertx/pom.xml b/vertx/pom.xml
index 2ffdd25fa..b66c265b9 100644
--- a/vertx/pom.xml
+++ b/vertx/pom.xml
@@ -3,41 +3,41 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.wildfly.swarm.examples</groupId>
+    <groupId>io.thorntail.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2018.6.0-SNAPSHOT</version>
+    <version>2.0.0.Final-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>examples-vertx</artifactId>
 
-  <name>WildFly Swarm Examples: Vert.x</name>
-  <description>WildFly Swarm Examples: Vert.x</description>
+  <name>Thorntail Examples: Vert.x</name>
+  <description>Thorntail Examples: Vert.x</description>
   <packaging>war</packaging>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>vertx</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>ejb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.wildfly.swarm</groupId>
+      <groupId>io.thorntail</groupId>
       <artifactId>cdi</artifactId>
     </dependency>
   </dependencies>