diff --git a/jboss-html5-mobile-archetype/pom.xml b/jboss-html5-mobile-archetype/pom.xml
index 004ccad6..6724e9ae 100644
--- a/jboss-html5-mobile-archetype/pom.xml
+++ b/jboss-html5-mobile-archetype/pom.xml
@@ -97,21 +97,18 @@
                            <artifactId>qstools</artifactId>
                            <version>1.6.1.Final</version>
                            <configuration>
-                               <projectGitRepo>https://github.com/jboss-developer/jboss-wfk-quickstarts.git</projectGitRepo>
+                               <projectGitRepo>https://github.com/jboss-developer/jboss-eap-quickstarts.git</projectGitRepo>
                                <projectPath>kitchensink-html5-mobile</projectPath>
                                <rootPackage>org.jboss.as.quickstarts.html5_mobile</rootPackage>
-                               <branch>12d82ed82656d1f5a17c679d3e38e3234692107d</branch>
+                               <branch>7.0.x-develop</branch>
                                <replaceValueWithExpression>
                                    <html5mobi>tableSuffix</html5mobi>
                                </replaceValueWithExpression>
                                <applyPatch>cheatsheet.diff</applyPatch>;
-                               <ignoredArchetypeExpressionReplaceValues>
-                                   <ignoredArchetypeExpressionReplaceValue>http://www.jboss.org/jdf/quickstarts/jboss-as-quickstart/wfk-quickstarts/</ignoredArchetypeExpressionReplaceValue>
-                               </ignoredArchetypeExpressionReplaceValues>
                                <archetypeExpressionReplaceValues>
                                    <archetypeExpressionReplaceValue>jboss-as-kitchensink-html5-mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>jboss-kitchensink-html5-mobile</archetypeExpressionReplaceValue>
-                                   <archetypeExpressionReplaceValue>JBoss WFK Quickstart: kitchensink-html5-mobile</archetypeExpressionReplaceValue>
+                                   <archetypeExpressionReplaceValue>JBoss EAP Quickstart: kitchensink-html5-mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>KitchensinkHTML5MobileQuickstart</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>KitchensinkHTML5Mobile</archetypeExpressionReplaceValue>
                                    <archetypeExpressionReplaceValue>kitchensink-html5-mobile-quickstart</archetypeExpressionReplaceValue>
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml
index dec2cdd3..64671aa5 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/.cheatsheet.xml
@@ -22,7 +22,7 @@
 <cheatsheet title="HTML5 + Mobile + JAX-RS: ${artifactId} quickstart">
   <intro>
     <description>
-      This quickstart shows off HTML5 based desktop/mobile web application development with Java EE 6 on Red Hat JBoss Enterprise Application Platform 6.1 or later. This project uses HTML5, jQuery Mobile, JAX-RS, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+      This quickstart shows off HTML5 based desktop/mobile web application development with Java EE 7 on Red Hat JBoss Enterprise Application Platform 7 or later. This project uses HTML5, jQuery Mobile, JAX-RS 2.0, CDI 1.1, EJB 3.2, JPA 2.1 and Bean Validation 1.1. It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
       <br/><br/>
       <b>HTML5</b>
       <br/><br/>
@@ -34,19 +34,19 @@
       <br/><br/>
       <b>JAX-RS: The Java API for RESTful Web Services</b>
       <br/><br/>
-      JAX-RS is a new specification in Java EE 6. It allows application developers to easily expose Java services as RESTful web services.
+      JAX-RS is a specification in Java EE that allows application developers to easily expose Java services as RESTful web services.
       <br/><br/>
-      <b>EJB 3.1</b>
+      <b>EJB 3.2</b>
       <br/><br/>
-      EJB 3.1 is an update to the EJB specification for Java EE 6. It allows application developers to build business components and services.
+      EJB 3.2 is an update to the EJB specification for Java EE 7. It allows application developers to build business components and services.
       <br/><br/>
-      <b>JPA 2.0</b>
+      <b>JPA 2.1</b>
       <br/><br/>
-      JPA 2.0 is an update to the JPA specification for Java EE 6. It provides application developers with an object-relational mapping facility to manage relational data. 
+      JPA 2.1 is an update to the JPA specification for Java EE 7. It provides application developers with an object-relational mapping facility to manage relational data.
       <br/><br/>
