diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
index 5e5749b640..f3fbd1cbdd 100644
--- a/bean-validation/pom.xml
+++ b/bean-validation/pom.xml
@@ -51,7 +51,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
diff --git a/carmart-tx/pom.xml b/carmart-tx/pom.xml
index 5dd41c4f56..4838873ea4 100644
--- a/carmart-tx/pom.xml
+++ b/carmart-tx/pom.xml
@@ -45,7 +45,7 @@
         <com.sun.faces.jsf.impl.version>2.0.2</com.sun.faces.jsf.impl.version>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <!-- This is the Management URL of EWS/Tomcat, so tomcat-maven-plugin 
diff --git a/carmart/pom.xml b/carmart/pom.xml
index a7421dc2a3..4d67f44c77 100644
--- a/carmart/pom.xml
+++ b/carmart/pom.xml
@@ -50,7 +50,7 @@
         <tomcat.management.url>http://localhost:8080/manager/text</tomcat.management.url>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <!-- other plugin versions -->
diff --git a/cdi-portable-extension/pom.xml b/cdi-portable-extension/pom.xml
index 0009190234..7b17a47eee 100644
--- a/cdi-portable-extension/pom.xml
+++ b/cdi-portable-extension/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/cdi-veto/pom.xml b/cdi-veto/pom.xml
index f2928d5684..6c064b471a 100644
--- a/cdi-veto/pom.xml
+++ b/cdi-veto/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/cmt/pom.xml b/cmt/pom.xml
index cc593cff72..f0bcb24c54 100644
--- a/cmt/pom.xml
+++ b/cmt/pom.xml
@@ -46,7 +46,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <!-- other plugin versions -->
diff --git a/deltaspike-authorization/pom.xml b/deltaspike-authorization/pom.xml
index 1e3ef301c9..5cb43912ba 100644
--- a/deltaspike-authorization/pom.xml
+++ b/deltaspike-authorization/pom.xml
@@ -50,7 +50,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/deltaspike-beanbuilder/pom.xml b/deltaspike-beanbuilder/pom.xml
index 5aea00ec6e..6886741613 100644
--- a/deltaspike-beanbuilder/pom.xml
+++ b/deltaspike-beanbuilder/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/deltaspike-projectstage/pom.xml b/deltaspike-projectstage/pom.xml
index 039dba2bc5..6b69cafe11 100644
--- a/deltaspike-projectstage/pom.xml
+++ b/deltaspike-projectstage/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/ejb-in-war/pom.xml b/ejb-in-war/pom.xml
index f0833753f9..1f1fb99ded 100644
--- a/ejb-in-war/pom.xml
+++ b/ejb-in-war/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
index b00635df2d..94e92e7291 100644
--- a/ejb-throws-exception/pom.xml
+++ b/ejb-throws-exception/pom.xml
@@ -44,7 +44,7 @@
             BOM -->
         <!-- Define the version of JBoss' Java EE 7 APIs and Tools we want
             to import. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <!-- JBoss dependency versions -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
diff --git a/helloworld-html5/pom.xml b/helloworld-html5/pom.xml
index f5010be8eb..12d7a78795 100644
--- a/helloworld-html5/pom.xml
+++ b/helloworld-html5/pom.xml
@@ -52,7 +52,7 @@
         <maven.compiler.source>1.7</maven.compiler.source>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
     </properties>
diff --git a/helloworld-jdg/pom.xml b/helloworld-jdg/pom.xml
index 33972c37da..99e78891ce 100644
--- a/helloworld-jdg/pom.xml
+++ b/helloworld-jdg/pom.xml
@@ -44,7 +44,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <!-- other plugin versions -->
diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
index 913ffc98f1..0c5b69f13e 100644
--- a/helloworld-singleton/pom.xml
+++ b/helloworld-singleton/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
diff --git a/helloworld-websocket/pom.xml b/helloworld-websocket/pom.xml
index 3efa3679f5..577b705edf 100644
--- a/helloworld-websocket/pom.xml
+++ b/helloworld-websocket/pom.xml
@@ -52,7 +52,7 @@
         <maven.compiler.source>1.7</maven.compiler.source>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
     </properties>
 
diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
index a9d27788fd..03a0e0066f 100644
--- a/helloworld-ws/pom.xml
+++ b/helloworld-ws/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/hibernate4/pom.xml b/hibernate4/pom.xml
index 0a9690cdc3..1d1965fdd9 100644
--- a/hibernate4/pom.xml
+++ b/hibernate4/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <version.wildfly>9.0.0.Alpha1</version.wildfly>
diff --git a/jax-rs-client/pom.xml b/jax-rs-client/pom.xml
index 2278c02506..115d486d15 100644
--- a/jax-rs-client/pom.xml
+++ b/jax-rs-client/pom.xml
@@ -46,7 +46,7 @@
         <!-- JBoss dependency versions -->
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
diff --git a/kitchensink-angularjs/pom.xml b/kitchensink-angularjs/pom.xml
index 1f07c53032..3662d16d5d 100644
--- a/kitchensink-angularjs/pom.xml
+++ b/kitchensink-angularjs/pom.xml
@@ -44,7 +44,7 @@
         <!-- JBoss dependency versions -->
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
diff --git a/kitchensink-angularjs/src/main/webapp/index.html b/kitchensink-angularjs/src/main/webapp/index.html
index 2d1c53b2e1..8595feb492 100644
--- a/kitchensink-angularjs/src/main/webapp/index.html
+++ b/kitchensink-angularjs/src/main/webapp/index.html
@@ -49,16 +49,16 @@
             <p>Learn more about JBoss WildFly.</p>
             <ul>
                 <li><a
-                    href="https://github.com/wildfly/quickstart/guide/Introduction">Getting
+                    href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting
                         Started Developing Applications Guide</a></li>
-                <li><a href="http://jboss.org/jbossas">Community
+                <li><a href="http://www.wildfly.org/">Community
                         Project Information</a></li>
             </ul>
         </div>
         <footer id="footer">
             <p>
                 This project was generated from a Maven archetype from
-                JBoss.<br />
+                WildFly.<br />
             </p>
         </footer>
     </aside>
diff --git a/kitchensink-angularjs/src/main/webapp/partials/home.html b/kitchensink-angularjs/src/main/webapp/partials/home.html
index 5d8e40541d..a3d5c1cd9a 100644
--- a/kitchensink-angularjs/src/main/webapp/partials/home.html
+++ b/kitchensink-angularjs/src/main/webapp/partials/home.html
@@ -17,7 +17,7 @@
 -->
 <!-- This is a partial, and is templated by AngularJS -->
 <div>
-    <h1>Welcome to JBoss!</h1>
+    <h1>Welcome to WildFly!</h1>
 
     <div>
         <p>You have successfully deployed a Java EE 7 Enterprise
diff --git a/kitchensink-ear/pom.xml b/kitchensink-ear/pom.xml
index 1a013cd15a..a4bb6e51bd 100644
--- a/kitchensink-ear/pom.xml
+++ b/kitchensink-ear/pom.xml
@@ -50,7 +50,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.wildfly>9.0.0.Alpha1</version.wildfly>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
diff --git a/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
index 1282b0190e..6ee0a63b2e 100644
--- a/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
+++ b/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -38,14 +38,14 @@
          <p>Learn more about JBoss WildFly.</p>
          <ul>
             <li><a
-               href="https://github.com/wildfly/quickstart/guide/Introduction">Getting Started Developing Applications Guide</a></li>
-            <li><a href="http://jboss.org/jbossas">Community Project Information</a></li>
+               href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting Started Developing Applications Guide</a></li>
+            <li><a href="http://www.wildfly.org/">Community Project Information</a></li>
          </ul>            
       </div>
       <div id="footer">
          <p>
             This project was generated from a Maven archetype from
-            JBoss.<br />
+            WildFly.<br />
          </p>
       </div>
    </div>
diff --git a/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/index.xhtml b/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/index.xhtml
index b213656328..95675b5bc9 100644
--- a/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/index.xhtml
+++ b/kitchensink-ear/wildfly-kitchensink-ear-web/src/main/webapp/index.xhtml
@@ -21,7 +21,7 @@
    xmlns:h="http://java.sun.com/jsf/html"
    template="/WEB-INF/templates/default.xhtml">
    <ui:define name="content">
-      <h1>Welcome to JBoss!</h1>
+      <h1>Welcome to WildFly!</h1>
 
       <div>
          <p>You have successfully deployed a Java EE 7 Enterprise Application.</p>
