diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index 2269713..f0502dd 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -9,6 +9,5 @@
   roles:
     - linux_common
     - aws_common
-    - aws_linux2_product_common
-    - product_base
+    - product_common
     - aws_efs_config
diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml
index 0e3c636..e648f91 100644
--- a/roles/jira_config/molecule/default/playbook.yml
+++ b/roles/jira_config/molecule/default/playbook.yml
@@ -7,5 +7,5 @@
     atl_product_installation_dir: "/opt/atlassian/jira"
     atl_installer_temp: "/opt/atlassian/tmp"
   roles:
-    - role: product_base
+    - role: product_common
     - role: jira_config
diff --git a/roles/product_base/.yamllint b/roles/product_common/.yamllint
similarity index 100%
rename from roles/product_base/.yamllint
rename to roles/product_common/.yamllint
diff --git a/roles/product_base/defaults/main.yml b/roles/product_common/defaults/main.yml
similarity index 100%
rename from roles/product_base/defaults/main.yml
rename to roles/product_common/defaults/main.yml
diff --git a/roles/product_base/molecule/default/Dockerfile.j2 b/roles/product_common/molecule/default/Dockerfile.j2
similarity index 100%
rename from roles/product_base/molecule/default/Dockerfile.j2
rename to roles/product_common/molecule/default/Dockerfile.j2
diff --git a/roles/product_base/molecule/default/molecule.yml b/roles/product_common/molecule/default/molecule.yml
similarity index 100%
rename from roles/product_base/molecule/default/molecule.yml
rename to roles/product_common/molecule/default/molecule.yml
diff --git a/roles/product_base/molecule/default/playbook.yml b/roles/product_common/molecule/default/playbook.yml
similarity index 88%
rename from roles/product_base/molecule/default/playbook.yml
rename to roles/product_common/molecule/default/playbook.yml
index 874231e..f060ef6 100644
--- a/roles/product_base/molecule/default/playbook.yml
+++ b/roles/product_common/molecule/default/playbook.yml
@@ -7,4 +7,4 @@
     atl_installer_temp: "/opt/atlassian/temp"
   roles:
     - role: linux_common
-    - role: product_base
+    - role: product_common
diff --git a/roles/product_base/molecule/default/tests/test_default.py b/roles/product_common/molecule/default/tests/test_default.py
similarity index 100%
rename from roles/product_base/molecule/default/tests/test_default.py
rename to roles/product_common/molecule/default/tests/test_default.py
diff --git a/roles/product_base/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
similarity index 100%
rename from roles/product_base/tasks/amazon.yml
rename to roles/product_common/tasks/amazon.yml
diff --git a/roles/product_base/tasks/main.yml b/roles/product_common/tasks/main.yml
similarity index 100%
rename from roles/product_base/tasks/main.yml
rename to roles/product_common/tasks/main.yml
diff --git a/roles/product_base/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
similarity index 100%
rename from roles/product_base/tasks/ubuntu.yml
rename to roles/product_common/tasks/ubuntu.yml