-      <b>Bean Validation</b>
+      <b>Bean Validation 1.1</b>
       <br/><br/>
-      Bean Validation is a new specification in Java EE 6, inspired by Hibernate Validator. It allows application developers to specify constraints once (often in their domain model), and have them applied in all layers of the application, protecting data and giving useful feedback to users.
+      Bean Validation 1.1 is an update to the JPA specification for Java EE 7. It was inspired by Hibernate Validator. It allows application developers to specify constraints once (often in their domain model), and have them applied in all layers of the application, protecting data and giving useful feedback to users.
       <br/><br/>
     </description>
   </intro>
@@ -54,7 +54,7 @@
     skip="false"
     title="The ${artifactId} example in depth">
     <description>
-      The ${artifactId} application shows off a number of Java EE technologies such as HTML5, jQuery Mobile, JAX-RS, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. 
+      The ${artifactId} application shows off a number of Java EE technologies such as HTML5, jQuery Mobile, JAX-RS 2.0, CDI 1.1, EJB 3.2, JPA 2.1 and Bean Validation 1.1.
       It does this by providing a member registration database, available via HTML5 and JAX-RS.
       <br/><br/>
       As usual, let&apos;s start by looking at the necessary deployment descriptors. By now, we&apos;re very used to seeing <b>beans.xml</b> in <b>WEB-INF/</b> (which can be found in the <b>src/main/webapp</b> directory of the example). Notice that, once again, we don&apos;t need a web.xml. There are two configuration files (which can be found in the <b>src/main/resources</b> directory of the example) — <b>WEB-INF/classes/META-INF/persistence.xml</b>, which sets up JPA, and <b>WEB-INF/classes/import.sql</b> which Hibernate, the JPA provider in Red Hat JBoss Enterprise Application Platform, will use to load the initial users into the application when the application starts. We discussed both of these files in detail in The <b>greeter example in depth</b>, and these are largely the same.
@@ -623,7 +623,7 @@
       The following action starts the test in the <b>remote</b> mode because you have started the server in the previous step. 
     <br/>
         Right-click the project, select <b>Properties&gt;Maven</b> and 
-        enter <b>arq-jbossas-remote</b> to the <b>Active Maven Profile</b> field. 
+        enter <b>arq-wildfly-remote</b> to the <b>Active Maven Profile</b> field.
         After that, right-click the project and select <b>Run As&gt;JUnit test</b>.
         <br/><br/>
         After performing this action, you should see a green bar in the <b>JUnit</b> view!
@@ -632,14 +632,14 @@
     <!-- the launchJUnitTest command is not implemented yey
     <command
       required="false"
-      serialization="org.jboss.tools.project.examples.cheatsheet.actions.launchJUnitTest(project=${currentProject}, activateProfile=arq-jbossas-remote)"/>
+      serialization="org.jboss.tools.project.examples.cheatsheet.actions.launchJUnitTest(project=${currentProject}, activateProfile=arq-wildfly-remote)"/>
   -->
   
   <action
       pluginId="org.jboss.tools.project.examples.cheatsheet"
       class="org.jboss.tools.project.examples.cheatsheet.actions.LaunchJUnitTest"
       param1="${currentProject}" 
-        param2="arq-jbossas-remote"/> 
+        param2="arq-wildfly-remote"/>
   </item>
   
   <item
@@ -720,7 +720,7 @@
     First of all, let&apos;s take a look at <b>arquillian.xml</b> in <b>src/test/resources</b>.
     </description>
     <subitem
-            label="Arquillian deploys the test war to JBoss AS, and doesn't write it to disk. For debugging, it can be very useful to see exactly what is in your war, so Arquillian allows you to export the war when the tests runs "
+            label="Arquillian deploys the test war to JBoss EAP, and doesn't write it to disk. For debugging, it can be very useful to see exactly what is in your war, so Arquillian allows you to export the war when the tests runs "
             skip="true">
     <command
       required="false"
@@ -744,7 +744,7 @@
       serialization="org.jboss.tools.project.examples.cheatsheet.openFileInEditor(path=/${currentProject}/pom.xml,fromLine=300,toLine=323)"/>
   </subitem>
   <subitem
