diff --git a/dist/assembly-src.xml b/dist/assembly-src.xml
index be147a2014e3..14ce9f3b42be 100644
--- a/dist/assembly-src.xml
+++ b/dist/assembly-src.xml
@@ -12,7 +12,7 @@
     <fileSets>
         <fileSet>
             <directory>..</directory>
-            <outputDirectory>${server.output.dir.prefix}-${jboss.as.release.version}-src</outputDirectory>
+            <outputDirectory>${server.output.dir.prefix}-${server.output.dir.version}-src</outputDirectory>
             <includes>
                 <include>**/*.xml</include>
                 <include>**/src/**</include>
diff --git a/dist/assembly.xml b/dist/assembly.xml
index 8d13b70f56a4..8365c53aaba2 100644
--- a/dist/assembly.xml
+++ b/dist/assembly.xml
@@ -12,7 +12,7 @@
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>${server.output.dir.prefix}-${jboss.as.release.version}/**</include>
+                <include>${server.output.dir.prefix}-${server.output.dir.version}/**</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/dist/pom.xml b/dist/pom.xml
index f16adcced788..c331119cedf0 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -64,7 +64,7 @@
     </properties>
 
     <build>
-        <finalName>${server.output.dir.prefix}-${jboss.as.release.version}</finalName>
+        <finalName>${server.output.dir.prefix}-${server.output.dir.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>
@@ -202,10 +202,10 @@
                                 <phase>prepare-package</phase>
                                 <configuration>
                                     <tasks>
-                                        <fileset id="licenses.xml.list" dir="${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses" includes="*licenses.xml"/>
+                                        <fileset id="licenses.xml.list" dir="${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses" includes="*licenses.xml"/>
                                         <!--
                                         <property name="prop.licenses.xml.list" refid="licenses.xml.list"/>
-                                        <echo>List of licenses.xml in ${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses</echo>
+                                        <echo>List of licenses.xml in ${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses</echo>
                                         <echo>${prop.licenses.xml.list}</echo>
                                         -->
                                         <pathconvert pathsep="&#xA;" property="license-files-list-items" refid="licenses.xml.list">
@@ -215,9 +215,9 @@
                                                 <globmapper from="*" to="*&lt;/item&gt;"/>
                                             </chainedmapper>
                                         </pathconvert>
-                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses/licenses.xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#xA;&lt;list&gt;&#xA;</echo>
-                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses/licenses.xml" append="true">${license-files-list-items}&#xA;</echo>
-                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses/licenses.xml" append="true">&lt;/list&gt;</echo>
+                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses/licenses.xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#xA;&lt;list&gt;&#xA;</echo>
+                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses/licenses.xml" append="true">${license-files-list-items}&#xA;</echo>
+                                        <echo file="${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses/licenses.xml" append="true">&lt;/list&gt;</echo>
                                     </tasks>
                                 </configuration>
                                 <goals>
@@ -241,12 +241,12 @@
                                 <configuration>
                                     <transformationSets>
                                         <transformationSet>
-                                            <dir>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses</dir>
+                                            <dir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses</dir>
                                             <includes>
                                                 <include>licenses.xml</include>
                                             </includes>
-                                            <stylesheet>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses/licenses-merged.xsl</stylesheet>
-                                            <outputDir>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses</outputDir>
+                                            <stylesheet>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses/licenses-merged.xsl</stylesheet>
+                                            <outputDir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses</outputDir>
                                             <fileMappers>
                                                 <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
                                                     <targetExtension>.xml</targetExtension>
@@ -254,12 +254,12 @@
                                             </fileMappers>
                                         </transformationSet>
                                         <transformationSet>
-                                            <dir>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses</dir>
+                                            <dir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses</dir>
                                             <includes>
                                                 <include>licenses.xml</include>
                                             </includes>
-                                            <stylesheet>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses/licenses.xsl</stylesheet>
-                                            <outputDir>${basedir}/target/${server.output.dir.prefix}-${jboss.as.release.version}/docs/licenses</outputDir>
+                                            <stylesheet>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses/licenses.xsl</stylesheet>
+                                            <outputDir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs/licenses</outputDir>
                                             <fileMappers>
                                                 <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
                                                     <targetExtension>.html</targetExtension>
diff --git a/dist/src/verifier/verifications.xml b/dist/src/verifier/verifications.xml
index 170fb3b2c82c..baec67e12572 100644
--- a/dist/src/verifier/verifications.xml
+++ b/dist/src/verifier/verifications.xml
@@ -31,35 +31,35 @@ limitations under the License.
 -->
   <files>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/bin/product.conf</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/bin/product.conf</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/bin/product.conf</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/bin/product.conf</location>
       <contains>slot=${verifier.slot.name}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <contains>JBoss-Product-Release-Name: ${verifier.product.release.name}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <contains>JBoss-Product-Release-Version: ${verifier.product.release.version}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/jboss-modules.jar</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/jboss-modules.jar</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/standalone/configuration/standalone.xml</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/standalone/configuration/standalone.xml</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/server/main/wildfly-server-${version.org.wildfly.core}.jar</location>
+      <location>target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/server/main/wildfly-server-${version.org.wildfly.core}.jar</location>
       <exists>true</exists>
     </file>
   </files>
diff --git a/pom.xml b/pom.xml
index 35da7b7ea1f7..088fcbc7b08d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,12 @@
     </scm>
 
     <properties>
-        <!-- Release Info -->
+        <!-- Release Info. 
+             Drives properties that end up in MANIFEST.mf files produced by this build
+             and some are also used in the pom 'scm' element.
+             Do not use these properties for other purposes, e.g. jboss.as.release.version is not 
+             a general purpose release version shorthand.
+        -->
         <jboss.as.release.version>${project.version}</jboss.as.release.version>
         <jboss.as.release.codename>N/A</jboss.as.release.codename>
         <jboss.as.scm.url>https://github.com/wildfly/wildfly</jboss.as.scm.url>
@@ -254,9 +259,12 @@
         <!-- Checkstyle configuration -->
         <linkXRef>false</linkXRef>
 
+        <!-- Properties that drive the names of various directories produced by and used in the build -->
         <server.output.dir.prefix>wildfly</server.output.dir.prefix>
-        <wildfly.build.output.dir>build/target/${server.output.dir.prefix}-${jboss.as.release.version}</wildfly.build.output.dir>
-        <wildfly.web.build.output.dir>servlet-dist/target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}</wildfly.web.build.output.dir>
+        <!-- Version suffix that is appended to directories. Default is the maven GAV version but this can be edited to use a short form version -->
+        <server.output.dir.version>${project.version}</server.output.dir.version>
+        <wildfly.build.output.dir>build/target/${server.output.dir.prefix}-${server.output.dir.version}</wildfly.build.output.dir>
+        <wildfly.web.build.output.dir>servlet-dist/target/${server.output.dir.prefix}-servlet-${server.output.dir.version}</wildfly.web.build.output.dir>
 
         <!--
             See ChildFirstClassLoaderBuilder in model-test for the explanation of the org.jboss.model.test.cache.root and org.jboss.model.test.classpath.cache properties.
diff --git a/servlet-dist/assembly.xml b/servlet-dist/assembly.xml
index 587bae6d8eda..68ce6311a605 100644
--- a/servlet-dist/assembly.xml
+++ b/servlet-dist/assembly.xml
@@ -34,7 +34,7 @@
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>${server.output.dir.prefix}-servlet-${jboss.as.release.version}/**</include>
+                <include>${server.output.dir.prefix}-servlet-${server.output.dir.version}/**</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/servlet-dist/pom.xml b/servlet-dist/pom.xml
index 5d89c15a11d3..ea8a84a5db6e 100644
--- a/servlet-dist/pom.xml
+++ b/servlet-dist/pom.xml
@@ -63,7 +63,7 @@
         <verifier.product.release.version>12.0</verifier.product.release.version>
     </properties>
     <build>
-        <finalName>${server.output.dir.prefix}-servlet-${jboss.as.release.version}</finalName>
+        <finalName>${server.output.dir.prefix}-servlet-${server.output.dir.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>
diff --git a/servlet-dist/src/verifier/verifications.xml b/servlet-dist/src/verifier/verifications.xml
index 2af449142dda..90260affdf89 100644
--- a/servlet-dist/src/verifier/verifications.xml
+++ b/servlet-dist/src/verifier/verifications.xml
@@ -31,35 +31,35 @@ limitations under the License.
 -->
   <files>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/bin/product.conf</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/bin/product.conf</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/bin/product.conf</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/bin/product.conf</location>
       <contains>slot=${verifier.slot.name}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <contains>JBoss-Product-Release-Name: ${verifier.product.release.name}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/product/${verifier.slot.name}/dir/META-INF/MANIFEST.MF</location>
       <contains>JBoss-Product-Release-Version: ${verifier.product.release.version}</contains>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/jboss-modules.jar</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/jboss-modules.jar</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/standalone/configuration/standalone.xml</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/standalone/configuration/standalone.xml</location>
       <exists>true</exists>
     </file>
     <file>
-      <location>target/${server.output.dir.prefix}-servlet-${jboss.as.release.version}/modules/system/layers/base/org/jboss/as/server/main/wildfly-server-${version.org.wildfly.core}.jar</location>
+      <location>target/${server.output.dir.prefix}-servlet-${server.output.dir.version}/modules/system/layers/base/org/jboss/as/server/main/wildfly-server-${version.org.wildfly.core}.jar</location>
       <exists>true</exists>
     </file>
   </files>