diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 573aa1d..cc7ab9c 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -11,6 +11,8 @@
     # FIXME this is a temorary workaround to use EFS while testing abstraction
     atl_nfs_version: "4.1"
 
+    atl_product_base_url: "{{ atl_release_base_url }}/stash/downloads"
+
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
diff --git a/aws_bitbucket_nfs_node.yml b/aws_bitbucket_nfs_node.yml
index e5fd0c8..f544cda 100644
--- a/aws_bitbucket_nfs_node.yml
+++ b/aws_bitbucket_nfs_node.yml
@@ -4,7 +4,7 @@
 
   vars:
     # See group_vars/aws_node_local.yml, which pull vars from the environment.
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
 
diff --git a/aws_slingshot_backup.yml b/aws_slingshot_backup.yml
index f638680..50028b4 100644
--- a/aws_slingshot_backup.yml
+++ b/aws_slingshot_backup.yml
@@ -1,7 +1,7 @@
 # Runs atlassian-slingshot to backup your product instance. Should be run when there is only 1 app node (i.e server or single node cluster)
 # Params
 # Required
-# atl_product_family - should be "jira", "confluence", or "stash"
+# atl_product_family - should be "jira", "confluence", or "bitbucket"
 # atl_slingshot_backup_dir - working directory for the backup, should be large enough to fit database and shared home dumps
 # atl_s3_backup_bucket - s3 bucket to upload your backup to
 # atl_s3_backup_region - AWS region where the s3 bucket is deployed
diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 5fc06f5..ed21846 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -23,7 +23,7 @@ atl_product_home: "{{ atl_home_base }}/{{ atl_product_family }}"
 atl_product_shared_home_map:
   confluence: "confluence/shared-home"
   jira: "jira/shared"
-  stash: "bitbucket/shared"
+  bitbucket: "bitbucket/shared"
   crowd: "crowd/shared"
 atl_product_home_shared: "{{ atl_shared_mountpoint }}/{{ atl_product_shared_home_map[atl_product_family] }}"
 atl_product_shared_plugins: "{{ atl_product_home_shared }}/plugins/installed-plugins"
@@ -53,7 +53,7 @@ atl_product_logs:
     *logs_default
   jira:
     *logs_default
-  stash:
+  bitbucket:
     *logs_default
   crowd:
     *logs_default
diff --git a/roles/diy_backup/molecule/default/playbook.yml b/roles/diy_backup/molecule/default/playbook.yml
index a5cecc3..3ccf64e 100644
--- a/roles/diy_backup/molecule/default/playbook.yml
+++ b/roles/diy_backup/molecule/default/playbook.yml
@@ -3,7 +3,7 @@
   hosts: all
   vars:
     atl_product_user: "bitbucket"
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
 
     atl_aws_iam_role: "atl_aws_iam_role"
diff --git a/roles/product_install/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/playbook.yml
index 39c7a9a..2c18819 100644
--- a/roles/product_install/molecule/bitbucket_latest/playbook.yml
+++ b/roles/product_install/molecule/bitbucket_latest/playbook.yml
@@ -2,7 +2,7 @@
 - name: Converge
   hosts: all
   vars:
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
 
diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml
index 45d6f8a..b68c550 100644
--- a/roles/product_startup/defaults/main.yml
+++ b/roles/product_startup/defaults/main.yml
@@ -7,7 +7,7 @@ atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') or true }}"
 atl_startup_script_map:
   jira: "bin/start-jira.sh"
   confluence: "bin/start-confluence.sh"
-  stash: "bin/start-bitbucket.sh"
+  bitbucket: "bin/start-bitbucket.sh"
   crowd: "start_crowd.sh"
 
 atl_startup_exec_path: "{{ atl_product_installation_current }}/{{ atl_startup_script_map[atl_product_family] }}"