-            label="Arquillian decides which container to use depending on your classpath. Here we define the remote JBoss AS container. "
+            label="Arquillian decides which container to use depending on your classpath. Here we define the remote JBoss EAP container. "
             skip="true">
     <command
       required="false"
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/pom.xml b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/pom.xml
index 5ce95f37..be415dcb 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/pom.xml
@@ -22,8 +22,8 @@
     <version>${version}</version>
     <packaging>war</packaging>
     <name>${artifactId}</name>
-    <description>A Java EE 6 HTML5 mobile web application for use with JBoss.</description>
-    <url>http://jboss.org/jdf</url>
+    <description>A Java EE HTML5 mobile web application for use with JBoss.</description>
+    <url>http://www.jboss.org/products/eap</url>
 
     <licenses>
         <license>
@@ -34,20 +34,37 @@
     </licenses>
 
     <!-- Activate JBoss Product Maven repository.
-
         NOTE: Configuring the Maven repository in the pom.xml file is not a recommended procedure
         and is only done here to make it easier to use the quickstarts.
-
         For more information about how to configure Maven for your application,
         see the section entitled 'Use the Maven Repository'
-        in the Development Guide for JBoss EAP 6 located here:
-
-        https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/6.3/html-single/Development_Guide
+        in the Development Guide for Red Hat JBoss Enterprise Application Platform located here:
+        https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/
     -->
     <repositories>
         <repository>
-            <id>redhat-techpreview-all-repository</id>
-            <url>https://maven.repository.redhat.com/techpreview/all/</url>
+            <id>redhat-earlyaccess-repository</id>
+            <url>https://maven.repository.redhat.com/earlyaccess/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jboss-developer-staging-repository</id>
+            <url>http://jboss-developer.github.io/temp-maven-repo/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>redhat-ga-repository</id>
+            <url>https://maven.repository.redhat.com/ga/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -59,8 +76,28 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>redhat-techpreview-all-repository</id>
-            <url>https://maven.repository.redhat.com/techpreview/all/</url>
+            <id>redhat-earlyaccess-repository</id>
+            <url>https://maven.repository.redhat.com/earlyaccess/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>jboss-developer-staging-repository</id>
+            <url>http://jboss-developer.github.io/temp-maven-repo/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>redhat-ga-repository</id>
+            <url>https://maven.repository.redhat.com/ga/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -77,45 +114,35 @@
 
         <!-- JBoss dependency versions -->
 
-        <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>6.3.2.GA</version.jboss.bom.eap>
-        <version.jboss.bom.wfk>2.7.0-redhat-1</version.jboss.bom.wfk>
+        <version.jboss.bom.eap>7.0.0-build-4</version.jboss.bom.eap>
 
         <!-- Other dependency versions -->
         <version.org.eclipse.m2e>1.0.0</version.org.eclipse.m2e>
-        <version.ro.isdc.wro4j>1.4.4</version.ro.isdc.wro4j>
+        <version.ro.isdc.wro4j>1.7.8</version.ro.isdc.wro4j>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>
         <version.war.plugin>2.1.1</version.war.plugin>
 
         <!-- maven-compiler-plugin -->
-        <maven.compiler.target>1.6</maven.compiler.target>
-        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- JBoss distributes a complete set of Java EE 6 APIs including
+            <!-- JBoss distributes a complete set of Java EE APIs including
                 a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
                 a collection) of artifacts. We use this here so that we always get the correct
-                versions of artifacts. Here we use the jboss-javaee-6.0-with-tools stack
-                (you can read this as the JBoss stack of the Java EE 6 APIs, with some extras
-                tools for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
-                stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
-                from the Hibernate family of projects) -->
-            <dependency>
-                <groupId>org.jboss.bom.wfk</groupId>
-                <artifactId>jboss-javaee-6.0-with-tools</artifactId>
-                <version>${version.jboss.bom.wfk}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+                versions of artifacts. Here we use the jboss-javaee-7.0-eap-with-tools stack
+                (you can read this as the JBoss stack of the Java EE APIs, with some extras
+                tools for your project, such as Arquillian for testing) -->
             <dependency>
-                <groupId>org.jboss.bom.eap</groupId>
-                <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-7.0-eap-with-tools</artifactId>
                 <version>${version.jboss.bom.eap}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -136,35 +163,35 @@
         <!-- Import the Common Annotations API (JSR-250), we use provided scope as the API is included in JBoss -->
         <dependency>
             <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss -->
