diff --git a/common_roles b/common_roles
index 08620f6cf..d2b41a30e 160000
--- a/common_roles
+++ b/common_roles
@@ -1 +1 @@
-Subproject commit 08620f6cf6c279e75405cd74d421c8eb28333781
+Subproject commit d2b41a30e54d825aacd26ae1fc893f4ac952af59
diff --git a/env/test/group_vars/webservers/vars.yml b/env/test/group_vars/webservers/vars.yml
index ce65a04dc..aba4047de 100644
--- a/env/test/group_vars/webservers/vars.yml
+++ b/env/test/group_vars/webservers/vars.yml
@@ -24,11 +24,11 @@ nginx_configs:
   - tacc_protected
 
 # might be better to make a usegalaxy_protected role?
-directories:
+webservers_group_directories:
   - path: /srv/nginx/tacc-protected.galaxyproject.org/root
     mode: "0755"
 
-group_files:
+webservers_group_files:
   - content: |
       ##
       ## This file is maintained by Ansible - CHANGES WILL BE OVERWRITTEN
@@ -43,7 +43,7 @@ group_files:
     dest: "/srv/nginx/tacc-protected.galaxyproject.org/root/index.html"
     mode: "0444"
 
-group_templates:
+webservers_group_templates:
   - src: templates/nginx/nginx_galaxy.pam.j2
     dest: /etc/pam.d/nginx_galaxy
     mode: "0444"