diff --git a/packages/web/src/contexts/guild/GuildContext.tsx b/packages/web/src/contexts/guild/GuildContext.tsx
index 1e8cd60..f56c2e7 100644
--- a/packages/web/src/contexts/guild/GuildContext.tsx
+++ b/packages/web/src/contexts/guild/GuildContext.tsx
@@ -52,7 +52,7 @@ export const GuildProvider = (props: { children: React.ReactNode }) => {
         }
       }
 
-      const response = await fetch(`/get-slug/${id}`);
+      const response = await fetch(`/guilds/${id}/slug`);
       if (response.status !== 200) {
         return null;
       }
@@ -83,7 +83,7 @@ export const GuildProvider = (props: { children: React.ReactNode }) => {
       }
 
       const skipCache = uncached ? '?__no_cache' : '';
-      const response = await authedFetch(`/get-picker-data/${id}${skipCache}`);
+      const response = await authedFetch(`/guilds/${id}${skipCache}`);
       const guild: PresentableGuild = await response.json();
 
       if (response.status !== 200) {
diff --git a/packages/web/src/contexts/session/SessionContext.tsx b/packages/web/src/contexts/session/SessionContext.tsx
index 97fe55d..f4b8088 100644
--- a/packages/web/src/contexts/session/SessionContext.tsx
+++ b/packages/web/src/contexts/session/SessionContext.tsx
@@ -161,7 +161,7 @@ export const SessionContextProvider = (props: { children: React.ReactNode }) =>
         } catch (e) {
           console.error('syncSession failed', e);
           deleteSessionKey();
-          setLock(false);
+          setTimeout(() => setLock(false), 1000); // Unlock after 1s to prevent loop flood
         }
       };
 
@@ -184,7 +184,7 @@ type ServerSession = Omit<Omit<SessionData, 'tokens'>, 'flags'>;
 const fetchSession = async (
   authedFetch: SessionContextT['authedFetch']
 ): Promise<ServerSession | null> => {
-  const sessionResponse = await authedFetch('/get-session');
+  const sessionResponse = await authedFetch('/auth/session');
   if (sessionResponse.status !== 200) {
     return null;
   }
diff --git a/packages/web/src/pages/auth/login.tsx b/packages/web/src/pages/auth/login.tsx
index a7925ce..403ff0f 100644
--- a/packages/web/src/pages/auth/login.tsx
+++ b/packages/web/src/pages/auth/login.tsx
@@ -15,13 +15,13 @@ const Login = (props: { path: string }) => {
   // If ?r is in query, then let's render the slug page
   // If not, redirect.
   const [guildSlug, setGuildSlug] = React.useState<GuildSlug | null>(null);
-  const [oauthLink, setOauthLink] = React.useState(`${apiUrl}/login-bounce`);
+  const [oauthLink, setOauthLink] = React.useState(`${apiUrl}/auth/bounce`);
 
   React.useEffect(() => {
     const url = new URL(window.location.href);
     const callbackHost = new URL('/', url);
     const redirectServerID = url.searchParams.get('r');
-    const redirectUrl = `${apiUrl}/login-bounce?cbh=${callbackHost.href}`;
+    const redirectUrl = `${apiUrl}/auth/bounce?cbh=${callbackHost.href}`;
     if (!redirectServerID) {
       if (isAuthenticated) {
         redirectTo('/servers');
diff --git a/packages/web/src/pages/editor.tsx b/packages/web/src/pages/editor.tsx
index b4012cc..2c2c8a8 100644
--- a/packages/web/src/pages/editor.tsx
+++ b/packages/web/src/pages/editor.tsx
@@ -89,7 +89,7 @@ const Editor = (props: EditorProps) => {
       categories: guild.data.categories,
     };
 
-    const response = await authedFetch(`/update-guild/${serverID}`, {
+    const response = await authedFetch(`/guilds/${serverID}`, {
       method: 'PATCH',
       body: JSON.stringify(updatePayload),
     });
diff --git a/packages/web/src/pages/machinery/bot-join.tsx b/packages/web/src/pages/machinery/bot-join.tsx
index 6a96041..1c7aa91 100644
--- a/packages/web/src/pages/machinery/bot-join.tsx
+++ b/packages/web/src/pages/machinery/bot-join.tsx
@@ -10,7 +10,7 @@ const BotJoin = (props: { serverID: string; path: string }) => {
   }
 
   React.useEffect(() => {
-    window.location.href = `${apiUrl}/bot-join${params}`;
+    window.location.href = `${apiUrl}/auth/bot${params}`;
   }, [apiUrl, params]);
 
   return <GenericLoadingTemplate />;
diff --git a/packages/web/src/pages/picker.tsx b/packages/web/src/pages/picker.tsx
index 5e3bb7c..c32567d 100644
--- a/packages/web/src/pages/picker.tsx
+++ b/packages/web/src/pages/picker.tsx
@@ -65,7 +65,7 @@ const Picker = (props: PickerProps) => {
       const guildSlug = session.guilds.find((guild) => guild.id === props.serverID);
 
       if (!guildSlug) {
-        console.error({ error: 'guold not in session, 404' });
+        console.error({ error: 'guild not in session, 404' });
         return <Redirect to="/error/404" replace />;
       }
 
@@ -94,8 +94,8 @@ const Picker = (props: PickerProps) => {
     };
 
     uncacheGuild(props.serverID);
-    const response = await authedFetch(`/update-roles/${props.serverID}`, {
-      method: 'PATCH',
+    const response = await authedFetch(`/guilds/${props.serverID}/roles`, {
+      method: 'PUT',
       body: JSON.stringify(updatePayload),
     });
     if (response.status === 200) {