diff --git a/roles/aws_common/molecule/cw-disabled/playbook.yml b/roles/aws_common/molecule/cw-disabled/converge.yml
similarity index 100%
rename from roles/aws_common/molecule/cw-disabled/playbook.yml
rename to roles/aws_common/molecule/cw-disabled/converge.yml
diff --git a/roles/aws_common/molecule/default/playbook.yml b/roles/aws_common/molecule/default/converge.yml
similarity index 100%
rename from roles/aws_common/molecule/default/playbook.yml
rename to roles/aws_common/molecule/default/converge.yml
diff --git a/roles/aws_common/molecule/logs-disabled/playbook.yml b/roles/aws_common/molecule/logs-disabled/converge.yml
similarity index 100%
rename from roles/aws_common/molecule/logs-disabled/playbook.yml
rename to roles/aws_common/molecule/logs-disabled/converge.yml
diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/converge.yml
similarity index 100%
rename from roles/bitbucket_config/molecule/default/playbook.yml
rename to roles/bitbucket_config/molecule/default/converge.yml
diff --git a/roles/confluence_config/molecule/aurora/playbook.yml b/roles/confluence_config/molecule/aurora/converge.yml
similarity index 100%
rename from roles/confluence_config/molecule/aurora/playbook.yml
rename to roles/confluence_config/molecule/aurora/converge.yml
diff --git a/roles/confluence_config/molecule/default/playbook.yml b/roles/confluence_config/molecule/default/converge.yml
similarity index 100%
rename from roles/confluence_config/molecule/default/playbook.yml
rename to roles/confluence_config/molecule/default/converge.yml
diff --git a/roles/confluence_config/molecule/password_char_escaping/playbook.yml b/roles/confluence_config/molecule/password_char_escaping/converge.yml
similarity index 100%
rename from roles/confluence_config/molecule/password_char_escaping/playbook.yml
rename to roles/confluence_config/molecule/password_char_escaping/converge.yml
diff --git a/roles/confluence_config/molecule/system_jdk/playbook.yml b/roles/confluence_config/molecule/system_jdk/converge.yml
similarity index 100%
rename from roles/confluence_config/molecule/system_jdk/playbook.yml
rename to roles/confluence_config/molecule/system_jdk/converge.yml
diff --git a/roles/create_backups/molecule/default/playbook.yml b/roles/create_backups/molecule/default/converge.yml
similarity index 100%
rename from roles/create_backups/molecule/default/playbook.yml
rename to roles/create_backups/molecule/default/converge.yml
diff --git a/roles/diy_backup/molecule/default/playbook.yml b/roles/diy_backup/molecule/default/converge.yml
similarity index 100%
rename from roles/diy_backup/molecule/default/playbook.yml
rename to roles/diy_backup/molecule/default/converge.yml
diff --git a/roles/jira_config/molecule/aurora/playbook.yml b/roles/jira_config/molecule/aurora/converge.yml
similarity index 100%
rename from roles/jira_config/molecule/aurora/playbook.yml
rename to roles/jira_config/molecule/aurora/converge.yml
diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/converge.yml
similarity index 100%
rename from roles/jira_config/molecule/default/playbook.yml
rename to roles/jira_config/molecule/default/converge.yml
diff --git a/roles/jira_config/molecule/jira_config_props/playbook.yml b/roles/jira_config/molecule/jira_config_props/converge.yml
similarity index 100%
rename from roles/jira_config/molecule/jira_config_props/playbook.yml
rename to roles/jira_config/molecule/jira_config_props/converge.yml
diff --git a/roles/jira_config/molecule/password_char_escaping/playbook.yml b/roles/jira_config/molecule/password_char_escaping/converge.yml
similarity index 100%
rename from roles/jira_config/molecule/password_char_escaping/playbook.yml
rename to roles/jira_config/molecule/password_char_escaping/converge.yml
diff --git a/roles/linux_common/molecule/default/playbook.yml b/roles/linux_common/molecule/default/converge.yml
similarity index 100%
rename from roles/linux_common/molecule/default/playbook.yml
rename to roles/linux_common/molecule/default/converge.yml
diff --git a/roles/product_common/molecule/default/playbook.yml b/roles/product_common/molecule/default/converge.yml
similarity index 100%
rename from roles/product_common/molecule/default/playbook.yml
rename to roles/product_common/molecule/default/converge.yml
diff --git a/roles/product_common/molecule/system_jdk/playbook.yml b/roles/product_common/molecule/system_jdk/converge.yml
similarity index 100%
rename from roles/product_common/molecule/system_jdk/playbook.yml
rename to roles/product_common/molecule/system_jdk/converge.yml
diff --git a/roles/product_install/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/bitbucket_latest/playbook.yml
rename to roles/product_install/molecule/bitbucket_latest/converge.yml
diff --git a/roles/product_install/molecule/confluence_latest/playbook.yml b/roles/product_install/molecule/confluence_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/confluence_latest/playbook.yml
rename to roles/product_install/molecule/confluence_latest/converge.yml
diff --git a/roles/product_install/molecule/crowd_latest/playbook.yml b/roles/product_install/molecule/crowd_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/crowd_latest/playbook.yml
rename to roles/product_install/molecule/crowd_latest/converge.yml
diff --git a/roles/product_install/molecule/default/playbook.yml b/roles/product_install/molecule/default/converge.yml
similarity index 100%
rename from roles/product_install/molecule/default/playbook.yml
rename to roles/product_install/molecule/default/converge.yml
diff --git a/roles/product_install/molecule/jira_all/playbook.yml b/roles/product_install/molecule/jira_all/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_all/playbook.yml
rename to roles/product_install/molecule/jira_all/converge.yml
diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/playbook.yml b/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_cached_with_downgrade/playbook.yml
rename to roles/product_install/molecule/jira_cached_with_downgrade/converge.yml
diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/playbook.yml b/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_cached_with_upgrade/playbook.yml
rename to roles/product_install/molecule/jira_cached_with_upgrade/converge.yml
diff --git a/roles/product_install/molecule/jira_software_latest/playbook.yml b/roles/product_install/molecule/jira_software_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_software_latest/playbook.yml
rename to roles/product_install/molecule/jira_software_latest/converge.yml
diff --git a/roles/product_install/molecule/jira_tarball/playbook.yml b/roles/product_install/molecule/jira_tarball/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_tarball/playbook.yml
rename to roles/product_install/molecule/jira_tarball/converge.yml
diff --git a/roles/product_install/molecule/jira_version_from_file/playbook.yml b/roles/product_install/molecule/jira_version_from_file/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_version_from_file/playbook.yml
rename to roles/product_install/molecule/jira_version_from_file/converge.yml
diff --git a/roles/product_install/molecule/jira_version_latest/playbook.yml b/roles/product_install/molecule/jira_version_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_version_latest/playbook.yml
rename to roles/product_install/molecule/jira_version_latest/converge.yml
diff --git a/roles/product_install/molecule/jira_version_override/playbook.yml b/roles/product_install/molecule/jira_version_override/converge.yml
similarity index 100%
rename from roles/product_install/molecule/jira_version_override/playbook.yml
rename to roles/product_install/molecule/jira_version_override/converge.yml
diff --git a/roles/product_install/molecule/servicedesk3/playbook.yml b/roles/product_install/molecule/servicedesk3/converge.yml
similarity index 100%
rename from roles/product_install/molecule/servicedesk3/playbook.yml
rename to roles/product_install/molecule/servicedesk3/converge.yml
diff --git a/roles/product_install/molecule/servicedesk4/playbook.yml b/roles/product_install/molecule/servicedesk4/converge.yml
similarity index 100%
rename from roles/product_install/molecule/servicedesk4/playbook.yml
rename to roles/product_install/molecule/servicedesk4/converge.yml
diff --git a/roles/product_install/molecule/servicedesk_latest/playbook.yml b/roles/product_install/molecule/servicedesk_latest/converge.yml
similarity index 100%
rename from roles/product_install/molecule/servicedesk_latest/playbook.yml
rename to roles/product_install/molecule/servicedesk_latest/converge.yml
diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/converge.yml
similarity index 100%
rename from roles/product_startup/molecule/bitbucket/playbook.yml
rename to roles/product_startup/molecule/bitbucket/converge.yml
diff --git a/roles/product_startup/molecule/default/playbook.yml b/roles/product_startup/molecule/default/converge.yml
similarity index 100%
rename from roles/product_startup/molecule/default/playbook.yml
rename to roles/product_startup/molecule/default/converge.yml
diff --git a/roles/product_startup/molecule/synchrony/playbook.yml b/roles/product_startup/molecule/synchrony/converge.yml
similarity index 100%
rename from roles/product_startup/molecule/synchrony/playbook.yml
rename to roles/product_startup/molecule/synchrony/converge.yml
diff --git a/roles/restore_backups/molecule/default/playbook.yml b/roles/restore_backups/molecule/default/converge.yml
similarity index 100%
rename from roles/restore_backups/molecule/default/playbook.yml
rename to roles/restore_backups/molecule/default/converge.yml
diff --git a/roles/restore_backups/molecule/restore_conf_server/playbook.yml b/roles/restore_backups/molecule/restore_conf_server/converge.yml
similarity index 100%
rename from roles/restore_backups/molecule/restore_conf_server/playbook.yml
rename to roles/restore_backups/molecule/restore_conf_server/converge.yml
diff --git a/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml b/roles/restore_backups/molecule/restore_jira_clustered/converge.yml
similarity index 100%
rename from roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
rename to roles/restore_backups/molecule/restore_jira_clustered/converge.yml