diff --git a/kitchensink-html5-mobile/pom.xml b/kitchensink-html5-mobile/pom.xml
index 36ff58a5b0..56902c15d6 100644
--- a/kitchensink-html5-mobile/pom.xml
+++ b/kitchensink-html5-mobile/pom.xml
@@ -40,7 +40,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
         <!-- Other dependency versions -->
diff --git a/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml b/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml
index e81547df94..32e74f11f1 100644
--- a/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml
+++ b/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml
@@ -23,7 +23,7 @@
    <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! -->
-      <jta-data-source>java:jboss/datasources/KitchensinkHTML5MobileQuickstartDSS</jta-data-source>
+      <jta-data-source>java:jboss/datasources/KitchensinkHTML5MobileQuickstartDS</jta-data-source>
       <properties>
          <!-- Properties for Hibernate -->
          <property name="hibernate.hbm2ddl.auto" value="create-drop" />
diff --git a/kitchensink-html5-mobile/src/main/webapp/index.html b/kitchensink-html5-mobile/src/main/webapp/index.html
index ad878d89dc..27df114bdf 100644
--- a/kitchensink-html5-mobile/src/main/webapp/index.html
+++ b/kitchensink-html5-mobile/src/main/webapp/index.html
@@ -174,10 +174,10 @@ <h3>Find out more</h3>
                     <!-- /Header -->
 
                     <div class="ui-content" role="main">
-                        <p>Learn about HTML5/Mobile development on JBoss EAP.</p>
+                        <p>Learn about HTML5/Mobile development on WildFly.</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="https://github.com/wildfly/quickstart" target="_blank">Quickstarts</a></li>
+                            <li><a href="https://github.com/wildfly/quickstart/tree/master/kitchensink-html5-mobile" target="_blank">Get this application</a></li>
                         </ul>
                     </div>
                 </aside>
diff --git a/kitchensink-jsp/pom.xml b/kitchensink-jsp/pom.xml
index 79a6fd87de..854f489d72 100644
--- a/kitchensink-jsp/pom.xml
+++ b/kitchensink-jsp/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
         <!-- Other dependency versions -->
diff --git a/kitchensink-jsp/src/main/webapp/index.jsp b/kitchensink-jsp/src/main/webapp/index.jsp
index f6af150a39..15ece92128 100644
--- a/kitchensink-jsp/src/main/webapp/index.jsp
+++ b/kitchensink-jsp/src/main/webapp/index.jsp
@@ -47,9 +47,9 @@
             <p>Learn more about JBoss WildFly.</p>
             <ul>
                 <li><a
-                    href="https://github.com/wildfly/quickstart/guide/Introduction/">Getting
+                    href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting
                         Started Developing Applications Guide</a></li>
-                <li><a href="http://jboss.org/jbossas">Community
+                <li><a href="http://www.wildfly.org/">Community
                         Project Information</a></li>
             </ul>
 
@@ -58,7 +58,7 @@
             <img src="resources/gfx/logo.png" alt="Weld logo" />
             <p>
                 This project was generated from a Maven archetype from
-                JBoss.<br />
+                WildFly.<br />
             </p>
         </div>
     </div>
diff --git a/kitchensink-jsp/src/main/webapp/registrationForm.jsp b/kitchensink-jsp/src/main/webapp/registrationForm.jsp
index 7bc13ba855..2c515a5389 100644
--- a/kitchensink-jsp/src/main/webapp/registrationForm.jsp
+++ b/kitchensink-jsp/src/main/webapp/registrationForm.jsp
@@ -23,10 +23,10 @@
 <title>registrationPage.jsp</title>
 </head>
 <body>
-    <h1>Welcome to JBoss!</h1>
+    <h1>Welcome to WildFly!</h1>
 
     <div>
-        <p>You have successfully deployed a Java EE 6 web
+        <p>You have successfully deployed a Java EE 7 web
             application.</p>
         <h3>Your application can run on:</h3>
         <img src="resources/gfx/dualbrand_as7eap.png" />