+        <!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss EAP -->
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
+            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- Import the JPA API, we use provided scope as the API is included in JBoss -->
+        <!-- Import the JPA API, we use provided scope as the API is included in JBoss EAP -->
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- Import the EJB API, we use provided scope as the API is included in JBoss -->
+        <!-- Import the EJB API, we use provided scope as the API is included in JBoss EAP -->
         <dependency>
             <groupId>org.jboss.spec.javax.ejb</groupId>
-            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
-        <!-- Import the Servlet API, we use provided scope as the API is included in JBoss EAP 6 -->
+        <!-- Import the Servlet API, we use provided scope as the API is included in JBoss EAP -->
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+            <artifactId>jboss-servlet-api_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -185,7 +212,7 @@
 
         <!-- Now we declare any tools needed -->
 
-        <!-- Annotation processor to generate the JPA 2.0 metamodel classes for typesafe criteria queries -->
+        <!-- Annotation processor to generate the JPA metamodel classes for typesafe criteria queries -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
@@ -224,16 +251,16 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>${version.war.plugin}</version>
                 <configuration>
-                    <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
+                    <!-- Java EE doesn't require web.xml, Maven needs to catch up! -->
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
-            <!-- The JBoss AS plugin deploys your war to a local JBoss AS container -->
-            <!-- To use, run: mvn package jboss-as:deploy -->
+            <!-- The WildFly plugin deploys your war to a local JBoss EAP container -->
+            <!-- To use, run: mvn package wildfly:deploy -->
             <plugin>
-                <groupId>org.jboss.as.plugins</groupId>
-                <artifactId>jboss-as-maven-plugin</artifactId>
-                <version>${version.jboss.maven.plugin}</version>
+                <groupId>org.wildfly.plugins</groupId>
+                <artifactId>wildfly-maven-plugin</artifactId>
+                <version>${version.wildfly.maven.plugin}</version>
             </plugin>
             <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
@@ -298,14 +325,14 @@
             </build>
         </profile>
         <profile>
-            <!-- An optional Arquillian testing profile that executes tests in your JBoss AS instance -->
-            <!-- This profile will start a new JBoss AS instance, and execute the test, shutting it down when done -->
-            <!-- Run with: mvn clean test -Parq-jbossas-managed -->
-            <id>arq-jbossas-managed</id>
+            <!-- An optional Arquillian testing profile that executes tests in your JBoss EAP instance -->
+            <!-- This profile will start a new JBoss EAP instance, and execute the test, shutting it down when done -->
+            <!-- Run with: mvn clean test -Parq-wildfly-managed -->
+            <id>arq-wildfly-managed</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
+                    <groupId>org.wildfly.arquillian</groupId>
+                    <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -323,13 +350,13 @@
         </profile>
 
         <profile>
-            <!-- An optional Arquillian testing profile that executes tests in a remote JBoss AS instance -->
-            <!-- Run with: mvn clean test -Parq-jbossas-remote -->
-            <id>arq-jbossas-remote</id>
+            <!-- An optional Arquillian testing profile that executes tests in a remote JBoss EAP instance -->
+            <!-- Run with: mvn clean test -Parq-wildfly-remote -->
+            <id>arq-wildfly-remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
+                    <groupId>org.wildfly.arquillian</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/readme.md b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/readme.md
index c71a6543..98070526 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/readme.md
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/readme.md
@@ -4,14 +4,13 @@ Author: Jay Balunas
 Level: Beginner   
 Technologies: CDI, HTML5, REST  
 Summary: The `${artifactId}` quickstart is based on `${artifactId}`, but uses HTML5 and jQuery Mobile, making it suitable for mobile and tablet computers.  
-Target Product: WFK  
-Product Versions: EAP 6.1, EAP 6.2, EAP 6.3, WFK 2.7  
-Source: <https://github.com/jboss-developer/jboss-wfk-quickstarts>  
+Target Product: JBoss EAP
+Source: <https://github.com/jboss-developer/jboss-eap-quickstarts>
 
 What is it?
 -----------
 
