diff --git a/modules/jenkins/files/slave_scripts/version-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh
similarity index 63%
rename from modules/jenkins/files/slave_scripts/version-properties.sh
rename to modules/jenkins/files/slave_scripts/maven-properties.sh
index 420ce8e8e5..7386acb20c 100755
--- a/modules/jenkins/files/slave_scripts/version-properties.sh
+++ b/modules/jenkins/files/slave_scripts/maven-properties.sh
@@ -1,7 +1,9 @@
 #!/bin/bash -ex
 
-# This is a script that helps us version build artifacts.  It retrieves
-# git info and generates version strings.
+# This file is a helper for versioning and deployment of
+# maven projects.  It sets up environment variables to
+# pass to maven build commands so that we can generate
+# versioned builds within the gerrit workflow.
 
 # get version info from scm
 SCM_TAG=`git describe --abbrev=0 --tags` || true
@@ -23,6 +25,6 @@ else
     PROJECT_VER="$SCM_TAG.$COMMITS_SINCE_TAG.$SCM_SHA";
 fi
 
-echo "SCM_SHA=$SCM_SHA" >version.properties
-echo "PROJECT_VER=$PROJECT_VER" >>version.properties
-echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>version.properties
+echo "SCM_SHA=$SCM_SHA" >maven.properties
+echo "PROJECT_VER=$PROJECT_VER" >>maven.properties
+echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>maven.properties
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
index a0aed45782..2688fb371d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
@@ -110,9 +110,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: gerrit/version.properties
+          properties-file: gerrit/maven.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -148,9 +148,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: gerrit/version.properties
+          properties-file: gerrit/maven.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -182,9 +182,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: gerrit/version.properties
+          properties-file: gerrit/maven.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
index d8d99a1d4c..fb8eae7e00 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
@@ -30,9 +30,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/version-properties.sh
+            /usr/local/jenkins/slave_scripts/maven-properties.sh
         - inject:
-            properties-file: version.properties
+            properties-file: maven.properties
         - shell: |
             #!/bin/bash -xe
             # fetch drush
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
index 16abdf7788..271e260322 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@@ -11,9 +11,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - js-build:
           command: 'test'
           envlist: 'grunt'
@@ -47,9 +47,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - js-build:
           command: 'build'
           envlist: 'grunt'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index 60151b255f..5348f2548f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
@@ -15,9 +15,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -42,9 +42,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
index 4654ed294c..e9dd305cc6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
@@ -15,9 +15,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -42,9 +42,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/version-properties.sh
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
-          properties-file: version.properties
+          properties-file: maven.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
index 9383d17564..b99fa97924 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml
@@ -26,9 +26,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/version-properties.sh
+            /usr/local/jenkins/slave_scripts/maven-properties.sh
         - inject:
-            properties-file: version.properties
+            properties-file: maven.properties
         - shell: |
             #!/bin/bash -xe
             /usr/local/jenkins/slave_scripts/php-laravel-build.sh