diff --git a/src/app/admin/photos/page.tsx b/src/app/admin/photos/page.tsx
index 05095329..c7caf9df 100644
--- a/src/app/admin/photos/page.tsx
+++ b/src/app/admin/photos/page.tsx
@@ -22,7 +22,7 @@ import {
 import { AiOutlineEyeInvisible } from 'react-icons/ai';
 import {
   PaginationParams,
-  getPaginationForSearchParams,
+  getPaginationFromSearchParams,
 } from '@/site/pagination';
 import AdminGrid from '@/admin/AdminGrid';
 import DeleteButton from '@/admin/DeleteButton';
@@ -32,14 +32,15 @@ import { PRO_MODE_ENABLED } from '@/site/config';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import IconGrSync from '@/site/IconGrSync';
 import { getStoragePhotoUrlsNoStore } from '@/services/storage/cache';
-import MoreComponentsClient from '@/components/MoreComponentsClient';
+import MoreComponentsFromSearchParams from
+  '@/components/MoreComponentsFromSearchParams';
 
 const DEBUG_PHOTO_BLOBS = false;
 
 export default async function AdminPhotosPage({
   searchParams,
 }: PaginationParams) {
-  const { offset, limit } = getPaginationForSearchParams(searchParams);
+  const { offset, limit } = getPaginationFromSearchParams(searchParams);
 
   const [
     photos,
@@ -145,7 +146,7 @@ export default async function AdminPhotosPage({
                 </Fragment>)}
             </AdminGrid>
             {showMorePhotos &&
-              <MoreComponentsClient
+              <MoreComponentsFromSearchParams
                 label="More photos"
                 path={pathForAdminPhotos(offset + 1)}
               />}
diff --git a/src/app/og/page.tsx b/src/app/og/page.tsx
index ad856871..b99fba93 100644
--- a/src/app/og/page.tsx
+++ b/src/app/og/page.tsx
@@ -1,14 +1,15 @@
 import { getPhotosCached, getPhotosCountCached } from '@/photo/cache';
-import MoreComponentsClient from '@/components/MoreComponentsClient';
+import MoreComponentsFromSearchParams from
+  '@/components/MoreComponentsFromSearchParams';
 import StaggeredOgPhotos from '@/photo/StaggeredOgPhotos';
 import {
   PaginationParams,
-  getPaginationForSearchParams,
+  getPaginationFromSearchParams,
 } from '@/site/pagination';
 import { pathForOg } from '@/site/paths';
 
 export default async function GridPage({ searchParams }: PaginationParams) {
-  const { offset, limit } = getPaginationForSearchParams(searchParams);
+  const { offset, limit } = getPaginationFromSearchParams(searchParams);
 
   const [
     photos,
@@ -26,7 +27,7 @@ export default async function GridPage({ searchParams }: PaginationParams) {
         <StaggeredOgPhotos photos={photos} />
       </div>
       {showMorePhotos &&
-        <MoreComponentsClient
+        <MoreComponentsFromSearchParams
           label="More photos"
           path={pathForOg(offset + 1)}
         />}
diff --git a/src/camera/data.ts b/src/camera/data.ts
index 27b31f79..5e8ea18c 100644
--- a/src/camera/data.ts
+++ b/src/camera/data.ts
@@ -1,6 +1,6 @@
 import { 
   PaginationSearchParams,
-  getPaginationForSearchParams,
+  getPaginationFromSearchParams,
 } from '@/site/pagination';
 import { Camera } from '.';
 import {
@@ -32,7 +32,7 @@ export const getPhotosCameraDataCachedWithPagination = async ({
   limit?: number,
   searchParams?: PaginationSearchParams,
 }) => {
-  const { offset, limit } = getPaginationForSearchParams(searchParams);
+  const { offset, limit } = getPaginationFromSearchParams(searchParams);
 
   const [photos, count, dateRange] =
     await getPhotosCameraDataCached({
diff --git a/src/components/MoreComponentsClient.tsx b/src/components/MoreComponentsFromSearchParams.tsx
similarity index 96%
rename from src/components/MoreComponentsClient.tsx
rename to src/components/MoreComponentsFromSearchParams.tsx
index 542ce57c..68b90e4d 100644
--- a/src/components/MoreComponentsClient.tsx
+++ b/src/components/MoreComponentsFromSearchParams.tsx
@@ -4,7 +4,7 @@ import { useRouter } from 'next/navigation';
 import { useCallback, useEffect, useRef, useTransition } from 'react';
 import Spinner from './Spinner';
 
-export default function MoreComponentsClient({
+export default function MoreComponentsFromSearchParams({
   path,
   label = 'Load more',
   triggerOnView = true,
diff --git a/src/simulation/data.ts b/src/simulation/data.ts
index 60b2407e..a84ac22f 100644
--- a/src/simulation/data.ts
+++ b/src/simulation/data.ts
@@ -5,7 +5,7 @@ import {
 } from '@/photo/cache';
 import {
   PaginationSearchParams,
-  getPaginationForSearchParams,
+  getPaginationFromSearchParams,
 } from '@/site/pagination';
 import { pathForFilmSimulation } from '@/site/paths';
 import { FilmSimulation } from '.';
@@ -32,7 +32,7 @@ export const getPhotosFilmSimulationDataCachedWithPagination = async ({
   limit?: number,
   searchParams?: PaginationSearchParams,
 }) => {
-  const { offset, limit } = getPaginationForSearchParams(searchParams);
+  const { offset, limit } = getPaginationFromSearchParams(searchParams);
 
   const [photos, count, dateRange] =
     await getPhotosFilmSimulationDataCached({
diff --git a/src/site/pagination.ts b/src/site/pagination.ts
index faa858d4..1ff9b9ae 100644
--- a/src/site/pagination.ts
+++ b/src/site/pagination.ts
@@ -4,7 +4,7 @@ export interface PaginationParams {
   searchParams?: PaginationSearchParams
 }
 
-export const getPaginationForSearchParams = (
+export const getPaginationFromSearchParams = (
   query?: PaginationSearchParams,
   limitPerOffset = 24,
 ) => {
diff --git a/src/tag/data.ts b/src/tag/data.ts
index 6396f9b2..c5ddf555 100644
--- a/src/tag/data.ts
+++ b/src/tag/data.ts
@@ -5,7 +5,7 @@ import {
 } from '@/photo/cache';
 import {
   PaginationSearchParams,
-  getPaginationForSearchParams,
+  getPaginationFromSearchParams,
 } from '@/site/pagination';
 import { pathForTag } from '@/site/paths';
 
@@ -31,7 +31,7 @@ export const getPhotosTagDataCachedWithPagination = async ({
   limit?: number,
   searchParams?: PaginationSearchParams,
 }) => {
-  const { offset, limit } = getPaginationForSearchParams(searchParams);
+  const { offset, limit } = getPaginationFromSearchParams(searchParams);
 
   const [photos, count, dateRange] =
     await getPhotosTagDataCached({