-The `${artifactId}` quickstart is based on the `${artifactId}` quickstart and demonstrates a Java EE 6 mobile database application using HTML5, jQuery Mobile, JAX-RS, JPA 2.0, and REST.
+The `${artifactId}` quickstart is based on the `${artifactId}` quickstart and demonstrates a Java EE 7 mobile database application using HTML5, jQuery Mobile, JAX-RS, JPA, and REST in Red Hat JBoss Enterprise Application Platform.
 
 This application is built using a HTML5 + REST approach.  This uses a pure HTML client that interacts with the application server via restful end-points (JAX-RS).  This application also uses some of the latest HTML5 features and advanced JAX-RS. And since testing is just as important with client side as it is server side, this application uses QUnit to show you how to unit test your JavaScript.
 
@@ -20,9 +19,9 @@ What is a modern web application without mobile web support? This application al
 System requirements
 -------------------
 
-The application this project produces is designed to be run on Red Hat JBoss Enterprise Application Platform (EAP) 6.1 or later with the  Red Hat JBoss Web Framework Kit (WFK) 2.7.
+The application this project produces is designed to be run on Red Hat JBoss Enterprise Application Platform (JBoss EAP) 7 or later.
 
-All you need to build this project is Java 6.0 (Java SDK 1.6) or later, Maven 3.0 or later.
+All you need to build this project is Java 8.0 (Java SDK 1.8) or later, Maven 3.0 or later.
 
 An HTML5 compatible browser such as Chrome, Safari 5+, Firefox 5+, or IE 9+ are required. and note that some behaviors will vary slightly (ex. validations) based on browser support, especially IE 9.
 
@@ -34,7 +33,7 @@ With the prerequisites out of the way, you're ready to build and deploy.
 Configure Maven
 ---------------
 
