diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index c1ca95d8df..159c07143f 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -20,78 +20,78 @@
 
   # Various app redirects
   - role: httpd/redirect
-    name: community
+    shortname: community
     website: admin.fedoraproject.org
     path: /community
     target: https://apps.fedoraproject.org/packages
 
   - role: httpd/redirect
-    name: nagios
+    shortname: nagios
     website: admin.fedoraproject.org
     path: /nagios
     target: https://nagios.fedoraproject.org/nagios/
 
   - role: httpd/redirect
-    name: docs
+    shortname: docs
     website: fedoraproject.org
     path: /docs
     target: https://docs.fedoraproject.org/
 
   - role: httpd/redirect
-    name: elections
+    shortname: elections
     website: admin.fedoraproject.org
     path: /voting
     target: https://admin.fedoraproject.org/voting
 
   - role: httpd/redirect
-    name: people-fp-o
+    shortname: people-fp-o
     website: people.fedoraproject.org
     target: https://fedorapeople.org/
 
   - role: httpd/redirect
-    name: fas
+    shortname: fas
     website: fas.fedoraproject.org
     target: https://admin.fedoraproject.org/accounts/
 
   - role: httpd/redirectmatch
-    name: codecs
+    shortname: codecs
     website: codecs.fedoraproject.org
     regex: ^.*/(.*openh264.*.rpm$)
     target: http://ciscobinary.openh264.org/$1
 
   - role: httpd/redirectmatch
-    name: fpaste
+    shortname: fpaste
     website: fpaste.org
     regex: /(.*)$
     target: https://paste.fedoraproject.org/$1
 
   - role: httpd/redirectmatch
-    name: mailman
+    shortname: mailman
     website: admin.fedoraproject.org
     regex: /mailman/(.*)$
     target: https://lists.fedoraproject.org/mailman/$1
 
   - role: httpd/redirectmatch
-    name: mailman-pipermail
+    shortname: mailman-pipermail
     website: admin.fedoraproject.org
     regex: /pipermail/(.*)$
     target: https://lists.fedoraproject.org/pipermail/$1
 
   - role: httpd/redirectmatch
-    name: 00-bodhi2-cutover-users
+    shortname: 00-bodhi2-cutover-users
     website: admin.fedoraproject.org
     regex: /updates/user/(.*)$
     target: https://bodhi.fedoraproject.org/users/$1
 
   - role: httpd/redirectmatch
-    name: 01-bodhi2-cutover-comments-list
+    shortname: 01-bodhi2-cutover-comments-list
     website: admin.fedoraproject.org
     regex: /updates/comments$
     target: https://bodhi.fedoraproject.org/comments/
 
   # This one is sub-optimal, but we have no way to map /mine to /$username
   - role: httpd/redirectmatch
-    name: 02-bodhi2-mine-fallback
+    shortname: 02-bodhi2-mine-fallback
     website: admin.fedoraproject.org
     regex: /updates/mine$
     target: https://bodhi.fedoraproject.org/
@@ -99,166 +99,166 @@
   # This is similar to /mine.  Ideally, we would redirect to
   # /overrides/?user=$USERNAME, but we can't get that username afaik.
   - role: httpd/redirectmatch
-    name: 03-bodhi2-cutover-overrides-list
+    shortname: 03-bodhi2-cutover-overrides-list
     website: admin.fedoraproject.org
     regex: /updates/override/list$
     target: https://bodhi.fedoraproject.org/overrides/
 
   - role: httpd/redirectmatch
