diff --git a/www/~/%username/charts.json.spt b/www/%team/charts.json.spt
similarity index 100%
rename from www/~/%username/charts.json.spt
rename to www/%team/charts.json.spt
diff --git a/www/~/%username/receiving/index.html.spt b/www/%team/receiving/index.html.spt
similarity index 85%
rename from www/~/%username/receiving/index.html.spt
rename to www/%team/receiving/index.html.spt
index fc3f8b0eb0..f551dbda83 100644
--- a/www/~/%username/receiving/index.html.spt
+++ b/www/%team/receiving/index.html.spt
@@ -1,13 +1,14 @@
+from aspen import Response
 from gratipay.utils import get_participant
 
 [-----------------------------------------------------------------------------]
 
-participant = get_participant(state, restrict=False)
-if participant.anonymous_receiving:
-    if user.participant != participant and not user.ADMIN:
-        website.redirect('../', base_url='')
-
-banner = '~' + participant.username
+website.redirect('../', base_url='')
+team = get_team(state)
+if team.is_approved in (None, False):
+    if user.ANON:
+        raise Response(401)
+banner = team.name
 title = _("Receiving")
 
 [-----------------------------------------------------------------------------]
@@ -29,8 +30,8 @@ title = _("Receiving")
 </div>
 <div class="chart-wrapper">
     <a name="gifts"></a>
-    <h2>{{ _("Number of Patrons Per Week") }}</h2>
-    <div class="chart" data-chart="npatrons"></div>
+    <h2>{{ _("Number of Supporters Per Week") }}</h2>
+    <div class="chart" data-chart="nsupporters"></div>
     <div class="x-axis">{{ _("weeks") }}</div>
 </div>
 </div>