-If you have not yet done so, you must [Configure Maven](../README.md#configure-maven) before testing the quickstarts.
+If you have not yet done so, you must [Configure Maven](https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CONFIGURE_MAVEN.md#configure-maven-to-build-and-deploy-the-quickstarts) before testing the quickstarts.
 
 
 Start the JBoss EAP Server
@@ -61,7 +60,7 @@ Build and Deploy the Quickstart
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean jboss-as:deploy
+        mvn clean wildfly:deploy
 
 4. This deploys `target/${artifactId}.war` to the running instance of the server.
 
@@ -79,13 +78,13 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 
-Run the Quickstart in JBoss Developer Studio or Eclipse
+Run the Quickstart in Red Hat JBoss Developer Studio or Eclipse
 -------------------------------------
+You can also start the server and deploy the quickstarts or run the Arquillian tests from Eclipse using JBoss tools. For more information, see [Use JBoss Developer Studio or Eclipse to Run the Quickstarts](https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/USE_JBDS.md#use-jboss-developer-studio-or-eclipse-to-run-the-quickstarts) 
 
-You can also start the server and deploy the quickstarts from Eclipse using JBoss tools. For more information, see [Use JBoss Developer Studio or Eclipse to Run the Quickstarts](../README.md#use-jboss-developer-studio-or-eclipse-to-run-the-quickstarts) 
 
 
 Build and Deploy the Quickstart - to OpenShift
@@ -109,12 +108,12 @@ NOTE: By default there are turn off tests so you must use the arquillian test pr
 For example:
 
     #No Tests
-    mvn clean jboss-as:deploy -Pminify
+    mvn clean wildfly:deploy -Pminify
 
 OR
 
     #With Tests
-    mvn clean jboss-as:deploy -Pminify,arq-jbossas-remote
+    mvn clean wildfly:deploy -Pminify,arq-wildfly-remote
  
 Run the Arquillian tests
 -------------------------------------
@@ -123,7 +122,7 @@ By default, tests are configured to be skipped. The reason is that the sample te
 
 To run the test in JBoss, first start the container instance. Then, run the test goal with the following profile activated:
 
-    mvn clean test -Parq-jbossas-remote
+    mvn clean test -Parq-wildfly-remote
 
 Run the QUnit tests
 -------------------------------------
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
index 204e926f..b8d7f3b0 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
@@ -20,7 +20,7 @@
 import javax.ws.rs.core.Application;
 
 /**
- * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE 6 "no XML" approach to activating
+ * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE "no XML" approach to activating
  * JAX-RS.
  * 
  * <p>
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/MemberService.java b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/MemberService.java
index 22c736c0..c36a83d3 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/MemberService.java
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/rest/MemberService.java
@@ -104,12 +104,12 @@ public Response createMember(Member member) {
             builder = createViolationResponse(ce.getConstraintViolations());
         } catch (ValidationException e) {
             // Handle the unique constrain violation
-            Map<String, String> responseObj = new HashMap<String, String>();
+            Map<String, String> responseObj = new HashMap<>();
             responseObj.put("email", "Email taken");
             builder = Response.status(Response.Status.CONFLICT).entity(responseObj);
         } catch (Exception e) {
             // Handle generic exceptions
-            Map<String, String> responseObj = new HashMap<String, String>();
+            Map<String, String> responseObj = new HashMap<>();
             responseObj.put("error", e.getMessage());
             builder = Response.status(Response.Status.BAD_REQUEST).entity(responseObj);
         }
@@ -155,7 +155,7 @@ private void validateMember(Member member) throws ConstraintViolationException,
     private Response.ResponseBuilder createViolationResponse(Set<ConstraintViolation<?>> violations) {
         log.fine("Validation completed. violations found: " + violations.size());
 
-        Map<String, String> responseObj = new HashMap<String, String>();
+        Map<String, String> responseObj = new HashMap<>();
 
         for (ConstraintViolation<?> violation : violations) {
             responseObj.put(violation.getPropertyPath().toString(), violation.getMessage());
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/util/JSONPRequestFilter.java b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/util/JSONPRequestFilter.java
index 6a438f82..389194fb 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/util/JSONPRequestFilter.java
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/java/util/JSONPRequestFilter.java
@@ -21,13 +21,7 @@
 import java.io.PrintWriter;
 import java.util.regex.Pattern;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -93,6 +87,19 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 @Override
                 public ServletOutputStream getOutputStream() throws IOException {
                     return new ServletOutputStream() {
+
+                        WriteListener writeListener;
+
+                        @Override
+                        public boolean isReady() {
+                            return true;
+                        }
+
+                        @Override
+                        public void setWriteListener(WriteListener writeListener) {
+                            this.writeListener = writeListener;
+                        }
+
                         @Override
                         public void write(int b) throws IOException {
                             byteStream.write(b);
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 57f9b762..472b1129 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -15,11 +15,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence version="2.0"
-   xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<persistence version="2.1"
+   xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="
-        http://java.sun.com/xml/ns/persistence
-        http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+        http://xmlns.jcp.org/xml/ns/persistence
+        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed 
          data source, the example data source is just for proofs of concept! -->
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
index e08a7023..cf7863a4 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
@@ -18,8 +18,8 @@
 <!-- This file can be an empty text file (0 bytes) -->
 <!-- We're declaring the schema to save you time if you do have to configure 
    this in the future -->
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="
-        http://java.sun.com/xml/ns/javaee 
-        http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+        http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
 </beans>
diff --git a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
index ec3dcd20..05dcd707 100644
--- a/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/jboss-html5-mobile-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
@@ -148,7 +148,7 @@ <h3>HTML5 Quickstart</h3>
                 <div class="ui-content" role="main">
                     <div class="wrap">
                         <img src="img/rhjb_eap_logo.png" class="mobileicon"/>
-                        <p>You have successfully deployed a Java EE 6 web application.</p>
+                        <p>You have successfully deployed a Java EE web application.</p>
                         <p>This quickstart demonstrates the use of various Mobile, HTML5, CSS3 and JavaScript techniques.</p>
 
                         <ul id="features">
@@ -181,8 +181,8 @@ <h3>Find out more</h3>
                         </ul>
                         <p>Learn about HTML5/Mobile development on JBoss EAP.</p>
                         <ul>
-                            <li><a href="http://www.jboss.org/jdf/quickstarts/get-started/" target="_blank">Quickstarts</a></li>
-                            <li><a href="http://www.jboss.org/jdf/quickstarts/jboss-as-quickstart/wfk-quickstarts/kitchensink-html5-mobile/" target="_blank">Get this application</a></li>
+                            <li><a href="http://www.jboss.org/get-started/" target="_blank">Quickstarts</a></li>
+                            <li><a href="http://www.jboss.org/quickstarts/wfk/${artifactId}/" target="_blank">Get this application</a></li>
                         </ul>
                     </div>
                 </aside>