diff --git a/installation/mastodon.conf b/installation/mastodon.conf
index 21b6f9d46..32833fe2d 100644
--- a/installation/mastodon.conf
+++ b/installation/mastodon.conf
@@ -15,8 +15,8 @@ map $http_upgrade $connection_upgrade {
 # ActivityPub routing.
 map $http_accept $activitypub_location {
   default @soapbox;
-  "application/activity+json" @proxy;
-  'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' @proxy;
+  "application/activity+json" @mastodon;
+  'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' @mastodon;
 }
 
 upstream backend {
@@ -83,7 +83,7 @@ server {
   # Mastodon backend routes.
   # These are routes to Mastodon's API and important rendered pages.
   location ~ ^/(api|oauth|auth|admin|pghero|sidekiq|manifest.json|nodeinfo|.well-known/(webfinger|host-meta|nodeinfo|change-password)|@(.+)/embed$) {
-    try_files /dev/null @proxy;
+    try_files /dev/null @mastodon;
   }
 
   # Mastodon ActivityPub routes.
@@ -131,7 +131,7 @@ server {
   }
 
   # Proxy to Mastodon's Ruby on Rails backend.
-  location @proxy {
+  location @mastodon {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;