diff --git a/kitchensink-ml-ear/pom.xml b/kitchensink-ml-ear/pom.xml
index da3b2c4014..c4ed7e100d 100644
--- a/kitchensink-ml-ear/pom.xml
+++ b/kitchensink-ml-ear/pom.xml
@@ -50,7 +50,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.wildfly>9.0.0.Alpha1</version.wildfly>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
diff --git a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-ejb/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/KitchensinkMessages.java b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-ejb/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/KitchensinkMessages.java
index 7ba33efa5d..ac5fd90a4b 100644
--- a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-ejb/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/KitchensinkMessages.java
+++ b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-ejb/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/KitchensinkMessages.java
@@ -16,8 +16,9 @@
  */
 package org.jboss.as.quickstarts.kitchensink_ear.util;
 
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageBundle;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
+
 
 /**
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
diff --git a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources.properties b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources.properties
index 419b6351b6..506ceb412f 100755
--- a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources.properties
+++ b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources.properties
@@ -21,8 +21,8 @@
 ###############################
 # Resources for index.xhtml
 ###############################
-memberWelcomeHeader=Welcome to JBoss!
-memberWelcomeMessage=You have successfully deployed a localized Java EE 6 web application.
+memberWelcomeHeader=Welcome to WildFly!
+memberWelcomeMessage=You have successfully deployed a localized Java EE 7 web application.
 memberAppMessage=Your application can run on:
 memberRegistrationHeader=Member Registration
 memberFormDescription=Enforces annotation-based constraints defined on the model class.
@@ -56,6 +56,6 @@ documentation=Documentation
 productInformation=Product Information
 getStartedGuide=Get Started Developing Applications Guide
 communityProjectInfo=Community Project Information
-projectGenerated=This project was generated from a Maven archetype from JBoss.
+projectGenerated=This project was generated from a Maven archetype from WildFly.
 defaultErrorMsg=Registration failed. See server log for more information.
 
diff --git a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_es.properties b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_es.properties
index 609f8cf0a8..ea42dcb49f 100644
--- a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_es.properties
+++ b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_es.properties
@@ -21,8 +21,8 @@
 ###############################
 # Resources for index.xhtml
 ###############################
-memberWelcomeHeader=Bienvenido a JBoss!
-memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 6 de aplicaciones web.
+memberWelcomeHeader=Bienvenido a WildFly!
+memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 7 de aplicaciones web.
 memberAppMessage=La aplicaci\u00F3n puede ejecutarse en:
 memberRegistrationHeader=Registro de Usuarios
 memberFormDescription=Aplica las anotaciones basadas en restricciones definidas en la clase del modelo.
@@ -56,6 +56,6 @@ documentation=Documentaci\u00F3n
 productInformation=Informaci\u00F3n Sobre el Producto
 getStartedGuide=Empezar a desarrollar la Gu\u00EDa de aplicaciones
 communityProjectInfo=Informaci\u00F3n del proyecto comunitario
-projectGenerated=Este proyecto fue generado a partir de un arquetipo de Maven de JBoss.
+projectGenerated=Este proyecto fue generado a partir de un arquetipo de Maven de WildFly.
 defaultErrorMsg=Error de registro. Vea el registro del servidor para obtener m\u00E1s informaci\u00F3n.
 
diff --git a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_fr.properties b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_fr.properties
index ab05acb704..e20762660e 100755
--- a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_fr.properties
+++ b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/resources/org/jboss/as/quickstarts/kitchensink_ear/bundle/Resources_fr.properties
@@ -21,8 +21,8 @@
 ###############################
 # Resources for index.xhtml
 ###############################
-memberWelcomeHeader=Bienvenue sur JBoss!
-memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 6.
+memberWelcomeHeader=Bienvenue sur WildFly!
+memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 7.
 memberAppMessage=Votre application peut fonctionner sur:
 memberRegistrationHeader=Inscription des Membres
 memberFormDescription=Applique annotation bas\u00E9e contraintes d\u00E8finies sur la classe mod\u00E9le.
@@ -56,6 +56,6 @@ documentation=Documentation
 productInformation=Informations sur le Produit
 getStartedGuide=Commencer D\u00E9veloppement d'Applications
 communityProjectInfo=Renseignements sur le Projet Communautaire
-projectGenerated=Ce projet a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 \u00E0 partir d'un arch\u00E9type Maven \u00E0 partir de JBoss.
+projectGenerated=Ce projet a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 \u00E0 partir d'un arch\u00E9type Maven \u00E0 partir de WildFly.
 defaultErrorMsg=Echec de l'enregistrement. Voir journal du serveur pour plus d'informations.
 
diff --git a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
index 887867bfbf..d34b609c04 100644
--- a/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
+++ b/kitchensink-ml-ear/wildfly-kitchensink-ml-ear-web/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -39,8 +39,8 @@
             <p>#{bundle.learnAboutJBossAS7}</p>
             <ul>
                 <li><a
-                    href="https://github.com/wildfly/quickstart/guide/Introduction">#{bundle.getStartedGuide}</a></li>
-                <li><a href="http://jboss.org/jbossas">#{bundle.communityProjectInfo}</a></li>
+                    href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">#{bundle.getStartedGuide}</a></li>
+                <li><a href="http://www.wildfly.org/">#{bundle.communityProjectInfo}</a></li>
             </ul>
       </div>
       <div id="footer">
diff --git a/kitchensink-ml/pom.xml b/kitchensink-ml/pom.xml
index f70eb27362..871c25512b 100644
--- a/kitchensink-ml/pom.xml
+++ b/kitchensink-ml/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
         <!-- other plugin versions -->
diff --git a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java
index f274149b4a..43f0bc9fd6 100644
--- a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java
+++ b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java
@@ -18,9 +18,9 @@
 
 import javax.faces.context.FacesContext;
 
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageBundle;
 import org.jboss.logging.Messages;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
 
 /**
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
diff --git a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources.properties b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources.properties
index 1c3864b644..19b681ee86 100755
--- a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources.properties
+++ b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources.properties
@@ -21,8 +21,8 @@
 ###############################
 # Resources for index.xhtml
 ###############################
-memberWelcomeHeader=Welcome to JBoss!
-memberWelcomeMessage=You have successfully deployed a localized Java EE 6 web application.
+memberWelcomeHeader=Welcome to WildFly!
+memberWelcomeMessage=You have successfully deployed a localized Java EE 7 web application.
 memberAppMessage=Your application can run on:
 memberRegistrationHeader=Member Registration
 memberFormDescription=Enforces annotation-based constraints defined on the model class.
@@ -51,5 +51,5 @@ documentation=Documentation
 productInformation=Product Information
 getStartedGuide=Get Started Developing Applications Guide
 communityProjectInfo=Community Project Information
-projectGenerated=This project was generated from a Maven archetype from JBoss.
+projectGenerated=This project was generated from a Maven archetype from WildFly.
 
diff --git a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_es.properties b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_es.properties
index 5309e6fb5f..f2888f09a2 100644
--- a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_es.properties
+++ b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_es.properties
@@ -22,7 +22,7 @@
 # Resources for index.xhtml
 ###############################
 memberWelcomeHeader=Bienvenido a JBoss!
-memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 6 de aplicaciones web.
+memberWelcomeMessage=Se han desplegado con \u00E9xito una localizada Java EE 7 de aplicaciones web.
 memberAppMessage=La aplicaci\u00F3n puede ejecutarse en:
 memberRegistrationHeader=Registro de Usuarios
 memberFormDescription=Aplica las anotaciones basadas en restricciones definidas en la clase del modelo.
diff --git a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_fr.properties b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_fr.properties
index 2ac24d2ad2..a7d61119de 100755
--- a/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_fr.properties
+++ b/kitchensink-ml/src/main/resources/org/jboss/as/quickstarts/kitchensink/bundle/Resources_fr.properties
@@ -22,7 +22,7 @@
 # Resources for index.xhtml
 ###############################
 memberWelcomeHeader=Bienvenue sur JBoss!
-memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 6.
+memberWelcomeMessage=Vous avez d\u00E9ploy\u00E9 avec succ\u00E9s une version localis\u00E9e de l'application Java EE web 7.
 memberAppMessage=Votre application peut fonctionner sur:
 memberRegistrationHeader=Inscription des Membres
 memberFormDescription=Applique annotation bas\u00E9e contraintes d\u00E8finies sur la classe mod\u00E9le.
diff --git a/kitchensink-ml/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink-ml/src/main/webapp/WEB-INF/templates/default.xhtml
index 00115f32a8..2777969a63 100644
--- a/kitchensink-ml/src/main/webapp/WEB-INF/templates/default.xhtml
+++ b/kitchensink-ml/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -39,8 +39,8 @@
             <p>#{bundle.learnAboutJBossAS7}</p>
             <ul>
                 <li><a
-                    href="https://github.com/wildfly/quickstart/guide/Introduction">#{bundle.getStartedGuide}</a></li>
-                <li><a href="http://jboss.org/jbossas">#{bundle.communityProjectInfo}</a></li>
+                    href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">#{bundle.getStartedGuide}</a></li>
+                <li><a href="http://www.wildfly.org/">#{bundle.communityProjectInfo}</a></li>
             </ul>
         </div>
         <div id="footer">
diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
index 336cb09a7f..1f98d235ee 100644
--- a/kitchensink/pom.xml
+++ b/kitchensink/pom.xml
@@ -47,7 +47,7 @@
 
         <!-- Define the version of the JBoss BOMs we want to import to specify 
             tested stacks. -->
-        <version.jboss.bom>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
         <!-- other plugin versions -->
diff --git a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
index 40cdbda0db..88930054ea 100644
--- a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
+++ b/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -38,16 +38,16 @@
             <p>Learn more about JBoss WildFly.</p>
             <ul>
                 <li><a
-                    href="https://github.com/wildfly/quickstart/guide/Introduction">Getting
+                    href="https://github.com/wildfly/quickstart/blob/master/guide/Introduction.asciidoc">Getting
                         Started Developing Applications Guide</a></li>
-                <li><a href="http://jboss.org/jbossas">Community
+                <li><a href="http://www.wildfly.org/">Community
                         Project Information</a></li>
             </ul>
         </div>
         <div id="footer">
             <p>
                 This project was generated from a Maven archetype from
-                JBoss.<br />
+                WildFly.<br />
             </p>
         </div>
     </div>
diff --git a/kitchensink/src/main/webapp/index.xhtml b/kitchensink/src/main/webapp/index.xhtml
index 6bc3f838a7..4f1cc1107a 100644
--- a/kitchensink/src/main/webapp/index.xhtml
+++ b/kitchensink/src/main/webapp/index.xhtml
@@ -21,7 +21,7 @@
     xmlns:h="http://java.sun.com/jsf/html"
     template="/WEB-INF/templates/default.xhtml">
     <ui:define name="content">
-        <h1>Welcome to JBoss!</h1>
+        <h1>Welcome to WildFly!</h1>
 
         <div>
             <p>You have successfully deployed a Java EE 7 Enterprise
diff --git a/logging-tools/pom.xml b/logging-tools/pom.xml
index 8a9ab1e5ef..ba3931d1b7 100644
--- a/logging-tools/pom.xml
+++ b/logging-tools/pom.xml
@@ -45,7 +45,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <!-- other plugin versions -->
diff --git a/payment-cdi-event/pom.xml b/payment-cdi-event/pom.xml
index 771a6a803f..ff2638670b 100644
--- a/payment-cdi-event/pom.xml
+++ b/payment-cdi-event/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
diff --git a/pom.xml b/pom.xml
index a0df5a83ac..ba32065f73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
 
         <version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml
index 5c09d65bc7..2068fe7527 100644
--- a/thread-racing/pom.xml
+++ b/thread-racing/pom.xml
@@ -46,7 +46,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>
diff --git a/wsat-simple/pom.xml b/wsat-simple/pom.xml
index 2d30b0b47e..58aa66ec4f 100644
--- a/wsat-simple/pom.xml
+++ b/wsat-simple/pom.xml
@@ -46,7 +46,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
diff --git a/wsba-coordinator-completion-simple/pom.xml b/wsba-coordinator-completion-simple/pom.xml
index f6f4098ef7..70809ee25d 100644
--- a/wsba-coordinator-completion-simple/pom.xml
+++ b/wsba-coordinator-completion-simple/pom.xml
@@ -47,7 +47,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>
 
 
diff --git a/wsba-participant-completion-simple/pom.xml b/wsba-participant-completion-simple/pom.xml
index 962762c12f..192689e926 100644
--- a/wsba-participant-completion-simple/pom.xml
+++ b/wsba-participant-completion-simple/pom.xml
@@ -46,7 +46,7 @@
         <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>8.0.0.Final</version.jboss.bom>
+        <version.jboss.bom>8.2.0.Final</version.jboss.bom>
 
         <version.arquillian.container>8.0.0.Final</version.arquillian.container>