diff --git a/cloudlab-compute.yml b/cloudlab-compute.yml
index 35006b0..016951e 100644
--- a/cloudlab-compute.yml
+++ b/cloudlab-compute.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: cloudlab-head
+- hosts: head
   sudo: no
   tasks:
   - pause: "Install nova-compute on all unused machines managed by Juju"
@@ -17,7 +17,7 @@
     script: scripts/wait-for-services.sh
 
 # Play: set up ansible-pull for OpenCloud-specific files on nova-compute nodes
-- hosts: cloudlab-compute
+- hosts: compute
   sudo: yes
   vars:
 
diff --git a/cloudlab-hosts b/cloudlab-hosts
index 68f772d..963b8b3 100644
--- a/cloudlab-hosts
+++ b/cloudlab-hosts
@@ -1,5 +1,4 @@
-[cloudlab-head]
-ctl.install.xos-pg0.clemson.cloudlab.us
+head    ansible_ssh_host=ctl.install.xos-pg0.clemson.cloudlab.us
 
-[cloudlab-compute]
+[compute]
 cp-1.install.xos-pg0.clemson.cloudlab.us
diff --git a/cloudlab-setup.yml b/cloudlab-setup.yml
index 06981de..e32969b 100644
--- a/cloudlab-setup.yml
+++ b/cloudlab-setup.yml
@@ -1,7 +1,7 @@
 ---
 # Play: set up head node
 # Assumes basic /etc/ansible/hosts file
-- hosts: cloudlab-head
+- hosts: head
   sudo: yes
   tasks:
 
@@ -103,7 +103,7 @@
     shell: killall -HUP dnsmasq
 
 # Play: Install services using Juju
-- hosts: cloudlab-head
+- hosts: head
   vars:
     charm_src: /usr/local/src/charms/trusty
   tasks:
@@ -146,7 +146,7 @@
     script: scripts/wait-for-services.sh
 
 # Play: Use libvirt hooks to set up iptables
-- hosts: cloudlab-head
+- hosts: head
   sudo: yes
   tasks:
   - name: Enable port forwarding for services
@@ -168,7 +168,7 @@
     shell: /etc/libvirt/hooks/qemu start start
 
 # Play: Create credentials, set up some basic OpenStack
-- hosts: cloudlab-head
+- hosts: head
   sudo: no
   tasks:
 
@@ -215,18 +215,18 @@
     shell: update-ca-certificates
     sudo: yes
 
-- hosts: cloudlab-compute
+- hosts: compute
   sudo: yes
   vars:
-    control_net: "{{ hostvars['ctl.install.xos-pg0.clemson.cloudlab.us']['ansible_virbr0']['ipv4']['network'] }}/24"
-    gateway: "{{ hostvars['ctl.install.xos-pg0.clemson.cloudlab.us']['ansible_default_ipv4']['address'] }}"
+    control_net: "{{ hostvars['head']['ansible_virbr0']['ipv4']['network'] }}/24"
+    gateway: "{{ hostvars['head']['ansible_default_ipv4']['address'] }}"
   tasks:
   - name: Install package needed by Juju
     apt: name=python-yaml state=present
 
   - name: Add key
     authorized_key: user="{{ ansible_env['SUDO_USER'] }}"
-      key="{{ hostvars['ctl.install.xos-pg0.clemson.cloudlab.us']['sshkey']['stdout'] }}"
+      key="{{ hostvars['head']['sshkey']['stdout'] }}"
 
   - name: Add route via /etc/rc.local
     template: src=templates/etc/rc.local.cloudlab