-    name: 04-bodhi2-new-update-gotcha
+    shortname: 04-bodhi2-new-update-gotcha
     website: admin.fedoraproject.org
     regex: /updates/new/*$
     target: https://bodhi.fedoraproject.org/updates/new
 
   - role: httpd/redirectmatch
-    name: 05-bodhi2-api-version
+    shortname: 05-bodhi2-api-version
     website: admin.fedoraproject.org
     regex: /updates/api_version$
     target: https://bodhi.fedoraproject.org/api_version
 
   - role: httpd/redirectmatch
-    name: 06-bodhi2-login
+    shortname: 06-bodhi2-login
     website: admin.fedoraproject.org
     regex: /updates/login$
     target: https://bodhi.fedoraproject.org/login
 
   - role: httpd/redirectmatch
-    name: 07-bodhi2-logout
+    shortname: 07-bodhi2-logout
     website: admin.fedoraproject.org
     regex: /updates/logout$
     target: https://bodhi.fedoraproject.org/logout
 
   - role: httpd/redirectmatch
-    name: 08-bodhi2-rss
+    shortname: 08-bodhi2-rss
     website: admin.fedoraproject.org
     regex: /updates/rss/rss2\.0
     target: https://bodhi.fedoraproject.org/updates
 
   - role: httpd/redirectmatch
-    name: 09-bodhi2-old-search-new-search
+    shortname: 09-bodhi2-old-search-new-search
     website: admin.fedoraproject.org
     regex: /updates/search/(.+)$
     target: https://bodhi.fedoraproject.org/updates/?like=$1
 
   - role: httpd/redirectmatch
-    name: 89-bodhi2-icon
+    shortname: 89-bodhi2-icon
     website: admin.fedoraproject.org
     regex: /updates/static/images/bodhi-icon-48.png$
     target: https://apps.fedoraproject.org/img/icons/bodhi.png
 
   - role: httpd/redirectmatch
-    name: 90-bodhi2-cutover-updates
+    shortname: 90-bodhi2-cutover-updates
     website: admin.fedoraproject.org
     regex: /updates/(.+)$
     target: https://bodhi.fedoraproject.org/updates/$1
 
   - role: httpd/redirectmatch
-    name: 91-bodhi2-cutover-baseline
+    shortname: 91-bodhi2-cutover-baseline
     website: admin.fedoraproject.org
     regex: /updates/*$
     target: https://bodhi.fedoraproject.org/
 
   # See https://github.com/fedora-infra/bodhi/issues/476
   - role: httpd/redirectmatch
-    name: send-user-to-users
+    shortname: send-user-to-users
     website: bodhi.fedoraproject.org
     regex: /user/(.*)$
     target: https://bodhi.fedoraproject.org/users/$1
 
   - role: httpd/redirect
-    name: get-fedora
+    shortname: get-fedora
     website: get.fedoraproject.org
     target: https://getfedora.org/
 
   - role: httpd/redirect
-    name: flocktofedora
+    shortname: flocktofedora
     website: flocktofedora.net
     target: https://flocktofedora.org/
 
   - role: httpd/redirect
-    name: fedoramy
+    shortname: fedoramy
     website: fedora.my
     target: http://www.fedora.my/
 
   - role: httpd/redirect
-    name: copr
+    shortname: copr
     website: copr.fedoraproject.org
     target: https://copr.fedorainfracloud.org/
 
   - role: httpd/redirect
-    name: join-fedora
+    shortname: join-fedora
     website: join.fedoraproject.org
     target: https://fedoraproject.org/wiki/Join
 
   - role: httpd/redirect
-    name: get-help
+    shortname: get-help
     website: help.fedoraproject.org
     target: https://fedoraproject.org/get-help
 
   - role: httpd/redirect
-    name: l10n
+    shortname: l10n
     website: l10n.fedoraproject.org
     target: https://translate.fedoraproject.org/
 
   # This is just a redirect to developer, to make it easier for people to get
   # here from Red Hat's developers.redhat.com (ticket #5216).
   - role: httpd/redirect
-    name: developers
+    shortname: developers
     website: developers.fedoraproject.org
     target: https://developer.fedoraproject.org/
 
   # Redirect fudcon.fedoraproject.org to flocktofedora.org
   - role: httpd/redirect
-    name: fudcon
+    shortname: fudcon
     website: fudcon.fedoraproject.org
     path: /index.html
     target: https://flocktofedora.org/
 
   # Redirect specific websites from fedoraproject.org to getfedora.org
   - role: httpd/redirect
-    name: main-fedoraproject
+    shortname: main-fedoraproject
     website: fedoraproject.org
     path: /index.html
     target: https://getfedora.org/
 
   - role: httpd/redirect
-    name: get-fedora-old
+    shortname: get-fedora-old
     website: fedoraproject.org
     path: /get-fedora
     target: https://getfedora.org/
 
   - role: httpd/redirect
-    name: sponsors
+    shortname: sponsors
     website: fedoraproject.org
     path: /sponsors
     target: https://getfedora.org/sponsors
 
   - role: httpd/redirect
-    name: code-of-conduct
+    shortname: code-of-conduct
     website: fedoraproject.org
     path: /code-of-conduct
     target: https://docs.fedoraproject.org/fedora-project/project/code-of-conduct.html
 
   - role: httpd/redirect
-    name: code-of-conduct-2
+    shortname: code-of-conduct-2
     website: getfedora.org
     path: /code-of-conduct
     target: https://docs.fedoraproject.org/fedora-project/project/code-of-conduct.html
 
   - role: httpd/redirect
-    name: verify
+    shortname: verify
     website: fedoraproject.org
     path: /verify
     target: https://getfedora.org/verify
 
   - role: httpd/redirect
-    name: keys
+    shortname: keys
     website: fedoraproject.org
     path: /keys
     target: https://getfedora.org/keys
 
   - role: httpd/redirect
-    name: release-banner
+    shortname: release-banner
     website: fedoraproject.org
     path: /static/js/release-counter-ext.js
     target: https://getfedora.org/static/js/release-counter-ext.js
@@ -269,77 +269,77 @@
 # This should be disabled when there is a prerelease
 
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-ws
+#    shortname: prerelease-to-final-gfo-ws
 #    website: getfedora.org
 #    regex: /(.*)workstation/prerelease.*$
 #    target: https://stg.getfedora.org/$1/workstation
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-srv
+#    shortname: prerelease-to-final-gfo-srv
 #    website: getfedora.org
 #    regex: /(.*)server/prerelease.*$
 #    target: https://stg.getfedora.org/$1/server
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-atomic
+#    shortname: prerelease-to-final-gfo-atomic
 #    website: getfedora.org
 #    regex: /(.*)atomic/prerelease.*$
 #    target: https://stg.getfedora.org/$1/atomic
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-1
+#    shortname: prerelease-to-final-labs-1
 #    website: labs.fedoraproject.org
 #    regex: /(.*)prerelease.*$
 #    target: https://labs.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-1
+#    shortname: prerelease-to-final-spins-1
 #    website: spins.fedoraproject.org
 #    regex: /(.*)prerelease.*$
 #    target: https://spins.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-1
+#    shortname: prerelease-to-final-arm-1
 #    website: arm.fedoraproject.org
 #    regex: /(.*)prerelease.*$
 #    target: https://arm.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-2
+#    shortname: prerelease-to-final-labs-2
 #    website: labs.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://labs.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-2
+#    shortname: prerelease-to-final-spins-2
 #    website: spins.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://spins.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-2
+#    shortname: prerelease-to-final-arm-2
 #    website: arm.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://arm.stg.fedoraproject.org/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: cloud-to-atomic
+#    shortname: cloud-to-atomic
 #    website: getfedora.org
 #    regex: /cloud/.*$
 #    target: https://alt.stg.fedoraproject.org/cloud/$1
 #    when: env == 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: cloud-to-atomic-download
+#    shortname: cloud-to-atomic-download
 #    website: getfedora.org
 #    regex: /(.*)/cloud/download.*$
 #    target: https://alt.stg.fedoraproject.org/$1/cloud
@@ -348,103 +348,103 @@
 # end staging
 
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-ws
+#    shortname: prerelease-to-final-gfo-ws
 #    website: getfedora.org
 #    regex: /(.*)workstation/prerelease.*$
 #    target: https://getfedora.org/$1/workstation
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-srv
+#    shortname: prerelease-to-final-gfo-srv
 #    website: getfedora.org
 #    regex: /(.*)server/prerelease.*$
 #    target: https://getfedora.org/$1/server
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo-atomic
+#    shortname: prerelease-to-final-gfo-atomic
 #    website: getfedora.org
 #    regex: /(.*)atomic/prerelease.*$
 #    target: https://getfedora.org/$1/atomic
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-1
+#    shortname: prerelease-to-final-labs-1
 #    website: labs.fedoraproject.org
 #    regex: /(.*)/prerelease.*$
 #    target: https://labs.fedoraproject.org/$1
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-1
+#    shortname: prerelease-to-final-spins-1
 #    website: spins.fedoraproject.org
 #    regex: /(.*)/prerelease.*$
 #    target: https://spins.fedoraproject.org/$1
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-1
+#    shortname: prerelease-to-final-arm-1
 #    website: arm.fedoraproject.org
 #    regex: /(.*)/prerelease.*$
 #    target: https://arm.fedoraproject.org/$1
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-2
+#    shortname: prerelease-to-final-labs-2
 #    website: labs.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://labs.fedoraproject.org/$1
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-2
+#    shortname: prerelease-to-final-spins-2
 #    website: spins.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://spins.fedoraproject.org/$1
 #    when: env != 'staging'
 #
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-2
+#    shortname: prerelease-to-final-arm-2
 #    website: arm.fedoraproject.org
 #    regex: /prerelease.*$
 #    target: https://arm.fedoraproject.org/$1
 #    when: env != 'staging'
 
   - role: httpd/redirectmatch
-    name: cloud-to-atomic
+    shortname: cloud-to-atomic
     website: getfedora.org
     regex: /cloud/.*$
     target: https://alt.fedoraproject.org/cloud/$1
     when: env != 'staging'
 
   - role: httpd/redirectmatch
-    name: cloud-to-atomic-download
+    shortname: cloud-to-atomic-download
     website: getfedora.org
     regex: /(.*)/cloud/download.*$
     target: https://alt.fedoraproject.org/$1/cloud
     when: env != 'staging'
 
   - role: httpd/redirect
-    name: store
+    shortname: store
     website: store.fedoraproject.org
     target: "https://redhat.corpmerchandise.com/ProductList.aspx?did=20588"
 
   # Fonts on the wiki
   - role: httpd/redirect
-    name: fonts-wiki
+    shortname: fonts-wiki
     website: fonts.fedoraproject.org
     target: https://fedoraproject.org/wiki/Category:Fonts_SIG
 
   # Releng
   - role: httpd/redirect
-    name: nightly
+    shortname: nightly
     website: nightly.fedoraproject.org
     target: https://www.happyassassin.net/nightlies.html
 
   # We retired releng-dash in favor of PDC
   # https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject.org/thread/LOWVTF6WTS43LNPWDEISLXUELXAH5YXR/#LOWVTF6WTS43LNPWDEISLXUELXAH5YXR
   - role: httpd/redirect
-    name: releng-dash
+    shortname: releng-dash
     website: apps.fedoraproject.org
     path: /releng-dash
     target: https://pdc.fedoraproject.org/
@@ -452,37 +452,37 @@
 
   # Send fp.com to fp.org
   - role: httpd/redirect
-    name: site
+    shortname: site
     website: fedoraproject.com
     target: https://getfedora.org/
 
   # Planet/people convenience
   - role: httpd/redirect
-    name: infofeed
+    shortname: infofeed
     website: fedoraproject.org
     path: /infofeed
     target: http://fedoraplanet.org/infofeed
 
   - role: httpd/redirect
-    name: people
+    shortname: people
     website: fedoraproject.org
     path: /people
     target: http://fedoraplanet.org/
 
   - role: httpd/redirect
-    name: fedorapeople
+    shortname: fedorapeople
     website: fedoraproject.org
     path: /fedorapeople
     target: http://fedoraplanet.org/
 
   - role: httpd/redirect
-    name: planet.fedoraproject.org
+    shortname: planet.fedoraproject.org
     website: planet.fedoraproject.org
     target: http://fedoraplanet.org/
 
   # QA
   - role: httpd/redirect
-    name: qa
+    shortname: qa
     website: qa.fedoraproject.org
     target: https://fedoraproject.org/wiki/QA
     when: env != 'staging'
@@ -490,47 +490,47 @@
 
   # Various community sites
   - role: httpd/redirect
-    name: it-fedoracommunity-redirect
+    shortname: it-fedoracommunity-redirect
     website: it.fedoracommunity.org
     target: http://www.fedoraonline.it/
 
   - role: httpd/redirect
-    name: uk-fedoracommunity-redirect
+    shortname: uk-fedoracommunity-redirect
     website: uk.fedoracommunity.org
     target: http://www.fedora-uk.org/
 
   - role: httpd/redirect
-    name: tw-fedoracommunity-redirect
+    shortname: tw-fedoracommunity-redirect
     website: tw.fedoracommunity.org
     target: https://fedora-tw.org/
 
   # Spins
   - role: httpd/redirect
-    name: kde
+    shortname: kde
     website: kde.fedoraproject.org
     target: https://spins.fedoraproject.org/kde/
 
 
   # Various sites that we are friends with
   - role: httpd/redirect
-    name: port389
+    shortname: port389
     website: port389.org
     target: http://directory.fedoraproject.org/
 
   - role: httpd/redirect
-    name: k12linux
+    shortname: k12linux
     website: k12linux.org
     target: https://fedorahosted.org/k12linux/
 
 
   # Cloudy bits
   - role: httpd/redirect
-    name: cloud-front-page
+    shortname: cloud-front-page
     website: cloud.fedoraproject.org
     target: https://alt.fedoraproject.org/cloud/
 
   - role: httpd/redirectmatch
-    name: redirect-cloudstart
+    shortname: redirect-cloudstart
     website: redirect.fedoraproject.org
     regex: /(console\.aws\.amazon\.com/ec2/v2/home.*)$
     target: https://$1
@@ -539,210 +539,210 @@
 
   # Redirects/pointers for fedora 25 BASE cloud images
   - role: httpd/redirect
-    name: cloud-base-64bit-25
+    shortname: cloud-base-64bit-25
     website: cloud.fedoraproject.org
     path: /fedora-25.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-base-64bit-25-raw
+    shortname: cloud-base-64bit-25-raw
     website: cloud.fedoraproject.org
     path: /fedora-25.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz
 
   # Redirects/pointers for fedora 24 BASE cloud images
   - role: httpd/redirect
-    name: cloud-base-64bit-24
+    shortname: cloud-base-64bit-24
     website: cloud.fedoraproject.org
     path: /fedora-24.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-base-64bit-24-raw
+    shortname: cloud-base-64bit-24-raw
     website: cloud.fedoraproject.org
     path: /fedora-24.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz
 
   # Redirects/pointers for fedora 23 BASE cloud images
   - role: httpd/redirect
-    name: cloud-base-64bit-23
+    shortname: cloud-base-64bit-23
     website: cloud.fedoraproject.org
     path: /fedora-23.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-23-20151030.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-base-64bit-23-raw
+    shortname: cloud-base-64bit-23-raw
     website: cloud.fedoraproject.org
     path: /fedora-23.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-23-20151030.x86_64.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-23-raw
+    shortname: cloud-base-32bit-23-raw
     website: cloud.fedoraproject.org
     path: /fedora-23.i386.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/i386/Images/Fedora-Cloud-Base-23-20151030.i386.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-23
+    shortname: cloud-base-32bit-23
     website: cloud.fedoraproject.org
     path: /fedora-23.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/i386/Images/Fedora-Cloud-Base-23-20151030.i386.qcow2
 
   # Redirects/pointers for fedora 23 ATOMIC cloud images
   - role: httpd/redirect
-    name: cloud-atomic-64bit-23
+    shortname: cloud-atomic-64bit-23
     website: cloud.fedoraproject.org
     path: /fedora-atomic-23.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Atomic-23-20151030.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-atomic-64bit-23-raw
+    shortname: cloud-atomic-64bit-23-raw
     website: cloud.fedoraproject.org
     path: /fedora-atomic-23.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Atomic-23-20151030.x86_64.raw.xz
 
   # Redirects/pointers for fedora 22 BASE cloud images
   - role: httpd/redirect
-    name: cloud-base-64bit-22
+    shortname: cloud-base-64bit-22
     website: cloud.fedoraproject.org
     path: /fedora-22.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-base-64bit-22-raw
+    shortname: cloud-base-64bit-22-raw
     website: cloud.fedoraproject.org
     path: /fedora-22.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-22-raw
+    shortname: cloud-base-32bit-22-raw
     website: cloud.fedoraproject.org
     path: /fedora-22.i386.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-22
+    shortname: cloud-base-32bit-22
     website: cloud.fedoraproject.org
     path: /fedora-22.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2
 
   # Redirects/pointers for fedora 22 ATOMIC cloud images
   - role: httpd/redirect
-    name: cloud-atomic-64bit-22
+    shortname: cloud-atomic-64bit-22
     website: cloud.fedoraproject.org
     path: /fedora-atomic-22.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-atomic-64bit-22-raw
+    shortname: cloud-atomic-64bit-22-raw
     website: cloud.fedoraproject.org
     path: /fedora-atomic-22.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.raw.xz
 
   # Redirects/pointers for fedora 21 BASE cloud images
   - role: httpd/redirect
-    name: cloud-base-64bit-21
+    shortname: cloud-base-64bit-21
     website: cloud.fedoraproject.org
     path: /fedora-21.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-base-64bit-21-raw
+    shortname: cloud-base-64bit-21-raw
     website: cloud.fedoraproject.org
     path: /fedora-21.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-21-raw
+    shortname: cloud-base-32bit-21-raw
     website: cloud.fedoraproject.org
     path: /fedora-21.i386.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.raw.xz
 
   - role: httpd/redirect
-    name: cloud-base-32bit-21
+    shortname: cloud-base-32bit-21
     website: cloud.fedoraproject.org
     path: /fedora-21.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Base-20141203-21.i386.qcow2
 
   # Redirects/pointers for fedora 21 ATOMIC cloud images
   - role: httpd/redirect
-    name: cloud-atomic-64bit-21
+    shortname: cloud-atomic-64bit-21
     website: cloud.fedoraproject.org
     path: /fedora-atomic-21.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-atomic-64bit-21-raw
+    shortname: cloud-atomic-64bit-21-raw
     website: cloud.fedoraproject.org
     path: /fedora-atomic-21.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Atomic-20141203-21.x86_64.raw.xz
 
   # Except, there are no 32bit atomic images atm.
   #- role: httpd/redirect
-  #  name: cloud-atomic-32bit-21-raw
+  #  shortname: cloud-atomic-32bit-21-raw
   #  website: cloud.fedoraproject.org
   #  path: /fedora-atomic-21.i386.raw.xz
   #  target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.raw.xz
 
   #- role: httpd/redirect
-  #  name: cloud-atomic-32bit-21
+  #  shortname: cloud-atomic-32bit-21
   #  website: cloud.fedoraproject.org
   #  path: /fedora-atomic-21.i386.qcow2
   #  target: https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/i386/Fedora-Cloud-Atomic-20141203-21.i386.qcow2
 
   # Redirects/pointers for fedora 20 cloud images
   - role: httpd/redirect
-    name: cloud-64bit-20
+    shortname: cloud-64bit-20
     website: cloud.fedoraproject.org
     path: /fedora-20.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.qcow2
 
   - role: httpd/redirect
-    name: cloud-32bit-20
+    shortname: cloud-32bit-20
     website: cloud.fedoraproject.org
     path: /fedora-20.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.qcow2
 
   - role: httpd/redirect
-    name: cloud-64bit-20-raw
+    shortname: cloud-64bit-20-raw
     website: cloud.fedoraproject.org
     path: /fedora-20.x86_64.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.raw.xz
 
   - role: httpd/redirect
-    name: cloud-32bit-20-raw
+    shortname: cloud-32bit-20-raw
     website: cloud.fedoraproject.org
     path: /fedora-20.i386.raw.xz
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/20/Images/i386/Fedora-i386-20-20140407-sda.raw.xz
 
   # Redirects/pointers for fedora 19 cloud images
   - role: httpd/redirect
-    name: cloud-64bit-19
+    shortname: cloud-64bit-19
     website: cloud.fedoraproject.org
     path: /fedora-19.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/x86_64/Fedora-x86_64-19-20140407-sda.qcow2
 
   - role: httpd/redirect
-    name: cloud-32bit-19
+    shortname: cloud-32bit-19
     website: cloud.fedoraproject.org
     path: /fedora-19.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/updates/19/Images/i386/Fedora-i386-19-20140407-sda.qcow2
 
   # Redirects/pointers for latest fedora cloud images.
   - role: httpd/redirect
-    name: cloud-64bit-latest
+    shortname: cloud-64bit-latest
     website: cloud.fedoraproject.org
     path: /fedora-latest.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2
 
   - role: httpd/redirect
-    name: cloud-32bit-latest
+    shortname: cloud-32bit-latest
     website: cloud.fedoraproject.org
     path: /fedora-latest.i386.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/i386/Images/Fedora-Cloud-Base-22-20150521.i386.qcow2
 
   - role: httpd/redirect
-    name: cloud-atomic-64bit-latest
+    shortname: cloud-atomic-64bit-latest
     website: cloud.fedoraproject.org
     path: /fedora-atomic-latest.x86_64.qcow2
     target: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 239c8dcb33..71ced7bc63 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -47,7 +47,7 @@
   roles:
 
   - role: httpd/website
-    name: fedoraproject.org
+    site_name: fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
     server_aliases:
     - stg.fedoraproject.org
@@ -57,7 +57,7 @@
   # This is for all the other domains we own
   # that redirect to https://fedoraproject.org
   - role: httpd/website
-    name: fedoraproject.com
+    site_name: fedoraproject.com
     cert_name: "{{wildcard_cert_name}}"
     server_aliases:
     - epel.io
@@ -140,18 +140,18 @@
     - fedoraplayground.com
 
   - role: httpd/website
-    name: admin.fedoraproject.org
+    site_name: admin.fedoraproject.org
     server_aliases: [admin.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: cloud.fedoraproject.org
+    site_name: cloud.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: mirrors.fedoraproject.org
+    site_name: mirrors.fedoraproject.org
     server_aliases:
     - mirrors.stg.fedoraproject.org
     - fedoramirror.net
@@ -159,13 +159,13 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: src.fedoraproject.org
+    site_name: src.fedoraproject.org
     server_aliases: [src.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
     sslonly: true
 
   - role: httpd/website
-    name: download.fedoraproject.org
+    site_name: download.fedoraproject.org
     server_aliases:
     - download01.fedoraproject.org
     - download02.fedoraproject.org
@@ -182,13 +182,13 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: translate.fedoraproject.org
+    site_name: translate.fedoraproject.org
     server_aliases: [translate.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: spins.fedoraproject.org
+    site_name: spins.fedoraproject.org
     server_aliases:
     - spins.stg.fedoraproject.org
     - spins-test.fedoraproject.org
@@ -196,40 +196,40 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: labs.fedoraproject.org
+    site_name: labs.fedoraproject.org
     server_aliases:
     - labs.stg.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: arm.fedoraproject.org
+    site_name: arm.fedoraproject.org
     server_aliases:
     - arm.stg.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: budget.fedoraproject.org
+    site_name: budget.fedoraproject.org
     server_aliases:
     - budget.stg.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: boot.fedoraproject.org
+    site_name: boot.fedoraproject.org
     server_aliases: [boot.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: boot.fedoraproject.org
+    site_name: boot.fedoraproject.org
     server_aliases: [boot.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: smolts.org
+    site_name: smolts.org
     ssl: false
     server_aliases:
     - smolt.fedoraproject.org
@@ -238,7 +238,7 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: docs.fedoraproject.org
+    site_name: docs.fedoraproject.org
     server_aliases:
     - doc.fedoraproject.org
     - docs.stg.fedoraproject.org
@@ -246,26 +246,26 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: docs-old.fedoraproject.org
+    site_name: docs-old.fedoraproject.org
     server_aliases:
     - docs-old.stg.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: bodhi.fedoraproject.org
+    site_name: bodhi.fedoraproject.org
     sslonly: true
     server_aliases: [bodhi.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: hubs.fedoraproject.org
+    site_name: hubs.fedoraproject.org
     sslonly: true
     server_aliases: [hubs.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: flocktofedora.org
+    site_name: flocktofedora.org
     server_aliases:
     - flocktofedora.org
     - www.flocktofedora.org
@@ -275,7 +275,7 @@
     SSLCertificateChainFile: flocktofedora.org.intermediate.cert
 
   - role: httpd/website
-    name: flocktofedora.net
+    site_name: flocktofedora.net
     server_aliases:
     - flocktofedora.com
     - www.flocktofedora.net
@@ -283,25 +283,25 @@
     ssl: false
 
   - role: httpd/website
-    name: fedora.my
+    site_name: fedora.my
     server_aliases:
     - fedora.my
     ssl: false
 
   - role: httpd/website
-    name: copr.fedoraproject.org
+    site_name: copr.fedoraproject.org
     ssl: true
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: bugz.fedoraproject.org
+    site_name: bugz.fedoraproject.org
     server_aliases: [bugz.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: fas.fedoraproject.org
+    site_name: fas.fedoraproject.org
     server_aliases:
     - fas.stg.fedoraproject.org
     - accounts.fedoraproject.org
@@ -309,7 +309,7 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: fedoracommunity.org
+    site_name: fedoracommunity.org
     server_aliases:
     - www.fedoracommunity.org
     - stg.fedoracommunity.org
@@ -322,82 +322,82 @@
     SSLCertificateChainFile: fedoracommunity.org.intermediate.cert
 
   - role: httpd/website
-    name: get.fedoraproject.org
+    site_name: get.fedoraproject.org
     server_aliases: [get.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: help.fedoraproject.org
+    site_name: help.fedoraproject.org
     server_aliases: [help.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: it.fedoracommunity.org
+    site_name: it.fedoracommunity.org
     server_aliases: [it.fedoracommunity.org]
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: uk.fedoracommunity.org
+    site_name: uk.fedoracommunity.org
     server_aliases:
     - uk.fedoracommunity.org
     - www.uk.fedoracommunity.org
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: tw.fedoracommunity.org
+    site_name: tw.fedoracommunity.org
     server_aliases:
     - tw.fedoracommunity.org
     - www.tw.fedoracommunity.org
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: communityblog.fedoraproject.org
+    site_name: communityblog.fedoraproject.org
     server_aliases: [communityblog.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: people.fedoraproject.org
+    site_name: people.fedoraproject.org
     server_aliases: [people.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: join.fedoraproject.org
+    site_name: join.fedoraproject.org
     server_aliases: [join.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: l10n.fedoraproject.org
+    site_name: l10n.fedoraproject.org
     server_aliases: [l10n.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: start.fedoraproject.org
+    site_name: start.fedoraproject.org
     server_aliases: [start.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: kde.fedoraproject.org
+    site_name: kde.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: nightly.fedoraproject.org
+    site_name: nightly.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: store.fedoraproject.org
+    site_name: store.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: port389.org
+    site_name: port389.org
     server_aliases:
     - www.port389.org
     - 389tcp.org
@@ -406,7 +406,7 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: whatcanidoforfedora.org
+    site_name: whatcanidoforfedora.org
     server_aliases:
     - www.whatcanidoforfedora.org
     ssl: true
@@ -418,57 +418,57 @@
     - whatcanidoforfedora.org
 
   - role: httpd/website
-    name: fedoramagazine.org
+    site_name: fedoramagazine.org
     server_aliases: [www.fedoramagazine.org stg.fedoramagazine.org]
     cert_name: fedoramagazine.org
     SSLCertificateChainFile: fedoramagazine.org.intermediate.cert
     sslonly: true
 
   - role: httpd/website
-    name: k12linux.org
+    site_name: k12linux.org
     server_aliases:
     - www.k12linux.org
     ssl: false
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: fonts.fedoraproject.org
+    site_name: fonts.fedoraproject.org
     server_aliases: [fonts.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: meetbot.fedoraproject.org
+    site_name: meetbot.fedoraproject.org
     server_aliases: [meetbot.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: meetbot-raw.fedoraproject.org
+    site_name: meetbot-raw.fedoraproject.org
     server_aliases: [meetbot-raw.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: fudcon.fedoraproject.org
+    site_name: fudcon.fedoraproject.org
     server_aliases: [fudcon.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: ask.fedoraproject.org
+    site_name: ask.fedoraproject.org
     server_aliases: [ask.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: badges.fedoraproject.org
+    site_name: badges.fedoraproject.org
     server_aliases: [badges.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: paste.fedoraproject.org
+    site_name: paste.fedoraproject.org
     server_aliases:
     - paste.stg.fedoraproject.org
     - modernpaste.stg.fedoraproject.org
@@ -476,7 +476,7 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: awx.fedoraproject.org
+    site_name: awx.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
     tags:
@@ -487,7 +487,7 @@
 # Make a website here so we can redirect it to paste.fedoraproject.org
 #
   - role: httpd/website
-    name: fpaste.org
+    site_name: fpaste.org
     certbot: true
     server_aliases:
     - www.fpaste.org
@@ -495,7 +495,7 @@
     SSLCertificateChainFile: fpaste.org.intermediate.cert
 
   - role: httpd/website
-    name: koji.fedoraproject.org
+    site_name: koji.fedoraproject.org
     sslonly: true
     server_aliases:
     - koji.stg.fedoraproject.org
@@ -504,7 +504,7 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: s390.koji.fedoraproject.org
+    site_name: s390.koji.fedoraproject.org
     sslonly: true
     certbot: true
     server_aliases:
@@ -515,7 +515,7 @@
     - s390.koji.fedoraproject.org
 
   - role: httpd/website
-    name: kojipkgs.fedoraproject.org
+    site_name: kojipkgs.fedoraproject.org
     sslonly: true
     server_aliases:
     - kojipkgs01.fedoraproject.org
@@ -523,21 +523,21 @@
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: apps.fedoraproject.org
+    site_name: apps.fedoraproject.org
     server_aliases: [apps.stg.fedoraproject.org]
     sslonly: true
     gzip: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: pdc.fedoraproject.org
+    site_name: pdc.fedoraproject.org
     server_aliases: [pdc.stg.fedoraproject.org]
     sslonly: true
     gzip: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: developer.fedoraproject.org
+    site_name: developer.fedoraproject.org
     server_aliases: [developer.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
@@ -545,18 +545,18 @@
   # This is just a redirect to developer, to make it easier for people to get
   # here from Red Hat's developers.redhat.com (ticket #5216).
   - role: httpd/website
-    name: developers.fedoraproject.org
+    site_name: developers.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: osbs.fedoraproject.org
+    site_name: osbs.fedoraproject.org
     server_aliases: [osbs.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: os.fedoraproject.org
+    site_name: os.fedoraproject.org
     server_aliases: [os.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
@@ -564,7 +564,7 @@
     - os.fedoraproject.org
 
   - role: httpd/website
-    name: app.os.fedoraproject.org
+    site_name: app.os.fedoraproject.org
     server_aliases: ["*.app.os.fedoraproject.org", "*.app.os.stg.fedoraproject.org"]
     sslonly: true
     cert_name: "{{os_wildcard_cert_name}}"
@@ -573,39 +573,39 @@
     - app.os.fedoraproject.org
 
   - role: httpd/website
-    name: registry.fedoraproject.org
+    site_name: registry.fedoraproject.org
     server_aliases: [registry.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: registry.centos.org
+    site_name: registry.centos.org
     server_aliases: [registry.stg.centos.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: candidate-registry.fedoraproject.org
+    site_name: candidate-registry.fedoraproject.org
     server_aliases: [candidate-registry.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: retrace.fedoraproject.org
+    site_name: retrace.fedoraproject.org
     server_aliases: [retrace.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
     when: env == "staging"
 
   - role: httpd/website
-    name: faf.fedoraproject.org
+    site_name: faf.fedoraproject.org
     server_aliases: [faf.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
     when: env == "staging"
 
   - role: httpd/website
-    name: alt.fedoraproject.org
+    site_name: alt.fedoraproject.org
     server_aliases:
     - alt.stg.fedoraproject.org
     sslonly: true
@@ -615,13 +615,13 @@
   # This is inherited from our puppet setup -- we can collapse them as soon as
   # is convenient.  -- threebean
   - role: httpd/website
-    name: taskotron.fedoraproject.org
+    site_name: taskotron.fedoraproject.org
     server_aliases: [taskotron.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: taskotron.stg.fedoraproject.org
+    site_name: taskotron.stg.fedoraproject.org
     server_aliases: [taskotron.stg.fedoraproject.org]
     # Set this explicitly to stg here.. as per the original puppet config.
     SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
@@ -630,20 +630,20 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: lists.fedoraproject.org
+    site_name: lists.fedoraproject.org
     server_aliases: [lists.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: lists.fedorahosted.org
+    site_name: lists.fedorahosted.org
     server_aliases: [lists.stg.fedorahosted.org]
     sslonly: true
     SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
     cert_name: wildcard-2017.fedorahosted.org
 
   - role: httpd/website
-    name: id.fedoraproject.org
+    site_name: id.fedoraproject.org
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
     SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
@@ -652,7 +652,7 @@
     - id.fedoraproject.org
 
   - role: httpd/website
-    name: username.id.fedoraproject.org
+    site_name: username.id.fedoraproject.org
     server_aliases:
     - "*.id.fedoraproject.org"
     # Must not be sslonly, because example.id.fedoraproject.org must be reachable
@@ -664,7 +664,7 @@
     - id.fedoraproject.org
 
   - role: httpd/website
-    name: id.stg.fedoraproject.org
+    site_name: id.stg.fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
     SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
     sslonly: true
@@ -673,7 +673,7 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: username.id.stg.fedoraproject.org
+    site_name: username.id.stg.fedoraproject.org
     server_aliases:
     - "*.id.stg.fedoraproject.org"
     # Must not be sslonly, because example.id.fedoraproject.org must be reachable
@@ -685,44 +685,44 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: getfedora.org
+    site_name: getfedora.org
     server_aliases: [stg.getfedora.org]
     sslonly: true
     cert_name: getfedora.org
     SSLCertificateChainFile: getfedora.org.intermediate.cert
 
   - role: httpd/website
-    name: qa.fedoraproject.org
+    site_name: qa.fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
     sslonly: true
 
   - role: httpd/website
-    name: openqa.fedoraproject.org
+    site_name: openqa.fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
     server_aliases: [openqa.stg.fedoraproject.org]
     sslonly: true
 
   - role: httpd/website
-    name: redirect.fedoraproject.org
+    site_name: redirect.fedoraproject.org
     server_aliases: [redirect.stg.fedoraproject.org]
     sslonly: true
     gzip: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: geoip.fedoraproject.org
+    site_name: geoip.fedoraproject.org
     server_aliases: [geoip.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: codecs.fedoraproject.org
+    site_name: codecs.fedoraproject.org
     server_aliases: [codecs.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: beaker.qa.fedoraproject.org
+    site_name: beaker.qa.fedoraproject.org
     server_aliases: [beaker.qa.fedoraproject.org]
     # Set this explicitly to stg here.. as per the original puppet config.
     SSLCertificateChainFile: qa.fedoraproject.org.intermediate.cert
@@ -730,7 +730,7 @@
     cert_name: "qa.fedoraproject.org"
 
   - role: httpd/website
-    name: beaker.stg.fedoraproject.org
+    site_name: beaker.stg.fedoraproject.org
     server_aliases: [beaker.stg.fedoraproject.org]
     # Set this explicitly to stg here.. as per the original puppet config.
     SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
@@ -739,7 +739,7 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: qa.stg.fedoraproject.org
+    site_name: qa.stg.fedoraproject.org
     server_aliases: [qa.stg.fedoraproject.org]
     cert_name: qa.stg.fedoraproject.org
     SSLCertificateChainFile: qa.stg.fedoraproject.org.intermediate.cert
@@ -747,7 +747,7 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: phab.qa.stg.fedoraproject.org
+    site_name: phab.qa.stg.fedoraproject.org
     server_aliases: [phab.qa.stg.fedoraproject.org]
     cert_name: qa.stg.fedoraproject.org
     SSLCertificateChainFile: qa.stg.fedoraproject.org.intermediate.cert
@@ -755,7 +755,7 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: docs.qa.stg.fedoraproject.org
+    site_name: docs.qa.stg.fedoraproject.org
     server_aliases: [docs.qa.stg.fedoraproject.org]
     cert_name: qa.stg.fedoraproject.org
     SSLCertificateChainFile: qa.stg.fedoraproject.org.intermediate.cert
@@ -763,47 +763,47 @@
     when: env == "staging"
 
   - role: httpd/website
-    name: phab.qa.fedoraproject.org
+    site_name: phab.qa.fedoraproject.org
     server_aliases: [phab.qa.fedoraproject.org]
     cert_name: qa.fedoraproject.org
     SSLCertificateChainFile: qa.fedoraproject.org.intermediate.cert
     sslonly: true
 
   - role: httpd/website
-    name: data-analysis.fedoraproject.org
+    site_name: data-analysis.fedoraproject.org
     server_aliases: [data-analysis.stg.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: docs.qa.fedoraproject.org
+    site_name: docs.qa.fedoraproject.org
     server_aliases: [docs.qa.fedoraproject.org]
     cert_name: qa.fedoraproject.org
     SSLCertificateChainFile: qa.fedoraproject.org.intermediate.cert
     sslonly: true
 
   - role: httpd/website
-    name: nagios.fedoraproject.org
+    site_name: nagios.fedoraproject.org
     server_aliases: [nagios.stg.fedoraproject.org]
     SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: mbs.fedoraproject.org
+    site_name: mbs.fedoraproject.org
     sslonly: true
     server_aliases: [mbs.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
 
   - role: httpd/website
-    name: odcs.fedoraproject.org
+    site_name: odcs.fedoraproject.org
     sslonly: true
     server_aliases: [odcs.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
     tags: odcs
 
   - role: httpd/website
-    name: freshmaker.fedoraproject.org
+    site_name: freshmaker.fedoraproject.org
     sslonly: true
     server_aliases: [freshmaker.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
@@ -812,14 +812,14 @@
 # fedorahosted is retired. We have the site here so we can redirect it.
 
   - role: httpd/website
-    name: fedorahosted.org
+    site_name: fedorahosted.org
     sslonly: true
     server_aliases: [bzr.fedorahosted.org hg.fedorahosted.org svn.fedorahosted.org]
     SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
     cert_name: wildcard-2017.fedorahosted.org
 
   - role: httpd/website
-    name: git.fedorahosted.org
+    site_name: git.fedorahosted.org
     sslonly: true
     SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
     cert_name: wildcard-2017.fedorahosted.org
@@ -828,5 +828,5 @@
 # We only have it here so we can redirect it with the correct cert
 
   - role: httpd/website
-    name: planet.fedoraproject.org
+    site_name: planet.fedoraproject.org
     cert_name: "{{wildcard_cert_name}}"
diff --git a/roles/httpd/redirect/tasks/main.yml b/roles/httpd/redirect/tasks/main.yml
index 4df91328c5..145d7345c1 100644
--- a/roles/httpd/redirect/tasks/main.yml
+++ b/roles/httpd/redirect/tasks/main.yml
@@ -6,17 +6,17 @@
 # role only into the {{website}}/ folder for each site.
 
 # This is the only real work we do.
-- name: Copy over httpd redirect file for {{name}}
+- name: Copy over httpd redirect file for {{shortname}}
   template: >
     src={{item}}
-    dest=/etc/httpd/conf.d/{{website}}/{{name}}-redirect.conf
+    dest=/etc/httpd/conf.d/{{website}}/{{shortname}}-redirect.conf
     mode=0644
     owner=root
     group=root
   notify:
   - reload proxyhttpd
   with_first_found:
-  - redirect.{{name}}.conf
+  - redirect.{{shortname}}.conf
   - redirect.conf
   tags:
   - httpd
diff --git a/roles/httpd/redirectmatch/tasks/main.yml b/roles/httpd/redirectmatch/tasks/main.yml
index 0262e9e39a..4fe566a929 100644
--- a/roles/httpd/redirectmatch/tasks/main.yml
+++ b/roles/httpd/redirectmatch/tasks/main.yml
@@ -6,10 +6,10 @@
 # role only into the {{website}}/ folder for each site.
 
 # This is the only real work we do.
-- name: Copy over httpd redirectmatch file for {{name}}
+- name: Copy over httpd redirectmatch file for {{shortname}}
   template: >
     src=redirectmatch.conf
-    dest=/etc/httpd/conf.d/{{website}}/{{name}}-redirectmatch.conf
+    dest=/etc/httpd/conf.d/{{website}}/{{shortname}}-redirectmatch.conf
     mode=0644
     owner=root
     group=root
diff --git a/roles/httpd/website/tasks/main.yml b/roles/httpd/website/tasks/main.yml
index 1a65aa5891..eb90011fe9 100644
--- a/roles/httpd/website/tasks/main.yml
+++ b/roles/httpd/website/tasks/main.yml
@@ -1,5 +1,5 @@
 # Expected vars
-# - name...
+# - site_name...
 # - cert_name...
 # - server_aliases: []
 # - server_admin: webmaster@fedoraproject.org
@@ -8,9 +8,9 @@
 # - SSLCertificateChainFile: ""
 # - gzip: false
 
-- name: Create site directory in httpd/conf.d/{{name}}
+- name: Create site directory in httpd/conf.d/{{site_name}}
   file: >
-    dest=/etc/httpd/conf.d/{{name}}
+    dest=/etc/httpd/conf.d/{{site_name}}
     state=directory
     owner=root
     group=root
@@ -23,10 +23,10 @@
 
 # TODO - copy in Httpd::Certificate
 
-- name: Copy over primary template for {{name}}
+- name: Copy over primary template for {{site_name}}
   template: >
     src=website.conf
-    dest=/etc/httpd/conf.d/{{name}}.conf
+    dest=/etc/httpd/conf.d/{{site_name}}.conf
     owner=root
     group=root
     mode=0644
@@ -36,10 +36,10 @@
   - httpd
   - httpd/website
 
-- name: Copy over some subordinate templates for {{name}}
+- name: Copy over some subordinate templates for {{site_name}}
   template: >
     src={{item}}.conf
-    dest=/etc/httpd/conf.d/{{name}}/{{item}}.conf
+    dest=/etc/httpd/conf.d/{{site_name}}/{{item}}.conf
     owner=root
     group=root
     mode=0644
@@ -56,13 +56,13 @@
 - name: And lastly, the robots.txt file
   copy: >
     src={{item}}
-    dest=/srv/web/robots.txt.{{name}}
+    dest=/srv/web/robots.txt.{{site_name}}
     mode=0644
     owner=root
     group=root
     setype=httpd_sys_content_t
   with_first_found:
-  - robots/robots.txt.{{name}}
+  - robots/robots.txt.{{site_name}}
   - robots/robots.txt
   notify:
   - reload proxyhttpd
diff --git a/roles/httpd/website/templates/logs.conf b/roles/httpd/website/templates/logs.conf
index f4b06d9711..588792bc25 100644
--- a/roles/httpd/website/templates/logs.conf
+++ b/roles/httpd/website/templates/logs.conf
@@ -1,2 +1,2 @@
-CustomLog "logs/{{ name }}-access.log" combined
-ErrorLog "logs/{{ name }}-error.log"
+CustomLog "logs/{{ site_name }}-access.log" combined
+ErrorLog "logs/{{ site_name }}-error.log"
diff --git a/roles/httpd/website/templates/robots.conf b/roles/httpd/website/templates/robots.conf
index 040f48d397..40aa78dd1f 100644
--- a/roles/httpd/website/templates/robots.conf
+++ b/roles/httpd/website/templates/robots.conf
@@ -1 +1 @@
-Alias /robots.txt /srv/web/robots.txt.{{ name }}
+Alias /robots.txt /srv/web/robots.txt.{{ site_name }}
diff --git a/roles/httpd/website/templates/website.conf b/roles/httpd/website/templates/website.conf
index 1c747fbc6a..3ca92ddedb 100644
--- a/roles/httpd/website/templates/website.conf
+++ b/roles/httpd/website/templates/website.conf
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-  ServerName {{ name }}
+  ServerName {{ site_name }}
 {% if server_aliases %}
   ServerAlias {{ server_aliases | join(" ") }}
 {% endif %}
@@ -20,13 +20,13 @@
   RewriteCond %{REQUEST_URI} !/.well-known/acme-challenge/.*
   RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
 {% else %}
-  Include "conf.d/{{ name }}/*.conf"
+  Include "conf.d/{{ site_name }}/*.conf"
 {% endif %}
 </VirtualHost>
 
 {% if ssl %}
 <VirtualHost *:443>
-  ServerName {{ name }}
+  ServerName {{ site_name }}
 {% if server_aliases %}
   ServerAlias {{ server_aliases | join(" ") }}
 {% endif %}
@@ -57,7 +57,7 @@
 {% if sslonly %}
   Header always add Strict-Transport-Security "max-age=31536000; {% if stssubdomains %}includeSubDomains; {% endif %}preload"
 {% endif %}
-  Include "conf.d/{{ name }}/*.conf"
+  Include "conf.d/{{ site_name }}/*.conf"
 </VirtualHost>
 {% endif %}