Merge "Update Ansible playbooks to new names"