diff --git a/CHANGELOG.md b/CHANGELOG.md
index da757bb72..5d255358c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 2019-07-08
+
+## (BC Break) Rename run control variables
+
+Some internal playbook control variables have been renamed.
+
+This change **only affects people who run this playbook's roles from another playbook**.
+If you're using this playbook as-is, you're not affected and don't need to do anything.
+
+The following variables have been renamed:
+
+- from `run_import_postgres` to `run_postgres_import`
+- from `run_import_sqlite_db` to `run_postgres_import_sqlite_db`
+- from `run_upgrade_postgres` to `run_postgres_upgrade`
+- from `run_import_media_store` to `run_synapse_import_media_store`
+- from `run_register_user` to `run_synapse_register_user`
+- from `run_update_user_password` to `run_synapse_update_user_password`
+
+
 # 2019-07-04
 
 ## Synapse no longer logs to text files
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 544d8b0c1..983b0cf3f 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -43,13 +43,13 @@ matrix_docker_network: "matrix"
 matrix_well_known_matrix_server_enabled: true
 
 # Variables to Control which parts of our roles run.
+run_postgres_import: true
+run_postgres_upgrade: true
+run_postgres_import_sqlite_db: true
+run_synapse_register_user: true
+run_synapse_update_user_password: true
+run_synapse_import_media_store: true
 run_setup: true
-run_import_postgres: true
-run_upgrade_postgres: true
+run_self_check: true
 run_start: true
 run_stop: true
-run_register_user: true
-run_update_user_password: true
-run_import_sqlite_db: true
-run_import_media_store: true
-run_self_check: true
diff --git a/roles/matrix-postgres/tasks/main.yml b/roles/matrix-postgres/tasks/main.yml
index ef9b770e9..9527d1ff7 100644
--- a/roles/matrix-postgres/tasks/main.yml
+++ b/roles/matrix-postgres/tasks/main.yml
@@ -15,16 +15,16 @@
     - setup-postgres
 
 - import_tasks: "{{ role_path }}/tasks/import_postgres.yml"
-  when: run_import_postgres|bool
+  when: run_postgres_import|bool
   tags:
     - import-postgres
 
 - import_tasks: "{{ role_path }}/tasks/import_sqlite_db.yml"
-  when: run_import_sqlite_db|bool
+  when: run_postgres_import_sqlite_db|bool
   tags:
     - import-sqlite-db
 
 - import_tasks: "{{ role_path }}/tasks/upgrade_postgres.yml"
-  when: run_upgrade_postgres|bool
+  when: run_postgres_upgrade|bool
   tags:
     - upgrade-postgres
diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml
index 57bf8b7c7..585a95bbb 100644
--- a/roles/matrix-synapse/tasks/main.yml
+++ b/roles/matrix-synapse/tasks/main.yml
@@ -15,12 +15,12 @@
     - setup-synapse
 
 - import_tasks: "{{ role_path }}/tasks/import_media_store.yml"
-  when: run_import_media_store|bool
+  when: run_synapse_import_media_store|bool
   tags:
     - import-media-store
 
 - import_tasks: "{{ role_path }}/tasks/register_user.yml"
-  when: run_register_user|bool
+  when: run_synapse_register_user|bool
   tags:
     - register-user
 
@@ -39,7 +39,7 @@
     - self-check
 
 - import_tasks: "{{ role_path }}/tasks/update_user_password.yml"
-  when: run_update_user_password|bool
+  when: run_synapse_update_user_password|bool
   tags:
     - update-user-password