diff --git a/roles/product_download/molecule/default/playbook.yml b/roles/product_download/molecule/default/playbook.yml
index f0375a6..927b08f 100644
--- a/roles/product_download/molecule/default/playbook.yml
+++ b/roles/product_download/molecule/default/playbook.yml
@@ -3,7 +3,7 @@
   hosts: all
   vars:
     atl_product_family: "jira"
-    atl_product_edition: "jira-software"
+    atl_product_edition: "jira-core"
     atl_product_user: "jira"
   roles:
     - role: linux_common
diff --git a/roles/product_download/molecule/default/tests/test_default.py b/roles/product_download/molecule/default/tests/test_default.py
index d9812c3..bbbe06a 100644
--- a/roles/product_download/molecule/default/tests/test_default.py
+++ b/roles/product_download/molecule/default/tests/test_default.py
@@ -8,18 +8,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_file_is_latest(host):
-    verfile = host.file('/media/atl/jira/shared/jira-software.version')
+    verfile = host.file('/media/atl/jira/shared/jira-core.version')
     assert verfile.exists
 
-    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest")
+    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest")
     upstream = upstream_fd.read()
 
     assert verfile.content.decode("UTF-8").strip() == upstream.decode("UTF-8").strip()
 
 def test_latest_is_downloaded(host):
-    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest")
+    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest")
     upstream = upstream_fd.read().decode("UTF-8").strip()
 
-    installer = host.file('/opt/atlassian/tmp/jira-software.'+upstream+'.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.tar.gz')
     assert installer.exists
     assert installer.user == 'root'
diff --git a/roles/product_download/molecule/resources/tests/test_common.py b/roles/product_download/molecule/resources/tests/test_common.py
index 8d9112d..bb85871 100644
--- a/roles/product_download/molecule/resources/tests/test_common.py
+++ b/roles/product_download/molecule/resources/tests/test_common.py
@@ -8,14 +8,14 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_downloaded(host):
-    verfile = host.file('/media/atl/jira/shared/jira-software.version')
+    verfile = host.file('/media/atl/jira/shared/jira-core.version')
     assert verfile.exists
 
 def test_symlink_created(host):
-    target = host.file('/opt/atlassian/jira-software/current')
+    target = host.file('/opt/atlassian/jira-core/current')
     assert target.exists
     assert target.is_symlink
 
 def test_unpacked(host):
-    verfile = host.file('/opt/atlassian/jira-software/current/bin/catalina.sh')
+    verfile = host.file('/opt/atlassian/jira-core/current/bin/catalina.sh')
     assert verfile.exists
diff --git a/roles/product_download/molecule/version_from_file/playbook.yml b/roles/product_download/molecule/version_from_file/playbook.yml
index 9bd94ce..a69406a 100644
--- a/roles/product_download/molecule/version_from_file/playbook.yml
+++ b/roles/product_download/molecule/version_from_file/playbook.yml
@@ -3,7 +3,7 @@
   hosts: all
   vars:
     atl_product_family: "jira"
-    atl_product_edition: "jira-software"
+    atl_product_edition: "jira-core"
     atl_product_user: "jira"
 
   pre_tasks:
@@ -13,7 +13,7 @@
         state: directory
     - name: Seed version
       copy:
-        dest: '/media/atl/jira/shared/jira-software.version'
+        dest: '/media/atl/jira/shared/jira-core.version'
         content: "7.9.0"
 
   roles:
diff --git a/roles/product_download/molecule/version_from_file/tests/test_default.py b/roles/product_download/molecule/version_from_file/tests/test_default.py
index 43d1d20..3c50aa3 100644
--- a/roles/product_download/molecule/version_from_file/tests/test_default.py
+++ b/roles/product_download/molecule/version_from_file/tests/test_default.py
@@ -8,18 +8,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_is_correct(host):
-    verfile = host.file('/media/atl/jira/shared/jira-software.version')
+    verfile = host.file('/media/atl/jira/shared/jira-core.version')
     assert verfile.exists
 
     assert verfile.content.decode("UTF-8").strip() == "7.9.0"
 
 def test_is_downloaded(host):
