diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 8dd5267b0f..7432135851 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -173,7 +173,7 @@
 
 ## Copy over the services
 - name: Copy /etc/nagios/services (PHX2 specific files)
-  copy: src=nagios/services/phx2_internal/{{ item }} dest=/etc/nagios/services/{{ item }}
+  copy: src=nagios/services/iad2_internal/{{ item }} dest=/etc/nagios/services/{{ item }}
   with_items:
     - basset.cfg
     - certgetter.cfg
@@ -192,7 +192,7 @@
   - nagios_config
   - nagios_server
   - nagios_hostgroups
-  when: env == "production" and nagios_location == 'phx2_internal'
+  when: env == "production" and nagios_location == 'iad2_internal'
   notify: restart nagios
 
 - name: Copy /etc/nagios/services (IAD2 specific files)
@@ -419,7 +419,7 @@
     - phx2-hosts.cfg
     - phx2-mgmt-hosts.cfg
     - staging-hosts.cfg
-  when: env == "production" and nagios_location == 'phx2_internal'
+  when: env == "production" and nagios_location == 'iad2_internal'
   tags:
   - nagios_server
   - nagios_config
@@ -479,7 +479,7 @@
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - phx2-mgmt.cfg
-  when: nagios_location == 'phx2_internal'
+  when: nagios_location == 'iad2_internal'
   tags:
   - nagios_server
   - nagios_config
diff --git a/roles/nagios_server/templates/httpd/nagios.conf.j2 b/roles/nagios_server/templates/httpd/nagios.conf.j2
index c5ad54f41e..08735c6bbf 100644
--- a/roles/nagios_server/templates/httpd/nagios.conf.j2
+++ b/roles/nagios_server/templates/httpd/nagios.conf.j2
@@ -8,7 +8,7 @@ Alias /robots.txt /var/www/robots.txt
 
 <Location /nagios>
   AuthName "Nagios GSSAPI Login"
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   GssapiCredStore keytab:/etc/krb5.HTTP_nagios{{env_suffix}}.fedoraproject.org.keytab
   # This is off because Apache (and thus mod_auth_gssapi) doesn't know this is proxied over TLS
   GssapiSSLonly Off
diff --git a/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2
index c9a3f83dcb..631200cd5c 100644
--- a/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/bodhost-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'bodhost' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2
index 713a5c1932..bebe68e58c 100644
--- a/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/dedicatedsolutions-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'dedicatedsolutions' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
index 92a56c4e9b..8e6c661e9e 100644
--- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
@@ -7,7 +7,7 @@ define host {
   alias                        PHX2 Router
   use                          mincheck
   check_command                check-host-alive4
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   address                      10.5.126.254
 {% else %}
   address                      66.187.228.248
@@ -25,7 +25,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      152.19.134.129
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -41,7 +41,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      67.219.144.65
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -58,7 +58,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      185.141.164.1
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% else %}
   parents                      ibiblio-gw
@@ -73,7 +73,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      85.236.55.1
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -90,7 +90,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      140.211.169.193
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -107,7 +107,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      209.132.190.196
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -124,7 +124,7 @@ define host {
   use                          mincheck
   check_command                check-host-alive4
   address                      8.43.85.254
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
diff --git a/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2
index b48ed27be5..cdbf7a268b 100644
--- a/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/host1plus-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'host1plus' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2
index 2d0fa73e19..c503ed4ccf 100644
--- a/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/ibiblio-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'ibiblio' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
index 8570c56ef3..c65e82cf35 100644
--- a/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/internetx-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'internetx' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2
index c00161e7e4..cfe6de2624 100644
--- a/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/osuosl-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'osuosl' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2
index 98f12e9dbd..3d1d3a2898 100644
--- a/roles/nagios_server/templates/nagios/hosts/other.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/other.cfg.j2
@@ -3,7 +3,7 @@ define host {
   alias                        status.fedoraproject.org
   use                          mincheck
   address                      d6tcqd4og8l21.cloudfront.net
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -17,7 +17,7 @@ define host {
   alias                        cdn.registry.fedoraproject.org
   use                          mincheck
   address                      cdn.registry.fedoraproject.org
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
@@ -31,7 +31,7 @@ define host {
   alias                        lists.fedoraproject.org
   use                          mincheck
   address                      lists.fedoraproject.org
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
   parents                      phx2-gw
 {% elif vars['nagios_location'] == 'iad2_internal' %}
   parents                      iad2-gw
diff --git a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
index 4f17b280a6..32a0bc97a3 100644
--- a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'rdu-cc' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' or vars['nagios_location'] == 'iad2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' or vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2
index 2c4a6baaf1..f306dc96e8 100644
--- a/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/rdu-hosts.cfg.j2
@@ -1,7 +1,7 @@
 {% for host in groups['all']|sort %}
 {% if hostvars[host].datacenter == 'rdu' and hostvars[host].nagios_Can_Connect == true %}
 define host {
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
    use                     defaulttemplate
 {% else %}
   use                          mincheck
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 6be32d83d9..687188ed6c 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -151,7 +151,7 @@ define service {
   use                   websitetemplate
 }
 
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
 ##
 ## Other Frontend Websites 
 
@@ -313,7 +313,7 @@ define service {
 
 {% endif %}
 
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
 
 define service {
   host_name             mailman01.phx2.fedoraproject.org
diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
index 3d9a7b489a..9dd7609f79 100644
--- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
+++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
@@ -445,7 +445,7 @@ command[service_rsyslog_restart]=/usr/bin/sudo /sbin/service rsyslog restart
 #command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
 #command[check_procs]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
 
-{% if vars['nagios_location'] == 'phx2_internal' %}
+{% if vars['nagios_location'] == 'iad2_internal' %}
 command[check_pgsql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/db-fas01.phx2.fedoraproject.org/fas2.db
 {% elif vars['nagios_location'] == 'iad2_internal' %}
 command[check_pgsql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/db-fas01.iad2.fedoraproject.org/fas2.db