diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 83166c4..1b41821 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -11,15 +11,15 @@
     - vars/vars.yml
 
   vars:
+    release_drupal_path: "{{ ansistrano_release_path.stdout }}/web"
+    release_drush_path: "{{ ansistrano_release_path.stdout }}/vendor/bin/drush"
+
     ansistrano_deploy_via: "rsync"
     ansistrano_deploy_from: "{{ playbook_dir }}/../"
-    ansistrano_deploy_to: "{{ app_project_root }}"
+    ansistrano_deploy_to: "{{ project_deploy_dir }}"
     ansistrano_keep_releases: 5
     ansistrano_after_symlink_shared_tasks_file: "{{ playbook_dir }}/deploy/after-symlink-shared.yml"
     ansistrano_after_symlink_tasks_file: "{{ playbook_dir }}/deploy/after-symlink.yml"
     ansistrano_after_update_code_tasks_file: "{{ playbook_dir }}/deploy/after-update-code.yml"
     ansistrano_shared_paths:
-      - "{{ app_project_subdir }}/sites/default/files"
-
-    release_web_path: "{{ ansistrano_release_path.stdout }}/web"
-    release_drush_path: "{{ ansistrano_release_path.stdout }}/vendor/bin/drush"
+      - "{{ project_subdir }}/sites/default/files"
diff --git a/ansible/deploy/after-symlink-shared.yml b/ansible/deploy/after-symlink-shared.yml
index 8dc78bb..cc98bc8 100644
--- a/ansible/deploy/after-symlink-shared.yml
+++ b/ansible/deploy/after-symlink-shared.yml
@@ -2,10 +2,10 @@
 - name: Fix files directory permissions
   become: true
   file:
-    path: '{{ app_project_root }}/shared/web/sites/default/files'
+    path: '{{ project_deploy_dir }}/shared/web/sites/default/files'
     state: directory
     mode: 0775
     recurse: true
 
 - name: Install Drupal
-  command: '{{ release_drush_path }} --root {{ release_web_path }} site-install -y --account-pass=admin123 --site-name="PHP South Wales"'
+  command: '{{ release_drush_path }} --root {{ release_drupal_path }} site-install -y --account-pass=admin123 --site-name="PHP South Wales"'
diff --git a/ansible/provision.yml b/ansible/provision.yml
index 7520d86..800bb03 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -16,12 +16,12 @@
   tasks:
     - name: Create a database
       mysql_db:
-        name: '{{ app_db_name }}'
+        name: '{{ database_name }}'
         state: present
 
     - name: Add the database user
       mysql_user:
-        name: '{{ app_db_user }}'
-        password: '{{ app_db_password }}'
+        name: '{{ database_user }}'
+        password: '{{ database_password }}'
         priv: '*.*:ALL'
         state: present
diff --git a/ansible/rollback.yml b/ansible/rollback.yml
index d6ad7f8..8a2c695 100644
--- a/ansible/rollback.yml
+++ b/ansible/rollback.yml
@@ -9,4 +9,4 @@
     - vars/vars.yml
 
   vars:
-    ansistrano_deploy_to: "{{ app_project_root }}"
+    ansistrano_deploy_to: "{{ project_deploy_dir }}"
diff --git a/ansible/vars/vars.yml b/ansible/vars/vars.yml
index 315a313..e15e467 100644
--- a/ansible/vars/vars.yml
+++ b/ansible/vars/vars.yml
@@ -1,7 +1,7 @@
 ---
 apache_vhosts:
   - servername: dransible
-    documentroot: "{{ app_project_docroot }}"
+    documentroot: "{{ project_docroot }}"
 
 php_packages:
   - libapache2-mod-php{{ php_default_version_debian }}
@@ -22,14 +22,14 @@ php_packages:
 
 ansistrano_current_dir: current
 
-app_project_root: /var/www/app
-app_project_subdir: web
-app_project_docroot: "{{ app_project_root }}/{{ ansistrano_current_dir }}/{{ app_project_subdir }}"
+project_deploy_dir: /var/www/app
+project_subdir: web
+project_docroot: "{{ project_deploy_dir }}/{{ ansistrano_current_dir }}/{{ project_subdir }}"
 
-app_db_name: "{{ vault_app_db_name }}"
-app_db_password: "{{ vault_app_db_password }}"
-app_db_user: "{{ vault_app_db_user }}"
-app_hash_salt: "{{ vault_app_hash_salt }}"
+database_name: "{{ vault_database_name }}"
+database_password: "{{ vault_database_password }}"
+database_user: "{{ vault_database_user }}"
+hash_salt: "{{ vault_hash_salt }}"
 
 drupal_settings:
   - drupal_root: /tmp/app
@@ -41,9 +41,9 @@ drupal_settings:
               default:
                 driver: mysql
                 host: localhost
-                database: '{{ app_db_name }}'
-                username: '{{ app_db_user }}'
-                password: '{{ app_db_password }}'
-          hash_salt: '{{ app_hash_salt }}'
+                database: '{{ database_name }}'
+                username: '{{ database_user }}'
+                password: '{{ database_password }}'
+          hash_salt: '{{ hash_salt }}'
           config_directories:
             sync: ../config/sync
diff --git a/ansible/vars/vault.yml b/ansible/vars/vault.yml
index 0fb2796..2f00390 100644
--- a/ansible/vars/vault.yml
+++ b/ansible/vars/vault.yml
@@ -1,12 +1,12 @@
 $ANSIBLE_VAULT;1.1;AES256
-64396464313532333631623939663462373934326637643164323634656161623563373864353961
-3932643132333034376534343436363263333832333136360a663461643937633632333339303034
-65336638373432313039313966386430303863623337366164396533393363373132636338333835
-3936663866363730660a653333616133656434373934353935353863336564616231333438613437
-62333865366532306466383735323464383131636362393931646236613862393433323139343936
-37353764353135616538656663306633313761666665383862623232316239386235613131353363
-31303535373836653862663039313161646263313464303661353961323665323931393738313865
-64623663316330303037353532383636323866643264613733316536306562363938373634333230
-65306261386135396131323432646263323231353239373936623139663364623838656538323930
-66623665383439333533376261633339623330663565306262343835303761653331633862623533
-393439323933363765396161333538656561
+32313734366265383862393136336639663330396636653335373230613139316461306630653534
+3764313030356430333463356532613864636630663865310a313063643064313438363062653766
+37316665343565346463623665626433653463656461353863663062326632623836316131653464
+3036353437386635320a633532396134326139363964336532366538616366343432613062666464
+37613034333339366137633661626262643231366266396331653264353832626537366463613033
+64366466623362646366663164623230366637633864386239633637336564636531373031626165
+35623038383936646337663538303237313233353435383663343665333131626262316137653031
+64366561623263343166373734393861373466393266346435333935336631656565333565616631
+63663663313439643463666235373030343139616334313362376332396134623533373264366662
+63383063363366353061333636663863663932323039313731303734643261373864383739663166
+643238633234373136623038363639656133