-    installer = host.file('/opt/atlassian/tmp/jira-software.7.9.0.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/jira-core.7.9.0.tar.gz')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_is_unpacked(host):
-    installer = host.file('/opt/atlassian/jira-software/7.9.0')
+    installer = host.file('/opt/atlassian/jira-core/7.9.0')
     assert installer.exists
     assert installer.is_directory
     assert installer.user == 'jira'
diff --git a/roles/product_download/molecule/version_latest/playbook.yml b/roles/product_download/molecule/version_latest/playbook.yml
index 5f59cea..d74291f 100644
--- a/roles/product_download/molecule/version_latest/playbook.yml
+++ b/roles/product_download/molecule/version_latest/playbook.yml
@@ -3,7 +3,7 @@
   hosts: all
   vars:
     atl_product_family: "jira"
-    atl_product_edition: "jira-software"
+    atl_product_edition: "jira-core"
     atl_product_user: "jira"
     atl_product_version: "latest"
   roles:
diff --git a/roles/product_download/molecule/version_latest/tests/test_default.py b/roles/product_download/molecule/version_latest/tests/test_default.py
index d9812c3..bbbe06a 100644
--- a/roles/product_download/molecule/version_latest/tests/test_default.py
+++ b/roles/product_download/molecule/version_latest/tests/test_default.py
@@ -8,18 +8,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_file_is_latest(host):
-    verfile = host.file('/media/atl/jira/shared/jira-software.version')
+    verfile = host.file('/media/atl/jira/shared/jira-core.version')
     assert verfile.exists
 
-    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest")
+    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest")
     upstream = upstream_fd.read()
 
     assert verfile.content.decode("UTF-8").strip() == upstream.decode("UTF-8").strip()
 
 def test_latest_is_downloaded(host):
-    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-software/latest")
+    upstream_fd = urllib.request.urlopen("https://s3.amazonaws.com/atlassian-software/releases/jira-core/latest")
     upstream = upstream_fd.read().decode("UTF-8").strip()
 
-    installer = host.file('/opt/atlassian/tmp/jira-software.'+upstream+'.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/jira-core.'+upstream+'.tar.gz')
     assert installer.exists
     assert installer.user == 'root'
diff --git a/roles/product_download/molecule/version_override/playbook.yml b/roles/product_download/molecule/version_override/playbook.yml
index fecfd52..6aa81a7 100644
--- a/roles/product_download/molecule/version_override/playbook.yml
+++ b/roles/product_download/molecule/version_override/playbook.yml
@@ -3,7 +3,7 @@
   hosts: all
   vars:
     atl_product_family: "jira"
-    atl_product_edition: "jira-software"
+    atl_product_edition: "jira-core"
     atl_product_user: "jira"
     atl_product_version: "7.13.2"
   roles:
diff --git a/roles/product_download/molecule/version_override/tests/test_default.py b/roles/product_download/molecule/version_override/tests/test_default.py
index e56b5d5..829aed3 100644
--- a/roles/product_download/molecule/version_override/tests/test_default.py
+++ b/roles/product_download/molecule/version_override/tests/test_default.py
@@ -8,18 +8,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_version_is_correct(host):
-    verfile = host.file('/media/atl/jira/shared/jira-software.version')
+    verfile = host.file('/media/atl/jira/shared/jira-core.version')
     assert verfile.exists
 
     assert verfile.content.decode("UTF-8").strip() == "7.13.2"
 
 def test_is_downloaded(host):
-    installer = host.file('/opt/atlassian/tmp/jira-software.7.13.2.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/jira-core.7.13.2.tar.gz')
     assert installer.exists
     assert installer.user == 'root'
 
 def test_is_unpacked(host):
-    installer = host.file('/opt/atlassian/jira-software/7.13.2')
+    installer = host.file('/opt/atlassian/jira-core/7.13.2')
     assert installer.exists
     assert installer.is_directory
     assert installer.user == 'jira'