diff --git a/cypress/e2e/dashboard.cy.ts b/cypress/e2e/dashboard.cy.ts
index 286cb91..ff27368 100644
--- a/cypress/e2e/dashboard.cy.ts
+++ b/cypress/e2e/dashboard.cy.ts
@@ -5,18 +5,18 @@ describe('template spec', () => {
         cy.intercept(
             {
                 method: 'GET',
-                url: `${PATHS.CELL}`,
+                url: `${PATHS.Cell}`,
             },
-            { fixture: PATHS.CELL.replace(/^\//, '') },
+            { fixture: PATHS.Cell.replace(/^\//, '') },
         )
         cy.intercept(
             {
                 method: 'GET',
-                url: `${PATHS.CELL}/*`,
+                url: `${PATHS.Cell}/*`,
             },
             async (req) => {
                 const id = req.url.split('/').pop()
-                const cells = await cy.fixture(PATHS.CELL.replace(/^\//, ''))
+                const cells = await cy.fixture(PATHS.Cell.replace(/^\//, ''))
                 req.reply({
                     body: cells.results.find((cell) => cell.uuid === id),
                 })
diff --git a/src/App.tsx b/src/App.tsx
index b7a8110..a8d75be 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -118,7 +118,7 @@ export function Core() {
             <Divider component="li" key="div0">
                 {open && 'Outputs'}
             </Divider>
-            {[LOOKUP_KEYS.EXPERIMENT, LOOKUP_KEYS.CYCLER_TEST].map(
+            {[LOOKUP_KEYS.Experiment, LOOKUP_KEYS.CyclerTest].map(
                 (lookupKey) => (
                     <LI key={lookupKey} lookupKey={lookupKey} />
                 ),
@@ -127,11 +127,11 @@ export function Core() {
                 {open && 'Resources'}
             </Divider>
             {[
-                LOOKUP_KEYS.FILE,
-                LOOKUP_KEYS.CELL,
-                LOOKUP_KEYS.EQUIPMENT,
-                LOOKUP_KEYS.SCHEDULE,
-                LOOKUP_KEYS.ARBITRARY_FILE,
+                LOOKUP_KEYS.File,
+                LOOKUP_KEYS.Cell,
+                LOOKUP_KEYS.Equipment,
+                LOOKUP_KEYS.Schedule,
+                LOOKUP_KEYS.ArbitraryFile,
             ].map((lookupKey) => (
                 <LI key={lookupKey} lookupKey={lookupKey} />
             ))}
@@ -139,10 +139,10 @@ export function Core() {
                 {open && 'Inputs'}
             </Divider>
             {[
-                LOOKUP_KEYS.PATH,
-                LOOKUP_KEYS.VALIDATION_SCHEMA,
-                LOOKUP_KEYS.COLUMN_FAMILY,
-                LOOKUP_KEYS.UNIT,
+                LOOKUP_KEYS.Path,
+                LOOKUP_KEYS.ValidationSchema,
+                LOOKUP_KEYS.ColumnFamily,
+                LOOKUP_KEYS.Unit,
             ].map((lookupKey) => (
                 <LI key={lookupKey} lookupKey={lookupKey} />
             ))}
@@ -150,10 +150,10 @@ export function Core() {
                 {open && 'Management'}
             </Divider>
             {[
-                LOOKUP_KEYS.LAB,
-                LOOKUP_KEYS.TEAM,
-                LOOKUP_KEYS.HARVESTER,
-                LOOKUP_KEYS.ADDITIONAL_STORAGE,
+                LOOKUP_KEYS.Lab,
+                LOOKUP_KEYS.Team,
+                LOOKUP_KEYS.Harvester,
+                LOOKUP_KEYS.AdditionalStorage,
             ].map((lookupKey) => (
                 <LI key={lookupKey} lookupKey={lookupKey} />
             ))}
@@ -275,7 +275,7 @@ export function Core() {
         return (
             <ResourceCard
                 resourceId={id ?? -1}
-                lookupKey={lookupKey ?? 'CYCLER_TEST'}
+                lookupKey={lookupKey ?? 'CyclerTest'}
                 expanded={true}
                 editing={searchParams.get('editing') === 'true'}
             />
@@ -292,7 +292,7 @@ export function Core() {
             return <></>
         }
 
-        return <ResourceList lookupKey={lookupKey ?? 'CYCLER_TEST'} />
+        return <ResourceList lookupKey={lookupKey ?? 'CyclerTest'} />
     }
 
     /* A <Routes> looks through its children <Route>s and renders the first one that matches the current URL. */
@@ -302,7 +302,7 @@ export function Core() {
                 <Route path={PATHS.DASHBOARD} element={Layout}>
                     {/*<Route path={PATHS.GRAPH} element={<DatasetChart />} />*/}
                     <Route
-                        path={`${PATHS.MAPPING}/:id`}
+                        path={`${PATHS.ColumnMapping}/:id`}
                         element={<Mapping />}
                     />
                     {/* Handle direct resource lookups */}
diff --git a/src/ClientCodeDemo.tsx b/src/ClientCodeDemo.tsx
index 7d80682..34e749e 100644
--- a/src/ClientCodeDemo.tsx
+++ b/src/ClientCodeDemo.tsx
@@ -35,7 +35,7 @@ function DatasetSelector({
     fileQueryLimit?: number
 }) {
     const { useListQuery } = useFetchResource()
-    const query = useListQuery(LOOKUP_KEYS.FILE, {
+    const query = useListQuery(LOOKUP_KEYS.File, {
         limit: fileQueryLimit ?? DEFAULT_FETCH_LIMIT,
     })
 
diff --git a/src/Components/ApiResourceContext.tsx b/src/Components/ApiResourceContext.tsx
index 8ff3dbb..2598adf 100644
--- a/src/Components/ApiResourceContext.tsx
+++ b/src/Components/ApiResourceContext.tsx
@@ -46,10 +46,14 @@ export const get_select_function =
     <T,>(lookupKey: LookupKey) =>
     (data: AxiosResponse<GalvResource>) => {
         Object.entries(FIELDS[lookupKey]).forEach(([k, v]) => {
-            if (has(v, 'transformation'))
+            if (has(v, 'transformation')) {
+                console.warn(
+                    `[FIELDS deprecation] ${lookupKey}.${k} has a transformation`,
+                )
                 data.data[k as keyof typeof data.data] = v.transformation(
                     data.data[k as keyof typeof data.data],
                 )
+            }
         })
         return data as AxiosResponse<T>
     }
diff --git a/src/Components/AttachmentUploadContext.tsx b/src/Components/AttachmentUploadContext.tsx
index d2d4521..6dd289c 100644
--- a/src/Components/AttachmentUploadContext.tsx
+++ b/src/Components/AttachmentUploadContext.tsx
@@ -58,11 +58,11 @@ export default function AttachmentUploadContextProvider({
             },
             onSuccess: async (data: AxiosResponse<ArbitraryFile>) => {
                 queryClient.setQueryData(
-                    [LOOKUP_KEYS.ARBITRARY_FILE, data.data.id],
+                    [LOOKUP_KEYS.ArbitraryFile, data.data.id],
                     data.data,
                 )
                 await queryClient.invalidateQueries({
-                    queryKey: [LOOKUP_KEYS.ARBITRARY_FILE, 'list'],
+                    queryKey: [LOOKUP_KEYS.ArbitraryFile, 'list'],
                 })
                 callback(data.data.url)
             },
diff --git a/src/Components/AuthImage.tsx b/src/Components/AuthImage.tsx
index 3578864..af7fe61 100644
--- a/src/Components/AuthImage.tsx
+++ b/src/Components/AuthImage.tsx
@@ -30,7 +30,7 @@ export default function AuthImage({
         'Galv-Storage-No-Redirect': true,
     }
     const query = useQuery({
-        queryKey: [LOOKUP_KEYS.FILE, file.id, 'png'],
+        queryKey: [LOOKUP_KEYS.File, file.id, 'png'],
         queryFn: async () => {
             const response = await axios.get(file.png, {
                 headers,
diff --git a/src/Components/CardActionBar.tsx b/src/Components/CardActionBar.tsx
index e031e60..1ff58d3 100644
--- a/src/Components/CardActionBar.tsx
+++ b/src/Components/CardActionBar.tsx
@@ -32,7 +32,7 @@ import { has_value, id_from_ref_props } from './misc'
 import clsx from 'clsx'
 import UseStyles from '../styles/UseStyles'
 import { useSelectionManagement } from './SelectionManagementContext'
-import { representation } from './Representation'
+import { genericRepresentation } from './representation/GenericRepresentation'
 import SafeTooltip from './SafeTooltip'
 
 export type CardActionBarProps = {
@@ -67,17 +67,33 @@ export type CardActionBarProps = {
  */
 export default function CardActionBar(props: CardActionBarProps) {
     const { classes, theme } = UseStyles()
-    const { apiResource } = useApiResource()
+    const { apiResource, apiResourceDescription } = useApiResource()
     const iconProps: Partial<SvgIconProps> = {
         ...props.iconProps,
     }
     const selectable = props.selectable ?? typeof apiResource?.id === 'string'
     const { toggleSelected, isSelected } = useSelectionManagement()
 
+    // Check differences between FIELDS context and apiResourceDescription context
+    const api_context = Object.values(apiResourceDescription ?? {}).filter(
+        (e) => e.galv_resource,
+    )
+    const fields_context = Object.values(FIELDS[props.lookupKey]).filter((e) =>
+        is_lookupKey(e.type),
+    )
+    // const api_only = api_context.filter((e) => !fields_context.includes(e))
+    const fields_only = fields_context.filter((e) => !api_context.includes(e))
+    if (fields_only.length > 0) {
+        console.warn(
+            `[FIELDS deprecation] FIELD[${props.lookupKey}] has fields not present in apiResourceDescription.`,
+            fields_only,
+        )
+    }
+
     const context_section = (
         <>
-            {Object.entries(FIELDS[props.lookupKey])
-                .filter((e) => is_lookupKey(e[1].type))
+            {Object.entries(apiResourceDescription ?? {})
+                .filter((e) => e[1].galv_resource)
                 .map(([k, v]) => {
                     const relative_lookupKey = v.type as LookupKey
                     let content: ReactNode
@@ -225,7 +241,7 @@ export default function CardActionBar(props: CardActionBarProps) {
 
     const destroy_section = (
         <Stack direction="row" spacing={1} alignItems="center">
-            {props.lookupKey === LOOKUP_KEYS.FILE && props.reimportable && (
+            {props.lookupKey === LOOKUP_KEYS.File && props.reimportable && (
                 <SafeTooltip
                     title="Force the harvester to re-import this file"
                     arrow
@@ -291,7 +307,7 @@ export default function CardActionBar(props: CardActionBarProps) {
             {props.onFork && apiResource && (
                 <SafeTooltip
                     title={`
-            Create your own copy of ${representation({ data: apiResource, lookupKey: props.lookupKey })}
+            Create your own copy of ${genericRepresentation({ data: apiResource, lookupKey: props.lookupKey })}
             `}
                     arrow
                     describeChild
diff --git a/src/Components/CurrentUserContext.tsx b/src/Components/CurrentUserContext.tsx
index 94a5746..65ce977 100644
--- a/src/Components/CurrentUserContext.tsx
+++ b/src/Components/CurrentUserContext.tsx
@@ -146,10 +146,10 @@ export default function CurrentUserContextProvider({
     })
 
     const Refresh = useQuery({
-        queryKey: [LOOKUP_KEYS.USER, 'refresh'],
+        queryKey: [LOOKUP_KEYS.User, 'refresh'],
         queryFn: () => {
             if (!user) return
-            const api = new API_HANDLERS[LOOKUP_KEYS.USER](api_config)
+            const api = new API_HANDLERS[LOOKUP_KEYS.User](api_config)
             return api
                 .usersRetrieve({ id: user.id })
                 .then((response: AxiosResponse<User>) => {
diff --git a/src/Components/FetchResourceContext.tsx b/src/Components/FetchResourceContext.tsx
index 4be5aa8..01e791a 100644
--- a/src/Components/FetchResourceContext.tsx
+++ b/src/Components/FetchResourceContext.tsx
@@ -54,7 +54,8 @@ export type FieldDescription = {
         | 'choice'
         | 'json'
         | string
-    many: boolean
+    galv_resource: boolean // Whether the `type` is a Galv Resource
+    many: boolean // Whether the field is a list
     help_text: string
     required: boolean
     read_only: boolean
@@ -558,7 +559,7 @@ export default function FetchResourceContextProvider({
                 queryClient.invalidateQueries({
                     queryKey: [lookupKey, 'list'],
                 })
-                if (lookupKey === LOOKUP_KEYS.LAB) {
+                if (lookupKey === LOOKUP_KEYS.Lab) {
                     refresh_user()
                 }
                 // Invalidate autocomplete cache
diff --git a/src/Components/Mapping.tsx b/src/Components/Mapping.tsx
index 3657ec5..fe40751 100644
--- a/src/Components/Mapping.tsx
+++ b/src/Components/Mapping.tsx
@@ -166,7 +166,7 @@ function CreateColumnType({
                             onCreate(new_resource_url)
                         }}
                         onDiscard={() => setOpen(false)}
-                        lookupKey={LOOKUP_KEYS.COLUMN_FAMILY}
+                        lookupKey={LOOKUP_KEYS.ColumnFamily}
                     />
                 </UndoRedoProvider>
             </>
@@ -184,7 +184,7 @@ function SelectColumnType({
     reset_name: string
 }) {
     const { useListQuery } = useFetchResource()
-    const query = useListQuery<DataColumnType>(LOOKUP_KEYS.COLUMN_FAMILY)
+    const query = useListQuery<DataColumnType>(LOOKUP_KEYS.ColumnFamily)
     const { classes } = useStyles()
     const [createModalOpen, setCreateModalOpen] = useState(false)
 
@@ -826,7 +826,7 @@ function MappingManager({
     })
     const { classes } = useStyles()
     const { useListQuery, useCreateQuery, useUpdateQuery } = useFetchResource()
-    const col_query = useListQuery<DataColumnType>(LOOKUP_KEYS.COLUMN_FAMILY)
+    const col_query = useListQuery<DataColumnType>(LOOKUP_KEYS.ColumnFamily)
     const [more, setMore] = React.useState(false)
     const [advancedPropertiesOpen, setAdvancedPropertiesOpen] =
         React.useState(false)
@@ -838,14 +838,14 @@ function MappingManager({
         return m ? { ...m } : blank_map()
     })
     const navigate = useNavigate()
-    const updateFileMutation = useUpdateQuery<ObservedFile>(LOOKUP_KEYS.FILE)
+    const updateFileMutation = useUpdateQuery<ObservedFile>(LOOKUP_KEYS.File)
     const updateFile = (new_mapping: DB_MappingResource) =>
         updateFileMutation.mutate(
             { ...file!, mapping: new_mapping.url },
             { onSuccess: () => navigate(0) },
         )
     const createMapMutation = useCreateQuery<DB_MappingResource>(
-        LOOKUP_KEYS.MAPPING,
+        LOOKUP_KEYS.ColumnMapping,
         { after_cache: (r) => updateFile(r.data) },
     )
     const createMap = (data: ApplicableMappingResource) => {
@@ -864,12 +864,12 @@ function MappingManager({
         })
     }
     const updateMapMutation = useUpdateQuery<DB_MappingResource>(
-        LOOKUP_KEYS.MAPPING,
+        LOOKUP_KEYS.ColumnMapping,
     )
     const updateMap = (data: DB_MappingResource) =>
         updateMapMutation.mutate(data, { onSuccess: () => navigate(0) })
     // TODO: Implement deleteMapMutation when backend supplies delete permissions
-    // const deleteMapMutation = useDeleteQuery<DB_MappingResource>(LOOKUP_KEYS.MAPPING)
+    // const deleteMapMutation = useDeleteQuery<DB_MappingResource>(LOOKUP_KEYS.ColumnMapping)
     // const deleteMap = (data: DB_MappingResource) => deleteMapMutation.mutate(data, {onSuccess: () => navigate(0)})
 
     if (col_query?.hasNextPage && !col_query.isFetchingNextPage)
@@ -963,7 +963,7 @@ function MappingManager({
                     {file?.id && (
                         <ResourceChip
                             resourceId={file.id as string}
-                            lookupKey={LOOKUP_KEYS.FILE}
+                            lookupKey={LOOKUP_KEYS.File}
                         />
                     )}
                 </Typography>
@@ -1231,12 +1231,12 @@ Do you wish to continue?`)
                                             <PrettyResource
                                                 target={{
                                                     _type: key_to_type(
-                                                        LOOKUP_KEYS.TEAM,
+                                                        LOOKUP_KEYS.Team,
                                                     ),
                                                     _value: mapping.mapping
                                                         .team,
                                                 }}
-                                                lookupKey={LOOKUP_KEYS.TEAM}
+                                                lookupKey={LOOKUP_KEYS.Team}
                                                 edit_mode={true}
                                                 allow_new={false}
                                                 onChange={(
@@ -1498,7 +1498,7 @@ export default function WrappedMapping() {
         >
             <ApiResourceContextProvider
                 resourceId={id}
-                lookupKey={LOOKUP_KEYS.FILE}
+                lookupKey={LOOKUP_KEYS.File}
             >
                 <Mapping />
             </ApiResourceContextProvider>
diff --git a/src/Components/ResourceChip.tsx b/src/Components/ResourceChip.tsx
index adb15a1..3c5b3fd 100644
--- a/src/Components/ResourceChip.tsx
+++ b/src/Components/ResourceChip.tsx
@@ -8,7 +8,7 @@ import QueryWrapper, { QueryWrapperProps } from './QueryWrapper'
 import ErrorChip from './error/ErrorChip'
 import { FAMILY_LOOKUP_KEYS, GalvResource, PATHS } from '../constants'
 import ErrorBoundary from './ErrorBoundary'
-import Representation from './Representation'
+import Representation from './representation/GenericRepresentation'
 import { FilterContext } from './filtering/FilterContext'
 import ApiResourceContextProvider, {
     ApiResourceContextProviderProps,
diff --git a/src/Components/ResourceCreator.tsx b/src/Components/ResourceCreator.tsx
index af849d3..90df114 100644
--- a/src/Components/ResourceCreator.tsx
+++ b/src/Components/ResourceCreator.tsx
@@ -109,7 +109,7 @@ export function TokenCreator({
         weeks: 60 * 60 * 24 * 7,
     }
 
-    const lookupKey = LOOKUP_KEYS.TOKEN
+    const lookupKey = LOOKUP_KEYS.Token
 
     const ICON = ICONS[lookupKey]
 
@@ -364,7 +364,7 @@ export function ResourceCreator<T extends GalvResource>({
     )
 
     const handleSave = () => {
-        if (lookupKey === LOOKUP_KEYS.ARBITRARY_FILE) {
+        if (lookupKey === LOOKUP_KEYS.ArbitraryFile) {
             create_attachment_mutation.mutate({
                 ...clean(UndoRedo.current),
                 file,
@@ -492,28 +492,45 @@ export default function WrappedResourceCreator<T extends GalvResource>(
     const [modalOpen, setModalOpen] = useState(false)
     const { user, refresh_user } = useCurrentUser()
     const navigate = useNavigate()
+    const { useDescribeQuery } = useFetchResource()
+    const description_query = useDescribeQuery(props.lookupKey)
+    const [createable, setCreateable] = useState(false)
 
-    const get_can_create = (lookupKey: LookupKey) => {
+    useEffect(() => {
         // We can always create tokens because they represent us, and labs because someone has to.
-        if (lookupKey === LOOKUP_KEYS.TOKEN) return !!user
-        if (lookupKey === LOOKUP_KEYS.LAB) return !!user
+        if (
+            props.lookupKey === LOOKUP_KEYS.Token ||
+            props.lookupKey === LOOKUP_KEYS.Lab
+        ) {
+            setCreateable(!!user)
+            return
+        }
 
         const lab_admin_resources = [
-            LOOKUP_KEYS.TEAM,
-            LOOKUP_KEYS.ADDITIONAL_STORAGE,
+            LOOKUP_KEYS.Team,
+            LOOKUP_KEYS.AdditionalStorage,
         ] as LookupKey[]
-        if (lab_admin_resources.includes(lookupKey)) return user?.is_lab_admin
+        if (lab_admin_resources.includes(props.lookupKey)) {
+            setCreateable(!!user?.is_lab_admin)
+            return
+        }
 
-        const fields = FIELDS[lookupKey]
-        return Object.keys(fields).includes('team')
-    }
+        console.log(`Checking if ${props.lookupKey} can be created`, {
+            description_query_data: description_query.data,
+        })
+
+        setCreateable(
+            !!description_query.data?.data &&
+                Object.keys(description_query.data.data).includes('team'),
+        )
+    }, [description_query.data, props.lookupKey, user])
 
-    if (!get_can_create(props.lookupKey)) return <></>
+    if (!createable) return <></>
 
     const ADD_ICON = ICONS.CREATE
 
     // Files are a special case and there's a whole page for handling them
-    if (props.lookupKey === LOOKUP_KEYS.FILE)
+    if (props.lookupKey === LOOKUP_KEYS.File)
         return (
             <Button component={Link} to={PATHS.UPLOAD} variant="contained">
                 Upload a new File
@@ -552,7 +569,7 @@ export default function WrappedResourceCreator<T extends GalvResource>(
                             />
                         )}
                     >
-                        {props.lookupKey === LOOKUP_KEYS.TOKEN ? (
+                        {props.lookupKey === LOOKUP_KEYS.Token ? (
                             <TokenCreator
                                 setModalOpen={setModalOpen}
                                 {...props}
@@ -570,7 +587,7 @@ export default function WrappedResourceCreator<T extends GalvResource>(
                                     } else {
                                         if (
                                             props.lookupKey ===
-                                                LOOKUP_KEYS.LAB &&
+                                                LOOKUP_KEYS.Lab &&
                                             !user?.is_lab_admin
                                         )
                                             refresh_user()
diff --git a/src/Components/ResourceList.tsx b/src/Components/ResourceList.tsx
index 9edd4ad..b07417d 100644
--- a/src/Components/ResourceList.tsx
+++ b/src/Components/ResourceList.tsx
@@ -140,7 +140,7 @@ export function ResourceList<T extends GalvResource>({
             </Grid>
             <IntroText k={lookupKey} />
             <Stack spacing={2} key="body">
-                {lookupKey === LOOKUP_KEYS.FILE && (
+                {lookupKey === LOOKUP_KEYS.File && (
                     <ClientCodeDemo fileQueryLimit={itemsPerPage} />
                 )}
                 {content}
diff --git a/src/Components/__mocks__/Representation.tsx b/src/Components/__mocks__/Representation.tsx
deleted file mode 100644
index 78396a4..0000000
--- a/src/Components/__mocks__/Representation.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-// Copyright  (c) 2020-2023, The Chancellor, Masters and Scholars of the University
-// of Oxford, and the 'Galv' Developers. All rights reserved.
-
-import dummy from './DummyComponent'
-import { RepresentationProps } from '../Representation'
-import { GalvResource, LookupKey } from '../../constants'
-
-export function representation(params: {
-    data: GalvResource
-    lookupKey: LookupKey
-}): string {
-    return `representation: ${params.lookupKey} [${params.data.id}]`
-}
-
-export default function Representation(params: RepresentationProps) {
-    return dummy('Representation', params)
-}
diff --git a/src/Components/card/ResourceCard.tsx b/src/Components/card/ResourceCard.tsx
index 2097cca..b2d61e7 100644
--- a/src/Components/card/ResourceCard.tsx
+++ b/src/Components/card/ResourceCard.tsx
@@ -29,7 +29,7 @@ import {
 import ResourceChip from '../ResourceChip'
 import ErrorBoundary from '../ErrorBoundary'
 import UndoRedoProvider, { useUndoRedoContext } from '../UndoRedoContext'
-import Representation from '../Representation'
+import Representation from '../representation/GenericRepresentation'
 import { FilterContext } from '../filtering/FilterContext'
 import ApiResourceContextProvider, {
     ApiResourceContextProviderProps,
@@ -140,8 +140,8 @@ function ResourceCard<T extends GalvResource>({
             // Harvesters must be created elsewhere - they can't be forked
             onFork={
                 apiResource?.permissions?.create &&
-                lookupKey !== LOOKUP_KEYS.HARVESTER &&
-                lookupKey !== LOOKUP_KEYS.TOKEN
+                lookupKey !== LOOKUP_KEYS.Harvester &&
+                lookupKey !== LOOKUP_KEYS.Token
                     ? () => setForking(true)
                     : undefined
             }
@@ -195,7 +195,7 @@ function ResourceCard<T extends GalvResource>({
                     : undefined
             }
             reimportable={
-                lookupKey === LOOKUP_KEYS.FILE &&
+                lookupKey === LOOKUP_KEYS.File &&
                 apiResource?.permissions?.write &&
                 has(apiResource, 'state') &&
                 apiResource.state !== 'RETRY IMPORT'
@@ -260,7 +260,7 @@ The file will be added to the Harvester's usual queue for processing.
                         <A component={Link} to={PATHS[lookupKey]}>
                             {DISPLAY_NAMES[lookupKey]}
                         </A>
-                        <LoadingChip icon={<ICONS.TEAM />} />
+                        <LoadingChip icon={<ICONS.Team />} />
                     </Stack>
                 }
                 action={action}
@@ -320,7 +320,7 @@ The file will be added to the Harvester's usual queue for processing.
                         {has(apiResource, 'team') &&
                             apiResource.team !== null && (
                                 <ResourceChip
-                                    lookupKey="TEAM"
+                                    lookupKey={LOOKUP_KEYS.Team}
                                     resourceId={id_from_ref_props<number>(
                                         apiResource.team,
                                     )}
diff --git a/src/Components/card/bodies/CardBody.tsx b/src/Components/card/bodies/CardBody.tsx
index dadf2f4..aebc47a 100644
--- a/src/Components/card/bodies/CardBody.tsx
+++ b/src/Components/card/bodies/CardBody.tsx
@@ -65,21 +65,30 @@ export default function CardBody<T extends GalvResource>({
 
     useEffect(() => {
         if (apiResource) {
+            if (!apiResourceDescription) {
+                console.warn(
+                    `[FIELD deprecation] apiResourceDescription not ready for ${lookupKey}`,
+                )
+                UndoRedoRef.current.set({} as T)
+                return
+            }
             const data = deep_copy(apiResource)
+            Object.entries(apiResourceDescription).forEach(([k, v]) => {
+                if (v.read_only) {
+                    delete data[k as keyof typeof data]
+                }
+            })
             Object.entries(FIELDS[lookupKey]).forEach(([k, v]) => {
-                if (has_value(v, 'read_only', true)) {
+                if (
+                    has_value(v, 'read_only', true) &&
+                    data[k as keyof typeof data] !== undefined
+                ) {
+                    console.warn(
+                        `[FIELD deprecation] ${lookupKey}: Field ${k}'s read_only property is true, but not removed using apiResourceDescription`,
+                    )
                     delete data[k as keyof typeof data]
                 }
             })
-            apiResourceDescription &&
-                Object.entries(apiResourceDescription).forEach(([k, v]) => {
-                    if (
-                        v.read_only &&
-                        data[k as keyof typeof data] !== undefined
-                    ) {
-                        delete data[k as keyof typeof data]
-                    }
-                })
             UndoRedoRef.current.set(data)
         }
     }, [apiResource, lookupKey])
@@ -115,24 +124,33 @@ export default function CardBody<T extends GalvResource>({
                         lookupKey={lookupKey}
                         key="read-props"
                         filter={(d, lookupKey) => {
+                            if (!apiResourceDescription) {
+                                console.warn(
+                                    `[FIELD deprecation] apiResourceDescription not ready for ${lookupKey}`,
+                                )
+                                return {} as T
+                            }
                             const data = deep_copy(d)
-                            Object.entries(FIELDS[lookupKey]).forEach(
+                            Object.entries(apiResourceDescription).forEach(
                                 ([k, v]) => {
-                                    if (!has_value(v, 'read_only', true))
+                                    if (!v.read_only)
                                         delete data[k as keyof typeof data]
                                 },
                             )
-                            apiResourceDescription &&
-                                Object.entries(apiResourceDescription).forEach(
-                                    ([k, v]) => {
-                                        if (
-                                            !v.read_only &&
-                                            data[k as keyof typeof data] !==
-                                                undefined
+                            Object.entries(FIELDS[lookupKey]).forEach(
+                                ([k, v]) => {
+                                    if (
+                                        !has_value(v, 'read_only', true) &&
+                                        data[k as keyof typeof data] !==
+                                            undefined
+                                    ) {
+                                        console.warn(
+                                            `[FIELD deprecation] ${lookupKey}: Field ${k}'s read_only property is false, but not removed using apiResourceDescription`,
                                         )
-                                            delete data[k as keyof typeof data]
-                                    },
-                                )
+                                        delete data[k as keyof typeof data]
+                                    }
+                                },
+                            )
                             // Unrecognised fields are always editable
                             Object.keys(data).forEach((k) => {
                                 const in_description =
@@ -140,6 +158,13 @@ export default function CardBody<T extends GalvResource>({
                                     Object.keys(
                                         apiResourceDescription,
                                     ).includes(k)
+                                if (
+                                    !in_description &&
+                                    Object.keys(FIELDS[lookupKey]).includes(k)
+                                )
+                                    console.warn(
+                                        `[FIELD deprecation] ${lookupKey}: Field ${k} in FIELDS is not present in apiResourceDescription`,
+                                    )
                                 if (
                                     !Object.keys(FIELDS[lookupKey]).includes(
                                         k,
@@ -249,7 +274,7 @@ export default function CardBody<T extends GalvResource>({
                         }}
                     />
                 )}
-                {lookupKey === LOOKUP_KEYS.FILE && apiResource && (
+                {lookupKey === LOOKUP_KEYS.File && apiResource && (
                     <FileSummary resource={apiResource} hidePath={true} />
                 )}
             </Stack>
diff --git a/src/Components/card/summaries/CardSummary.tsx b/src/Components/card/summaries/CardSummary.tsx
index e72e03b..b354d05 100644
--- a/src/Components/card/summaries/CardSummary.tsx
+++ b/src/Components/card/summaries/CardSummary.tsx
@@ -38,17 +38,17 @@ import CardContent from '@mui/material/CardContent'
 const CUSTOM_SUMMARIES: Partial<
     Record<LookupKey, (resource: { resource: GalvResource }) => ReactNode>
 > = {
-    [LOOKUP_KEYS.ARBITRARY_FILE]: ArbitraryFileSummary,
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: AdditionalStorageSummary,
-    [LOOKUP_KEYS.HARVESTER]: HarvesterSummary,
-    [LOOKUP_KEYS.TEAM]: TeamSummary,
-    [LOOKUP_KEYS.LAB]: LabSummary,
-    [LOOKUP_KEYS.UNIT]: UnitSummary,
-    [LOOKUP_KEYS.COLUMN_FAMILY]: ColumnSummary,
-    [LOOKUP_KEYS.PATH]: PathSummary,
-    [LOOKUP_KEYS.FILE]: FileSummary,
-    [LOOKUP_KEYS.CYCLER_TEST]: CyclerTestSummary,
-    [LOOKUP_KEYS.EXPERIMENT]: ExperimentSummary,
+    [LOOKUP_KEYS.ArbitraryFile]: ArbitraryFileSummary,
+    [LOOKUP_KEYS.AdditionalStorage]: AdditionalStorageSummary,
+    [LOOKUP_KEYS.Harvester]: HarvesterSummary,
+    [LOOKUP_KEYS.Team]: TeamSummary,
+    [LOOKUP_KEYS.Lab]: LabSummary,
+    [LOOKUP_KEYS.Unit]: UnitSummary,
+    [LOOKUP_KEYS.ColumnFamily]: ColumnSummary,
+    [LOOKUP_KEYS.Path]: PathSummary,
+    [LOOKUP_KEYS.File]: FileSummary,
+    [LOOKUP_KEYS.CyclerTest]: CyclerTestSummary,
+    [LOOKUP_KEYS.Experiment]: ExperimentSummary,
 } as const
 
 /**
@@ -71,6 +71,10 @@ export default function CardSummary<T extends GalvResource>({
         return <COMPONENT resource={apiResource} />
     }
 
+    console.warn(
+        `Using generic fallback summary for ${lookupKey}. This will be deprecated soon.`,
+    )
+
     const is_family_child = (child_key: LookupKey, family_key: LookupKey) => {
         if (!get_is_family(family_key)) return false
         if (!get_has_family(child_key)) return false
diff --git a/src/Components/card/summaries/FileSummary.tsx b/src/Components/card/summaries/FileSummary.tsx
index 549d24a..ee91be6 100644
--- a/src/Components/card/summaries/FileSummary.tsx
+++ b/src/Components/card/summaries/FileSummary.tsx
@@ -81,7 +81,7 @@ function MappingQuickSelect({
         mappings.find((m) => m.url === file.mapping)?.url ?? '',
     )
     const { useUpdateQuery } = useFetchResource()
-    const updateQuery = useUpdateQuery<ObservedFile>(LOOKUP_KEYS.FILE, {
+    const updateQuery = useUpdateQuery<ObservedFile>(LOOKUP_KEYS.File, {
         after_cache: () => {
             setStatus(
                 <Alert severity="success">Mapping updated successfully</Alert>,
@@ -202,7 +202,7 @@ function FileStatus({
                         file.permissions.write && (
                             <Button
                                 component={Link}
-                                to={`${PATHS.MAPPING}/${file.id ?? file.id}`}
+                                to={`${PATHS.ColumnMapping}/${file.id ?? file.id}`}
                                 size="small"
                             >
                                 Edit mapping
@@ -224,7 +224,7 @@ function FileStatus({
                         file.permissions.write && (
                             <Button
                                 component={Link}
-                                to={`${PATHS.MAPPING}/${file.id ?? file.id}`}
+                                to={`${PATHS.ColumnMapping}/${file.id ?? file.id}`}
                                 size="small"
                             >
                                 Edit mapping
@@ -253,7 +253,7 @@ function FileStatus({
                         file.permissions.write && (
                             <Button
                                 component={Link}
-                                to={`${PATHS.MAPPING}/${file.id ?? file.id}`}
+                                to={`${PATHS.ColumnMapping}/${file.id ?? file.id}`}
                                 size="small"
                             >
                                 Choose mapping
@@ -282,7 +282,7 @@ function FileStatus({
                         file.permissions.write && (
                             <Button
                                 component={Link}
-                                to={`${PATHS.MAPPING}/${file.id ?? file.id}`}
+                                to={`${PATHS.ColumnMapping}/${file.id ?? file.id}`}
                                 size="small"
                             >
                                 Create mapping
diff --git a/src/Components/prettify/PrettyAttachment.tsx b/src/Components/prettify/PrettyAttachment.tsx
index 2cb6284..0b19b18 100644
--- a/src/Components/prettify/PrettyAttachment.tsx
+++ b/src/Components/prettify/PrettyAttachment.tsx
@@ -60,7 +60,7 @@ export default function PrettyAttachment({
     if (edit_mode)
         return (
             <PrettyResourceSelect
-                lookupKey={LOOKUP_KEYS.ARBITRARY_FILE}
+                lookupKey={LOOKUP_KEYS.ArbitraryFile}
                 target={target}
                 onChange={onChange}
                 edit_mode={edit_mode}
diff --git a/src/Components/prettify/PrettyObject.tsx b/src/Components/prettify/PrettyObject.tsx
index d30e8d8..b509960 100644
--- a/src/Components/prettify/PrettyObject.tsx
+++ b/src/Components/prettify/PrettyObject.tsx
@@ -458,7 +458,7 @@ export default function PrettyObject<
                 permissions={permissions}
                 query={permissions_query}
                 edit_fun_factory={_edit_mode ? edit_fun_factory : undefined}
-                is_path={lookupKey === LOOKUP_KEYS.PATH}
+                is_path={lookupKey === LOOKUP_KEYS.Path}
             />
             <TableContainer
                 className={clsx(classes.prettyTable, {
diff --git a/src/Components/prettify/PrettyResource.tsx b/src/Components/prettify/PrettyResource.tsx
index bc85af9..091f7af 100644
--- a/src/Components/prettify/PrettyResource.tsx
+++ b/src/Components/prettify/PrettyResource.tsx
@@ -20,7 +20,7 @@ import Autocomplete, {
     createFilterOptions,
 } from '@mui/material/Autocomplete'
 import CircularProgress from '@mui/material/CircularProgress'
-import { representation } from '../Representation'
+import { genericRepresentation } from '../representation/GenericRepresentation'
 import { useFetchResource } from '../FetchResourceContext'
 import { get_modal_title, ResourceCreator } from '../ResourceCreator'
 import Modal from '@mui/material/Modal'
@@ -72,7 +72,7 @@ export const PrettyResourceSelect = <T extends GalvResource>({
     const represent = (url: string) => {
         const object = url_to_query_result(url)
         if (!object) return url
-        return representation({ data: object, lookupKey })
+        return genericRepresentation({ data: object, lookupKey })
     }
     const url_to_value = (url: string) => represent(url)
     const value_to_url = (value: string) => {
@@ -225,7 +225,7 @@ export default function PrettyResource({
     if (lookupKey !== url_components?.lookupKey) {
         // Labs' Galv Storage is exposed under the Additional Storage lookup key because currently we
         // don't support multiple resource types in a single array.
-        if (lookupKey === LOOKUP_KEYS.ADDITIONAL_STORAGE)
+        if (lookupKey === LOOKUP_KEYS.AdditionalStorage)
             lookupKey = url_components?.lookupKey ?? lookupKey
         else lookupKey = lookupKey ?? url_components?.lookupKey
     }
diff --git a/src/Components/Representation.tsx b/src/Components/representation/GenericRepresentation.tsx
similarity index 87%
rename from src/Components/Representation.tsx
rename to src/Components/representation/GenericRepresentation.tsx
index 48b47c3..3712254 100644
--- a/src/Components/Representation.tsx
+++ b/src/Components/representation/GenericRepresentation.tsx
@@ -4,11 +4,11 @@ import {
     GalvResource,
     LookupKey,
     PRIORITY_LEVELS,
-} from '../constants'
+} from '../../constants'
 import { ReactNode } from 'react'
-import { useFetchResource } from './FetchResourceContext'
+import { useFetchResource } from '../FetchResourceContext'
 
-export function representation({
+export function genericRepresentation({
     data,
     lookupKey,
 }: {
@@ -57,7 +57,7 @@ export default function Representation<T extends GalvResource>({
         <>
             {prefix ?? ''}
             {query.data
-                ? representation({ data: query.data.data, lookupKey })
+                ? genericRepresentation({ data: query.data.data, lookupKey })
                 : resourceId}
             {suffix ?? ''}
         </>
diff --git a/src/Components/representation/__mocks__/GenericRepresentation.tsx b/src/Components/representation/__mocks__/GenericRepresentation.tsx
new file mode 100644
index 0000000..27c799c
--- /dev/null
+++ b/src/Components/representation/__mocks__/GenericRepresentation.tsx
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-2-Clause
+// Copyright  (c) 2020-2023, The Chancellor, Masters and Scholars of the University
+// of Oxford, and the 'Galv' Developers. All rights reserved.
+
+import dummy from '../../__mocks__/DummyComponent'
+import { RepresentationProps } from '../GenericRepresentation'
+import { GalvResource, LookupKey } from '../../../constants'
+
+export function genericRepresentation(params: {
+    data: GalvResource
+    lookupKey: LookupKey
+}): string {
+    return `representation: ${params.lookupKey} [${params.data.id}]`
+}
+
+export default function GenericRepresentation(params: RepresentationProps) {
+    return dummy('GenericRepresentation', params)
+}
diff --git a/src/Components/upload/UploadFilePage.tsx b/src/Components/upload/UploadFilePage.tsx
index 59d13c3..663f42c 100644
--- a/src/Components/upload/UploadFilePage.tsx
+++ b/src/Components/upload/UploadFilePage.tsx
@@ -124,11 +124,11 @@ export function ReuploadFile({ clickOnly }: ReuploadFileProps) {
         onSuccess: (data: AxiosResponse<ObservedFileCreate>) => {
             if (data) {
                 queryClient.invalidateQueries({
-                    queryKey: [LOOKUP_KEYS.FILE, data.data.id],
+                    queryKey: [LOOKUP_KEYS.File, data.data.id],
                     exact: true,
                     refetchType: 'all',
                 })
-                navigate(`${PATHS[LOOKUP_KEYS.FILE]}/${data.data.id}`)
+                navigate(`${PATHS[LOOKUP_KEYS.File]}/${data.data.id}`)
             }
         },
         onError: (error: AxiosError) => {
@@ -146,7 +146,7 @@ export function ReuploadFile({ clickOnly }: ReuploadFileProps) {
             setComplete(true)
             if (data)
                 queryClient.invalidateQueries({
-                    queryKey: [LOOKUP_KEYS.FILE, data.data.id],
+                    queryKey: [LOOKUP_KEYS.File, data.data.id],
                     exact: true,
                     refetchType: 'all',
                 })
@@ -262,11 +262,11 @@ export function UploadFilePage() {
         onSuccess: (data: AxiosResponse<ObservedFileCreate>) => {
             if (data) {
                 queryClient.invalidateQueries({
-                    queryKey: [LOOKUP_KEYS.FILE, data.data.id],
+                    queryKey: [LOOKUP_KEYS.File, data.data.id],
                     exact: true,
                     refetchType: 'all',
                 })
-                navigate(`${PATHS[LOOKUP_KEYS.FILE]}/${data.data.id}`)
+                navigate(`${PATHS[LOOKUP_KEYS.File]}/${data.data.id}`)
             }
         },
         onError: (error: AxiosError) => {
@@ -362,7 +362,7 @@ export function UploadFilePage() {
                 Harvesters. If in doubt, use .csv files!
             </Typography>
             <CardActionBar
-                lookupKey={LOOKUP_KEYS.FILE}
+                lookupKey={LOOKUP_KEYS.File}
                 excludeContext={true}
                 selectable={false}
                 editable={true}
@@ -386,9 +386,9 @@ export function UploadFilePage() {
                 <PrettyObject
                     target={to_type_value_notation_wrapper(
                         UndoRedo.current as SerializableObject,
-                        LOOKUP_KEYS.FILE,
+                        LOOKUP_KEYS.File,
                     )}
-                    lookupKey={LOOKUP_KEYS.FILE}
+                    lookupKey={LOOKUP_KEYS.File}
                     edit_mode={true}
                     creating={true}
                     onEdit={(v) => {
diff --git a/src/Dashboard.tsx b/src/Dashboard.tsx
index 11c7dcb..9571ca7 100644
--- a/src/Dashboard.tsx
+++ b/src/Dashboard.tsx
@@ -31,7 +31,7 @@ import CardContent from '@mui/material/CardContent'
 import Typography from '@mui/material/Typography'
 import Container from '@mui/material/Container'
 import Chip from '@mui/material/Chip'
-import Representation from './Components/Representation'
+import Representation from './Components/representation/GenericRepresentation'
 import ListSubheader from '@mui/material/ListSubheader'
 import IntroText from './Components/IntroText'
 import Box from '@mui/material/Box'
@@ -131,7 +131,7 @@ function KeySummary({
                             <ListItemText key="count">
                                 <Representation
                                     resourceId={schema_id}
-                                    lookupKey={LOOKUP_KEYS.VALIDATION_SCHEMA}
+                                    lookupKey={LOOKUP_KEYS.ValidationSchema}
                                 />
                                 : {count}
                             </ListItemText>
@@ -237,7 +237,7 @@ function KeySummary({
                                                                 d.detail.schema,
                                                             )}
                                                             lookupKey={
-                                                                LOOKUP_KEYS.VALIDATION_SCHEMA
+                                                                LOOKUP_KEYS.ValidationSchema
                                                             }
                                                         />
                                                         <Typography>
@@ -342,7 +342,7 @@ export function SchemaValidationList() {
 export function DatasetStatus() {
     const { useListQuery } = useFetchResource()
     const query = useListQuery(
-        LOOKUP_KEYS.FILE,
+        LOOKUP_KEYS.File,
     ) as ListQueryResult<ObservedFile>
     const { classes, theme } = useStyles()
 
@@ -412,8 +412,8 @@ export function DatasetStatus() {
             ) : (
                 <Card>
                     <CardHeader
-                        avatar={<LookupKeyIcon lookupKey={LOOKUP_KEYS.FILE} />}
-                        title={DISPLAY_NAMES_PLURAL[LOOKUP_KEYS.FILE]}
+                        avatar={<LookupKeyIcon lookupKey={LOOKUP_KEYS.File} />}
+                        title={DISPLAY_NAMES_PLURAL[LOOKUP_KEYS.File]}
                         action={
                             <Stack
                                 direction="row"
@@ -495,7 +495,7 @@ export function DatasetStatus() {
                                                         >
                                                             <ApiResourceContextProvider
                                                                 lookupKey={
-                                                                    LOOKUP_KEYS.FILE
+                                                                    LOOKUP_KEYS.File
                                                                 }
                                                                 resourceId={
                                                                     f.id
@@ -564,7 +564,7 @@ export function DatasetStatus() {
                                                         >
                                                             <ApiResourceContextProvider
                                                                 lookupKey={
-                                                                    LOOKUP_KEYS.FILE
+                                                                    LOOKUP_KEYS.File
                                                                 }
                                                                 resourceId={
                                                                     f.id
diff --git a/src/UserLogin.tsx b/src/UserLogin.tsx
index 276a88d..ac97474 100644
--- a/src/UserLogin.tsx
+++ b/src/UserLogin.tsx
@@ -82,7 +82,7 @@ function RegisterForm({
                 })
                 return
             }
-            queryClient.setQueryData([LOOKUP_KEYS.USER, data.data.id], data)
+            queryClient.setQueryData([LOOKUP_KEYS.User, data.data.id], data)
             postSnackbarMessage({
                 message: `Activation code sent to ${data.data.email}`,
                 severity: 'success',
@@ -597,7 +597,7 @@ export default function UserLogin() {
         <Button
             onClick={() => setLoginFormOpen(!loginFormOpen)}
             ref={popoverAnchorRef}
-            startIcon={<ICONS.USER />}
+            startIcon={<ICONS.User />}
             variant="contained"
         >
             <Typography>{user.username}</Typography>
@@ -637,16 +637,16 @@ export default function UserLogin() {
                 </ListItemIcon>
                 <ListItemButton
                     component={Link}
-                    to={`${PATHS.USER}/${user?.id}?editing=true`}
+                    to={`${PATHS.User}/${user?.id}?editing=true`}
                 >
                     Manage Profile
                 </ListItemButton>
             </ListItem>
             <ListItem>
                 <ListItemIcon>
-                    <ICONS.TOKEN />
+                    <ICONS.Token />
                 </ListItemIcon>
-                <ListItemButton component={Link} to={`${PATHS.TOKEN}`}>
+                <ListItemButton component={Link} to={`${PATHS.Token}`}>
                     API Tokens
                 </ListItemButton>
             </ListItem>
diff --git a/src/constants.ts b/src/constants.ts
index cfd068a..e2b313e 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -205,40 +205,40 @@ export const DEFAULT_PAGE_SIZE = 10
  * TODO: Eventually these could all be exposed as part of a useLookupKey context.
  */
 export const LOOKUP_KEYS = {
-    HARVESTER: 'HARVESTER',
-    PATH: 'PATH',
-    PARQUET_PARTITION: 'PARQUET_PARTITION',
-    FILE: 'FILE',
-    MAPPING: 'MAPPING',
-    CELL_FAMILY: 'CELL_FAMILY',
-    CELL: 'CELL',
-    EQUIPMENT_FAMILY: 'EQUIPMENT_FAMILY',
-    EQUIPMENT: 'EQUIPMENT',
-    SCHEDULE_FAMILY: 'SCHEDULE_FAMILY',
-    SCHEDULE: 'SCHEDULE',
-    EXPERIMENT: 'EXPERIMENT',
-    CYCLER_TEST: 'CYCLER_TEST',
-    ARBITRARY_FILE: 'ARBITRARY_FILE',
-    VALIDATION_SCHEMA: 'VALIDATION_SCHEMA',
-    LAB: 'LAB',
-    TEAM: 'TEAM',
-    USER: 'USER',
-    TOKEN: 'TOKEN',
-    UNIT: 'UNIT',
-    COLUMN_FAMILY: 'COLUMN_FAMILY',
-    GALV_STORAGE: 'GALV_STORAGE',
-    ADDITIONAL_STORAGE: 'ADDITIONAL_STORAGE',
+    Harvester: 'Harvester',
+    Path: 'Path',
+    ParquetPartition: 'ParquetPartition',
+    File: 'File',
+    ColumnMapping: 'ColumnMapping',
+    CellFamily: 'CellFamily',
+    Cell: 'Cell',
+    EquipmentFamily: 'EquipmentFamily',
+    Equipment: 'Equipment',
+    ScheduleFamily: 'ScheduleFamily',
+    Schedule: 'Schedule',
+    Experiment: 'Experiment',
+    CyclerTest: 'CyclerTest',
+    ArbitraryFile: 'ArbitraryFile',
+    ValidationSchema: 'ValidationSchema',
+    Lab: 'Lab',
+    Team: 'Team',
+    User: 'User',
+    Token: 'Token',
+    Unit: 'Unit',
+    ColumnFamily: 'ColumnFamily',
+    GalvStorage: 'GalvStorage',
+    AdditionalStorage: 'AdditionalStorage',
 } as const
 
 export const AUTOCOMPLETE_KEYS = {
-    CELL_MANUFACTURER: 'CELL_MANUFACTURER',
-    CELL_MODEL: 'CELL_MODEL',
-    CELL_FORM_FACTOR: 'CELL_FORM_FACTOR',
-    CELL_CHEMISTRY: 'CELL_CHEMISTRY',
-    EQUIPMENT_TYPE: 'EQUIPMENT_TYPE',
-    EQUIPMENT_MANUFACTURER: 'EQUIPMENT_MANUFACTURER',
-    EQUIPMENT_MODEL: 'EQUIPMENT_MODEL',
-    SCHEDULE_IDENTIFIER: 'SCHEDULE_IDENTIFIER',
+    CellManufacturer: 'CellManufacturer',
+    CellModel: 'CellModel',
+    CellFormFactor: 'CellFormFactor',
+    CellChemistry: 'CellChemistry',
+    EquipmentType: 'EquipmentType',
+    EquipmentManufacturer: 'EquipmentManufacturer',
+    EquipmentModel: 'EquipmentModel',
+    ScheduleIdentifier: 'ScheduleIdentifier',
 } as const
 
 export type LookupKey = keyof typeof LOOKUP_KEYS
@@ -254,30 +254,30 @@ export const is_autocomplete_key = (key: unknown): key is AutocompleteKey =>
  * Currently all families share the same icon.
  */
 export const ICONS = {
-    [LOOKUP_KEYS.HARVESTER]: MdCloudSync,
-    [LOOKUP_KEYS.PATH]: MdFolder,
-    [LOOKUP_KEYS.PARQUET_PARTITION]: MdExtension,
-    [LOOKUP_KEYS.FILE]: MdPoll,
-    [LOOKUP_KEYS.MAPPING]: MdCompareArrows,
-    [LOOKUP_KEYS.UNIT]: MdSubscript,
-    [LOOKUP_KEYS.COLUMN_FAMILY]: MdSplitscreen,
-    [LOOKUP_KEYS.CELL_FAMILY]: MdBatchPrediction,
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: MdBatchPrediction,
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: MdBatchPrediction,
-    [LOOKUP_KEYS.EXPERIMENT]: MdDatasetLinked,
-    [LOOKUP_KEYS.CYCLER_TEST]: MdMultilineChart,
-    [LOOKUP_KEYS.CELL]: MdBatteryFull,
-    [LOOKUP_KEYS.EQUIPMENT]: MdPrecisionManufacturing,
-    [LOOKUP_KEYS.SCHEDULE]: MdAssignment,
-    [LOOKUP_KEYS.ARBITRARY_FILE]: MdAttachFile,
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: MdSchema,
-    [LOOKUP_KEYS.LAB]: MdHolidayVillage,
-    [LOOKUP_KEYS.TEAM]: MdPeopleAlt,
-    [LOOKUP_KEYS.USER]: MdPerson,
-    [LOOKUP_KEYS.TOKEN]: MdVpnKey,
+    [LOOKUP_KEYS.Harvester]: MdCloudSync,
+    [LOOKUP_KEYS.Path]: MdFolder,
+    [LOOKUP_KEYS.ParquetPartition]: MdExtension,
+    [LOOKUP_KEYS.File]: MdPoll,
+    [LOOKUP_KEYS.ColumnMapping]: MdCompareArrows,
+    [LOOKUP_KEYS.Unit]: MdSubscript,
+    [LOOKUP_KEYS.ColumnFamily]: MdSplitscreen,
+    [LOOKUP_KEYS.CellFamily]: MdBatchPrediction,
+    [LOOKUP_KEYS.EquipmentFamily]: MdBatchPrediction,
+    [LOOKUP_KEYS.ScheduleFamily]: MdBatchPrediction,
+    [LOOKUP_KEYS.Experiment]: MdDatasetLinked,
+    [LOOKUP_KEYS.CyclerTest]: MdMultilineChart,
+    [LOOKUP_KEYS.Cell]: MdBatteryFull,
+    [LOOKUP_KEYS.Equipment]: MdPrecisionManufacturing,
+    [LOOKUP_KEYS.Schedule]: MdAssignment,
+    [LOOKUP_KEYS.ArbitraryFile]: MdAttachFile,
+    [LOOKUP_KEYS.ValidationSchema]: MdSchema,
+    [LOOKUP_KEYS.Lab]: MdHolidayVillage,
+    [LOOKUP_KEYS.Team]: MdPeopleAlt,
+    [LOOKUP_KEYS.User]: MdPerson,
+    [LOOKUP_KEYS.Token]: MdVpnKey,
     STORAGE: MdSdStorage,
-    [LOOKUP_KEYS.GALV_STORAGE]: MdSdStorage,
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: MdSdStorage,
+    [LOOKUP_KEYS.GalvStorage]: MdSdStorage,
+    [LOOKUP_KEYS.AdditionalStorage]: MdSdStorage,
     DASHBOARD: MdHome,
     MANAGE_ACCOUNT: MdManageAccounts,
     LOGOUT: MdLogout,
@@ -309,40 +309,40 @@ export const ICONS = {
  * like they might be resource URLs.
  */
 export const PATHS = {
-    [LOOKUP_KEYS.HARVESTER]: '/harvesters',
-    [LOOKUP_KEYS.PATH]: '/paths',
-    [LOOKUP_KEYS.PARQUET_PARTITION]: '/parquet_partitions',
-    [LOOKUP_KEYS.FILE]: '/files',
-    [LOOKUP_KEYS.COLUMN_FAMILY]: '/column_types',
-    [LOOKUP_KEYS.UNIT]: '/units',
+    [LOOKUP_KEYS.Harvester]: '/harvesters',
+    [LOOKUP_KEYS.Path]: '/paths',
+    [LOOKUP_KEYS.ParquetPartition]: '/parquet_partitions',
+    [LOOKUP_KEYS.File]: '/files',
+    [LOOKUP_KEYS.ColumnFamily]: '/column_types',
+    [LOOKUP_KEYS.Unit]: '/units',
     DASHBOARD: '/',
-    [LOOKUP_KEYS.MAPPING]: '/mapping',
-    [LOOKUP_KEYS.EXPERIMENT]: '/experiments',
-    [LOOKUP_KEYS.CYCLER_TEST]: '/cycler_tests',
+    [LOOKUP_KEYS.ColumnMapping]: '/mapping',
+    [LOOKUP_KEYS.Experiment]: '/experiments',
+    [LOOKUP_KEYS.CyclerTest]: '/cycler_tests',
     GRAPH: '/graphs',
-    [LOOKUP_KEYS.CELL]: '/cells',
-    [LOOKUP_KEYS.CELL_FAMILY]: '/cell_families',
-    [LOOKUP_KEYS.EQUIPMENT]: '/equipment',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: '/equipment_families',
-    [LOOKUP_KEYS.SCHEDULE]: '/schedules',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: '/schedule_families',
-    [LOOKUP_KEYS.ARBITRARY_FILE]: '/arbitrary_files',
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: '/validation_schemas',
-    [LOOKUP_KEYS.LAB]: '/labs',
-    [LOOKUP_KEYS.TEAM]: '/teams',
-    [LOOKUP_KEYS.USER]: '/users',
-    [LOOKUP_KEYS.TOKEN]: '/tokens',
-    [LOOKUP_KEYS.GALV_STORAGE]: '/galv_storage',
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: '/additional_storage',
+    [LOOKUP_KEYS.Cell]: '/cells',
+    [LOOKUP_KEYS.CellFamily]: '/cell_families',
+    [LOOKUP_KEYS.Equipment]: '/equipment',
+    [LOOKUP_KEYS.EquipmentFamily]: '/equipment_families',
+    [LOOKUP_KEYS.Schedule]: '/schedules',
+    [LOOKUP_KEYS.ScheduleFamily]: '/schedule_families',
+    [LOOKUP_KEYS.ArbitraryFile]: '/arbitrary_files',
+    [LOOKUP_KEYS.ValidationSchema]: '/validation_schemas',
+    [LOOKUP_KEYS.Lab]: '/labs',
+    [LOOKUP_KEYS.Team]: '/teams',
+    [LOOKUP_KEYS.User]: '/users',
+    [LOOKUP_KEYS.Token]: '/tokens',
+    [LOOKUP_KEYS.GalvStorage]: '/galv_storage',
+    [LOOKUP_KEYS.AdditionalStorage]: '/additional_storage',
     PROFILE: '/profile',
-    [AUTOCOMPLETE_KEYS.CELL_MANUFACTURER]: '/cell_manufacturers',
-    [AUTOCOMPLETE_KEYS.CELL_MODEL]: '/cell_models',
-    [AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR]: '/cell_form_factors',
-    [AUTOCOMPLETE_KEYS.CELL_CHEMISTRY]: '/cell_chemistries',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE]: '/equipment_types',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER]: '/equipment_manufacturers',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL]: '/equipment_models',
-    [AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER]: '/schedule_identifiers',
+    [AUTOCOMPLETE_KEYS.CellManufacturer]: '/cell_manufacturers',
+    [AUTOCOMPLETE_KEYS.CellModel]: '/cell_models',
+    [AUTOCOMPLETE_KEYS.CellFormFactor]: '/cell_form_factors',
+    [AUTOCOMPLETE_KEYS.CellChemistry]: '/cell_chemistries',
+    [AUTOCOMPLETE_KEYS.EquipmentType]: '/equipment_types',
+    [AUTOCOMPLETE_KEYS.EquipmentManufacturer]: '/equipment_manufacturers',
+    [AUTOCOMPLETE_KEYS.EquipmentModel]: '/equipment_models',
+    [AUTOCOMPLETE_KEYS.ScheduleIdentifier]: '/schedule_identifiers',
     UPLOAD: '/upload',
 } as const
 
@@ -350,62 +350,62 @@ export const PATHS = {
  * Display names are in Title Case.
  */
 export const DISPLAY_NAMES = {
-    [LOOKUP_KEYS.HARVESTER]: 'Harvester',
-    [LOOKUP_KEYS.PATH]: 'Path',
-    [LOOKUP_KEYS.PARQUET_PARTITION]: 'Parquet Partition',
-    [LOOKUP_KEYS.FILE]: 'File',
-    [LOOKUP_KEYS.MAPPING]: 'Mapping',
-    [LOOKUP_KEYS.COLUMN_FAMILY]: 'Column Type',
-    [LOOKUP_KEYS.UNIT]: 'Unit',
+    [LOOKUP_KEYS.Harvester]: 'Harvester',
+    [LOOKUP_KEYS.Path]: 'Path',
+    [LOOKUP_KEYS.ParquetPartition]: 'Parquet Partition',
+    [LOOKUP_KEYS.File]: 'File',
+    [LOOKUP_KEYS.ColumnMapping]: 'Mapping',
+    [LOOKUP_KEYS.ColumnFamily]: 'Column Type',
+    [LOOKUP_KEYS.Unit]: 'Unit',
     DASHBOARD: 'Dashboard',
-    [LOOKUP_KEYS.EXPERIMENT]: 'Experiment',
-    [LOOKUP_KEYS.CYCLER_TEST]: 'Cycler Test',
+    [LOOKUP_KEYS.Experiment]: 'Experiment',
+    [LOOKUP_KEYS.CyclerTest]: 'Cycler Test',
     DATASET: 'Dataset',
-    [LOOKUP_KEYS.CELL]: 'Cell',
-    [LOOKUP_KEYS.CELL_FAMILY]: 'Cell Family',
-    [LOOKUP_KEYS.EQUIPMENT]: 'Equipment',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: 'Equipment Family',
-    [LOOKUP_KEYS.SCHEDULE]: 'Schedule',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: 'Schedule Family',
-    [LOOKUP_KEYS.ARBITRARY_FILE]: 'Attachment',
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: 'Validation Schema',
-    [LOOKUP_KEYS.LAB]: 'Lab',
-    [LOOKUP_KEYS.TEAM]: 'Team',
-    [LOOKUP_KEYS.USER]: 'User',
-    [LOOKUP_KEYS.TOKEN]: 'Token',
-    [LOOKUP_KEYS.GALV_STORAGE]: 'Galv Storage',
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: 'Additional Storage',
+    [LOOKUP_KEYS.Cell]: 'Cell',
+    [LOOKUP_KEYS.CellFamily]: 'Cell Family',
+    [LOOKUP_KEYS.Equipment]: 'Equipment',
+    [LOOKUP_KEYS.EquipmentFamily]: 'Equipment Family',
+    [LOOKUP_KEYS.Schedule]: 'Schedule',
+    [LOOKUP_KEYS.ScheduleFamily]: 'Schedule Family',
+    [LOOKUP_KEYS.ArbitraryFile]: 'Attachment',
+    [LOOKUP_KEYS.ValidationSchema]: 'Validation Schema',
+    [LOOKUP_KEYS.Lab]: 'Lab',
+    [LOOKUP_KEYS.Team]: 'Team',
+    [LOOKUP_KEYS.User]: 'User',
+    [LOOKUP_KEYS.Token]: 'Token',
+    [LOOKUP_KEYS.GalvStorage]: 'Galv Storage',
+    [LOOKUP_KEYS.AdditionalStorage]: 'Additional Storage',
 } as const
 
 /**
  * Title Case, as with DISPLAY_NAMES. Plural.
  */
 export const DISPLAY_NAMES_PLURAL = {
-    [LOOKUP_KEYS.HARVESTER]: 'Harvesters',
-    [LOOKUP_KEYS.PATH]: 'Paths',
-    [LOOKUP_KEYS.PARQUET_PARTITION]: 'Parquet Partitions',
-    [LOOKUP_KEYS.FILE]: 'Files',
-    [LOOKUP_KEYS.MAPPING]: 'Mappings',
-    [LOOKUP_KEYS.COLUMN_FAMILY]: 'Column Type',
-    [LOOKUP_KEYS.UNIT]: 'Unit',
+    [LOOKUP_KEYS.Harvester]: 'Harvesters',
+    [LOOKUP_KEYS.Path]: 'Paths',
+    [LOOKUP_KEYS.ParquetPartition]: 'Parquet Partitions',
+    [LOOKUP_KEYS.File]: 'Files',
+    [LOOKUP_KEYS.ColumnMapping]: 'Mappings',
+    [LOOKUP_KEYS.ColumnFamily]: 'Column Type',
+    [LOOKUP_KEYS.Unit]: 'Unit',
     DASHBOARD: 'Dashboard',
-    [LOOKUP_KEYS.EXPERIMENT]: 'Experiments',
-    [LOOKUP_KEYS.CYCLER_TEST]: 'Cycler Tests',
+    [LOOKUP_KEYS.Experiment]: 'Experiments',
+    [LOOKUP_KEYS.CyclerTest]: 'Cycler Tests',
     DATASET: 'Datasets',
-    [LOOKUP_KEYS.CELL]: 'Cells',
-    [LOOKUP_KEYS.CELL_FAMILY]: 'Cell Families',
-    [LOOKUP_KEYS.EQUIPMENT]: 'Equipment',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: 'Equipment Families',
-    [LOOKUP_KEYS.SCHEDULE]: 'Schedules',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: 'Schedule Families',
-    [LOOKUP_KEYS.ARBITRARY_FILE]: 'Attachments',
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: 'Validation Schemas',
-    [LOOKUP_KEYS.LAB]: 'Labs',
-    [LOOKUP_KEYS.TEAM]: 'Teams',
-    [LOOKUP_KEYS.USER]: 'Users',
-    [LOOKUP_KEYS.TOKEN]: 'Tokens',
-    [LOOKUP_KEYS.GALV_STORAGE]: 'Galv Storage',
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: 'Additional Storage',
+    [LOOKUP_KEYS.Cell]: 'Cells',
+    [LOOKUP_KEYS.CellFamily]: 'Cell Families',
+    [LOOKUP_KEYS.Equipment]: 'Equipment',
+    [LOOKUP_KEYS.EquipmentFamily]: 'Equipment Families',
+    [LOOKUP_KEYS.Schedule]: 'Schedules',
+    [LOOKUP_KEYS.ScheduleFamily]: 'Schedule Families',
+    [LOOKUP_KEYS.ArbitraryFile]: 'Attachments',
+    [LOOKUP_KEYS.ValidationSchema]: 'Validation Schemas',
+    [LOOKUP_KEYS.Lab]: 'Labs',
+    [LOOKUP_KEYS.Team]: 'Teams',
+    [LOOKUP_KEYS.User]: 'Users',
+    [LOOKUP_KEYS.Token]: 'Tokens',
+    [LOOKUP_KEYS.GalvStorage]: 'Galv Storage',
+    [LOOKUP_KEYS.AdditionalStorage]: 'Additional Storage',
 } as const
 
 /**
@@ -420,37 +420,37 @@ export const DISPLAY_NAMES_PLURAL = {
  * ```
  */
 export const API_SLUGS = {
-    [LOOKUP_KEYS.HARVESTER]: 'harvesters',
-    [LOOKUP_KEYS.PATH]: 'monitoredPaths',
-    [LOOKUP_KEYS.PARQUET_PARTITION]: 'parquetPartitions',
-    [LOOKUP_KEYS.FILE]: 'files',
-    [LOOKUP_KEYS.MAPPING]: 'columnMappings',
-    [LOOKUP_KEYS.COLUMN_FAMILY]: 'columnTypes',
-    [LOOKUP_KEYS.UNIT]: 'units',
-    [LOOKUP_KEYS.CELL]: 'cells',
-    [LOOKUP_KEYS.EQUIPMENT]: 'equipment',
-    [LOOKUP_KEYS.SCHEDULE]: 'schedules',
-    [LOOKUP_KEYS.CELL_FAMILY]: 'cellFamilies',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: 'equipmentFamilies',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: 'scheduleFamilies',
-    [LOOKUP_KEYS.EXPERIMENT]: 'experiments',
-    [LOOKUP_KEYS.CYCLER_TEST]: 'cyclerTests',
-    [LOOKUP_KEYS.ARBITRARY_FILE]: 'arbitraryFiles',
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: 'validationSchemas',
-    [LOOKUP_KEYS.LAB]: 'labs',
-    [LOOKUP_KEYS.TEAM]: 'teams',
-    [LOOKUP_KEYS.USER]: 'users',
-    [LOOKUP_KEYS.TOKEN]: 'tokens',
-    [LOOKUP_KEYS.GALV_STORAGE]: 'galvStorage',
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: 'additionalStorage',
-    [AUTOCOMPLETE_KEYS.CELL_MANUFACTURER]: 'cellManufacturers',
-    [AUTOCOMPLETE_KEYS.CELL_MODEL]: 'cellModels',
-    [AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR]: 'cellFormFactors',
-    [AUTOCOMPLETE_KEYS.CELL_CHEMISTRY]: 'cellChemistries',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE]: 'equipmentTypes',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER]: 'equipmentManufacturers',
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL]: 'equipmentModels',
-    [AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER]: 'scheduleIdentifiers',
+    [LOOKUP_KEYS.Harvester]: 'harvesters',
+    [LOOKUP_KEYS.Path]: 'monitoredPaths',
+    [LOOKUP_KEYS.ParquetPartition]: 'parquetPartitions',
+    [LOOKUP_KEYS.File]: 'files',
+    [LOOKUP_KEYS.ColumnMapping]: 'columnMappings',
+    [LOOKUP_KEYS.ColumnFamily]: 'columnTypes',
+    [LOOKUP_KEYS.Unit]: 'units',
+    [LOOKUP_KEYS.Cell]: 'cells',
+    [LOOKUP_KEYS.Equipment]: 'equipment',
+    [LOOKUP_KEYS.Schedule]: 'schedules',
+    [LOOKUP_KEYS.CellFamily]: 'cellFamilies',
+    [LOOKUP_KEYS.EquipmentFamily]: 'equipmentFamilies',
+    [LOOKUP_KEYS.ScheduleFamily]: 'scheduleFamilies',
+    [LOOKUP_KEYS.Experiment]: 'experiments',
+    [LOOKUP_KEYS.CyclerTest]: 'cyclerTests',
+    [LOOKUP_KEYS.ArbitraryFile]: 'arbitraryFiles',
+    [LOOKUP_KEYS.ValidationSchema]: 'validationSchemas',
+    [LOOKUP_KEYS.Lab]: 'labs',
+    [LOOKUP_KEYS.Team]: 'teams',
+    [LOOKUP_KEYS.User]: 'users',
+    [LOOKUP_KEYS.Token]: 'tokens',
+    [LOOKUP_KEYS.GalvStorage]: 'galvStorage',
+    [LOOKUP_KEYS.AdditionalStorage]: 'additionalStorage',
+    [AUTOCOMPLETE_KEYS.CellManufacturer]: 'cellManufacturers',
+    [AUTOCOMPLETE_KEYS.CellModel]: 'cellModels',
+    [AUTOCOMPLETE_KEYS.CellFormFactor]: 'cellFormFactors',
+    [AUTOCOMPLETE_KEYS.CellChemistry]: 'cellChemistries',
+    [AUTOCOMPLETE_KEYS.EquipmentType]: 'equipmentTypes',
+    [AUTOCOMPLETE_KEYS.EquipmentManufacturer]: 'equipmentManufacturers',
+    [AUTOCOMPLETE_KEYS.EquipmentModel]: 'equipmentModels',
+    [AUTOCOMPLETE_KEYS.ScheduleIdentifier]: 'scheduleIdentifiers',
 } as const
 
 /**
@@ -460,37 +460,37 @@ export const API_SLUGS = {
  * Used when we don't know the order of the arguments to the API function.
  */
 export const API_HANDLERS = {
-    [LOOKUP_KEYS.HARVESTER]: HarvestersApi,
-    [LOOKUP_KEYS.PATH]: MonitoredPathsApi,
-    [LOOKUP_KEYS.PARQUET_PARTITION]: ParquetPartitionsApi,
-    [LOOKUP_KEYS.FILE]: FilesApi,
-    [LOOKUP_KEYS.MAPPING]: ColumnMappingsApi,
-    [LOOKUP_KEYS.COLUMN_FAMILY]: ColumnTypesApi,
-    [LOOKUP_KEYS.UNIT]: UnitsApi,
-    [LOOKUP_KEYS.CELL_FAMILY]: CellFamiliesApi,
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: EquipmentFamiliesApi,
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: ScheduleFamiliesApi,
-    [LOOKUP_KEYS.EXPERIMENT]: ExperimentsApi,
-    [LOOKUP_KEYS.CYCLER_TEST]: CyclerTestsApi,
-    [LOOKUP_KEYS.CELL]: CellsApi,
-    [LOOKUP_KEYS.EQUIPMENT]: EquipmentApi,
-    [LOOKUP_KEYS.SCHEDULE]: SchedulesApi,
-    [LOOKUP_KEYS.ARBITRARY_FILE]: ArbitraryFilesApi,
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: ValidationSchemasApi,
-    [LOOKUP_KEYS.LAB]: LabsApi,
-    [LOOKUP_KEYS.TEAM]: TeamsApi,
-    [LOOKUP_KEYS.USER]: UsersApi,
-    [LOOKUP_KEYS.TOKEN]: TokensApi,
-    [LOOKUP_KEYS.GALV_STORAGE]: GalvStorageApi,
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: AdditionalStorageApi,
-    [AUTOCOMPLETE_KEYS.CELL_MANUFACTURER]: CellManufacturersApi,
-    [AUTOCOMPLETE_KEYS.CELL_MODEL]: CellModelsApi,
-    [AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR]: CellFormFactorsApi,
-    [AUTOCOMPLETE_KEYS.CELL_CHEMISTRY]: CellChemistriesApi,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE]: EquipmentTypesApi,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER]: EquipmentManufacturersApi,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL]: EquipmentModelsApi,
-    [AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER]: ScheduleIdentifiersApi,
+    [LOOKUP_KEYS.Harvester]: HarvestersApi,
+    [LOOKUP_KEYS.Path]: MonitoredPathsApi,
+    [LOOKUP_KEYS.ParquetPartition]: ParquetPartitionsApi,
+    [LOOKUP_KEYS.File]: FilesApi,
+    [LOOKUP_KEYS.ColumnMapping]: ColumnMappingsApi,
+    [LOOKUP_KEYS.ColumnFamily]: ColumnTypesApi,
+    [LOOKUP_KEYS.Unit]: UnitsApi,
+    [LOOKUP_KEYS.CellFamily]: CellFamiliesApi,
+    [LOOKUP_KEYS.EquipmentFamily]: EquipmentFamiliesApi,
+    [LOOKUP_KEYS.ScheduleFamily]: ScheduleFamiliesApi,
+    [LOOKUP_KEYS.Experiment]: ExperimentsApi,
+    [LOOKUP_KEYS.CyclerTest]: CyclerTestsApi,
+    [LOOKUP_KEYS.Cell]: CellsApi,
+    [LOOKUP_KEYS.Equipment]: EquipmentApi,
+    [LOOKUP_KEYS.Schedule]: SchedulesApi,
+    [LOOKUP_KEYS.ArbitraryFile]: ArbitraryFilesApi,
+    [LOOKUP_KEYS.ValidationSchema]: ValidationSchemasApi,
+    [LOOKUP_KEYS.Lab]: LabsApi,
+    [LOOKUP_KEYS.Team]: TeamsApi,
+    [LOOKUP_KEYS.User]: UsersApi,
+    [LOOKUP_KEYS.Token]: TokensApi,
+    [LOOKUP_KEYS.GalvStorage]: GalvStorageApi,
+    [LOOKUP_KEYS.AdditionalStorage]: AdditionalStorageApi,
+    [AUTOCOMPLETE_KEYS.CellManufacturer]: CellManufacturersApi,
+    [AUTOCOMPLETE_KEYS.CellModel]: CellModelsApi,
+    [AUTOCOMPLETE_KEYS.CellFormFactor]: CellFormFactorsApi,
+    [AUTOCOMPLETE_KEYS.CellChemistry]: CellChemistriesApi,
+    [AUTOCOMPLETE_KEYS.EquipmentType]: EquipmentTypesApi,
+    [AUTOCOMPLETE_KEYS.EquipmentManufacturer]: EquipmentManufacturersApi,
+    [AUTOCOMPLETE_KEYS.EquipmentModel]: EquipmentModelsApi,
+    [AUTOCOMPLETE_KEYS.ScheduleIdentifier]: ScheduleIdentifiersApi,
 } as const
 
 /**
@@ -500,37 +500,37 @@ export const API_HANDLERS = {
  * This is used when we don't know the name of the parameters we want to set.
  */
 export const API_HANDLERS_FP = {
-    [LOOKUP_KEYS.HARVESTER]: HarvestersApiFp,
-    [LOOKUP_KEYS.PATH]: MonitoredPathsApiFp,
-    [LOOKUP_KEYS.PARQUET_PARTITION]: ParquetPartitionsApiFp,
-    [LOOKUP_KEYS.FILE]: FilesApiFp,
-    [LOOKUP_KEYS.MAPPING]: ColumnMappingsApiFp,
-    [LOOKUP_KEYS.COLUMN_FAMILY]: ColumnTypesApiFp,
-    [LOOKUP_KEYS.UNIT]: UnitsApiFp,
-    [LOOKUP_KEYS.CELL_FAMILY]: CellFamiliesApiFp,
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: EquipmentFamiliesApiFp,
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: ScheduleFamiliesApiFp,
-    [LOOKUP_KEYS.EXPERIMENT]: ExperimentsApiFp,
-    [LOOKUP_KEYS.CYCLER_TEST]: CyclerTestsApiFp,
-    [LOOKUP_KEYS.CELL]: CellsApiFp,
-    [LOOKUP_KEYS.EQUIPMENT]: EquipmentApiFp,
-    [LOOKUP_KEYS.SCHEDULE]: SchedulesApiFp,
-    [LOOKUP_KEYS.ARBITRARY_FILE]: ArbitraryFilesApiFp,
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: ValidationSchemasApiFp,
-    [LOOKUP_KEYS.LAB]: LabsApiFp,
-    [LOOKUP_KEYS.TEAM]: TeamsApiFp,
-    [LOOKUP_KEYS.USER]: UsersApiFp,
-    [LOOKUP_KEYS.TOKEN]: TokensApiFp,
-    [LOOKUP_KEYS.GALV_STORAGE]: GalvStorageApiFp,
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: AdditionalStorageApiFp,
-    [AUTOCOMPLETE_KEYS.CELL_MANUFACTURER]: CellManufacturersApiFp,
-    [AUTOCOMPLETE_KEYS.CELL_MODEL]: CellModelsApiFp,
-    [AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR]: CellFormFactorsApiFp,
-    [AUTOCOMPLETE_KEYS.CELL_CHEMISTRY]: CellChemistriesApiFp,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE]: EquipmentTypesApiFp,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER]: EquipmentManufacturersApiFp,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL]: EquipmentModelsApiFp,
-    [AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER]: ScheduleIdentifiersApiFp,
+    [LOOKUP_KEYS.Harvester]: HarvestersApiFp,
+    [LOOKUP_KEYS.Path]: MonitoredPathsApiFp,
+    [LOOKUP_KEYS.ParquetPartition]: ParquetPartitionsApiFp,
+    [LOOKUP_KEYS.File]: FilesApiFp,
+    [LOOKUP_KEYS.ColumnMapping]: ColumnMappingsApiFp,
+    [LOOKUP_KEYS.ColumnFamily]: ColumnTypesApiFp,
+    [LOOKUP_KEYS.Unit]: UnitsApiFp,
+    [LOOKUP_KEYS.CellFamily]: CellFamiliesApiFp,
+    [LOOKUP_KEYS.EquipmentFamily]: EquipmentFamiliesApiFp,
+    [LOOKUP_KEYS.ScheduleFamily]: ScheduleFamiliesApiFp,
+    [LOOKUP_KEYS.Experiment]: ExperimentsApiFp,
+    [LOOKUP_KEYS.CyclerTest]: CyclerTestsApiFp,
+    [LOOKUP_KEYS.Cell]: CellsApiFp,
+    [LOOKUP_KEYS.Equipment]: EquipmentApiFp,
+    [LOOKUP_KEYS.Schedule]: SchedulesApiFp,
+    [LOOKUP_KEYS.ArbitraryFile]: ArbitraryFilesApiFp,
+    [LOOKUP_KEYS.ValidationSchema]: ValidationSchemasApiFp,
+    [LOOKUP_KEYS.Lab]: LabsApiFp,
+    [LOOKUP_KEYS.Team]: TeamsApiFp,
+    [LOOKUP_KEYS.User]: UsersApiFp,
+    [LOOKUP_KEYS.Token]: TokensApiFp,
+    [LOOKUP_KEYS.GalvStorage]: GalvStorageApiFp,
+    [LOOKUP_KEYS.AdditionalStorage]: AdditionalStorageApiFp,
+    [AUTOCOMPLETE_KEYS.CellManufacturer]: CellManufacturersApiFp,
+    [AUTOCOMPLETE_KEYS.CellModel]: CellModelsApiFp,
+    [AUTOCOMPLETE_KEYS.CellFormFactor]: CellFormFactorsApiFp,
+    [AUTOCOMPLETE_KEYS.CellChemistry]: CellChemistriesApiFp,
+    [AUTOCOMPLETE_KEYS.EquipmentType]: EquipmentTypesApiFp,
+    [AUTOCOMPLETE_KEYS.EquipmentManufacturer]: EquipmentManufacturersApiFp,
+    [AUTOCOMPLETE_KEYS.EquipmentModel]: EquipmentModelsApiFp,
+    [AUTOCOMPLETE_KEYS.ScheduleIdentifier]: ScheduleIdentifiersApiFp,
 } as const
 
 /**
@@ -573,7 +573,7 @@ const always_fields: { [key: string]: Field } = {
     permissions: { read_only: true, type: 'object' },
 }
 const team_fields: { [key: string]: Field } = {
-    team: { read_only: true, type: 'galv_TEAM', create_only: true },
+    team: { read_only: true, type: 'galv_Team', create_only: true },
     validation_results: { read_only: true, type: 'object', many: true },
 }
 const generic_fields: { [key: string]: Field } = {
@@ -594,14 +594,14 @@ const file_fields = {
         type: 'string',
         priority: PRIORITY_LEVELS.IDENTITY,
     },
-    team: { read_only: true, type: 'galv_TEAM', create_only: true },
-    uploader: { create_only: true, type: key_to_type(LOOKUP_KEYS.USER) },
+    team: { read_only: true, type: 'galv_Team', create_only: true },
+    uploader: { create_only: true, type: key_to_type(LOOKUP_KEYS.User) },
     state: { read_only: true, type: 'string' },
     path: { read_only: true, type: 'string' },
     parser: { read_only: true, type: 'string' },
     harvester: {
         read_only: true,
-        type: key_to_type(LOOKUP_KEYS.HARVESTER),
+        type: key_to_type(LOOKUP_KEYS.Harvester),
     },
     last_observed_size: { read_only: true, type: 'number' },
     last_observed_time: { read_only: true, type: 'datetime' },
@@ -621,7 +621,7 @@ const file_fields = {
     upload_info: { read_only: true, type: 'string' },
     parquet_partitions: {
         read_only: true,
-        type: key_to_type(LOOKUP_KEYS.PARQUET_PARTITION),
+        type: key_to_type(LOOKUP_KEYS.ParquetPartition),
         many: true,
     },
     applicable_mappings: {
@@ -629,7 +629,7 @@ const file_fields = {
         type: 'string',
         priority: PRIORITY_LEVELS.HIDDEN,
     },
-    mapping: { read_only: true, type: key_to_type(LOOKUP_KEYS.MAPPING) },
+    mapping: { read_only: true, type: key_to_type(LOOKUP_KEYS.ColumnMapping) },
     summary: {
         read_only: true,
         type: 'string',
@@ -641,7 +641,7 @@ const file_fields = {
  * Lookup map to get the properties of the fields in each resource type.
  */
 export const FIELDS = {
-    [LOOKUP_KEYS.HARVESTER]: {
+    [LOOKUP_KEYS.Harvester]: {
         ...generic_fields,
         name: {
             read_only: false,
@@ -663,7 +663,7 @@ export const FIELDS = {
             priority: PRIORITY_LEVELS.CONTEXT,
         },
     },
-    [LOOKUP_KEYS.PATH]: {
+    [LOOKUP_KEYS.Path]: {
         ...generic_fields,
         path: {
             read_only: false,
@@ -680,21 +680,21 @@ export const FIELDS = {
         maximum_partition_line_count: { read_only: false, type: 'number' },
         harvester: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.HARVESTER),
+            type: key_to_type(LOOKUP_KEYS.Harvester),
 
             create_only: true,
             fetch_in_download: true,
         },
         files: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.FILE),
+            type: key_to_type(LOOKUP_KEYS.File),
             many: true,
         },
         ...team_fields,
     },
-    [LOOKUP_KEYS.PARQUET_PARTITION]: {
+    [LOOKUP_KEYS.ParquetPartition]: {
         ...generic_fields,
-        observed_file: { read_only: true, type: key_to_type(LOOKUP_KEYS.FILE) },
+        observed_file: { read_only: true, type: key_to_type(LOOKUP_KEYS.File) },
         partition_number: {
             read_only: true,
             type: 'number',
@@ -704,16 +704,19 @@ export const FIELDS = {
         upload_errors: { read_only: true, type: 'string', many: true },
         parquet_file: { read_only: true, type: 'attachment' },
     },
-    [LOOKUP_KEYS.FILE]: { ...file_fields },
+    [LOOKUP_KEYS.File]: { ...file_fields },
     FILE_CREATE: {
         ...file_fields,
         target_file_id: { read_only: true, type: 'string' },
-        team: { read_only: false, type: 'galv_TEAM' },
-        uploader: { create_only: true, type: key_to_type(LOOKUP_KEYS.USER) },
+        team: { read_only: false, type: 'galv_Team' },
+        uploader: { create_only: true, type: key_to_type(LOOKUP_KEYS.User) },
         path: { read_only: false, type: 'string' },
-        mapping: { read_only: false, type: key_to_type(LOOKUP_KEYS.MAPPING) },
+        mapping: {
+            read_only: false,
+            type: key_to_type(LOOKUP_KEYS.ColumnMapping),
+        },
     },
-    [LOOKUP_KEYS.MAPPING]: {
+    [LOOKUP_KEYS.ColumnMapping]: {
         ...generic_fields,
         name: {
             read_only: false,
@@ -725,7 +728,7 @@ export const FIELDS = {
         missing: { read_only: true, type: 'number' }, // only appears as part of a FILE response
         ...team_fields,
     },
-    [LOOKUP_KEYS.COLUMN_FAMILY]: {
+    [LOOKUP_KEYS.ColumnFamily]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         is_default: { read_only: true, type: 'boolean' },
@@ -739,12 +742,12 @@ export const FIELDS = {
         data_type: { read_only: false, type: 'string' },
         unit: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.UNIT),
+            type: key_to_type(LOOKUP_KEYS.Unit),
             fetch_in_download: true,
         },
         ...team_fields,
     },
-    [LOOKUP_KEYS.UNIT]: {
+    [LOOKUP_KEYS.Unit]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         is_default: { read_only: true, type: 'boolean' },
@@ -761,7 +764,7 @@ export const FIELDS = {
         description: { read_only: false, type: 'string' },
         ...team_fields,
     },
-    [LOOKUP_KEYS.EXPERIMENT]: {
+    [LOOKUP_KEYS.Experiment]: {
         title: {
             read_only: false,
             type: 'string',
@@ -770,7 +773,7 @@ export const FIELDS = {
         description: { read_only: false, type: 'string' },
         authors: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.USER),
+            type: key_to_type(LOOKUP_KEYS.User),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
             fetch_in_download: true,
@@ -779,40 +782,40 @@ export const FIELDS = {
         protocol_file: { read_only: false, type: 'string' },
         cycler_tests: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.CYCLER_TEST),
+            type: key_to_type(LOOKUP_KEYS.CyclerTest),
             many: true,
             fetch_in_download: true,
         },
         ...team_fields,
     },
-    [LOOKUP_KEYS.CYCLER_TEST]: {
+    [LOOKUP_KEYS.CyclerTest]: {
         ...generic_fields,
         cell: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.CELL),
+            type: key_to_type(LOOKUP_KEYS.Cell),
             fetch_in_download: true,
         },
         schedule: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.SCHEDULE),
+            type: key_to_type(LOOKUP_KEYS.Schedule),
             fetch_in_download: true,
         },
         equipment: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.EQUIPMENT),
+            type: key_to_type(LOOKUP_KEYS.Equipment),
             many: true,
             fetch_in_download: true,
         },
         files: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.FILE),
+            type: key_to_type(LOOKUP_KEYS.File),
             many: true,
             fetch_in_download: true,
         },
         rendered_schedule: { read_only: true, type: 'string', many: true },
         ...team_fields,
     },
-    [LOOKUP_KEYS.CELL]: {
+    [LOOKUP_KEYS.Cell]: {
         ...generic_fields,
         identifier: {
             read_only: false,
@@ -821,19 +824,19 @@ export const FIELDS = {
         },
         family: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.CELL_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.CellFamily),
             priority: PRIORITY_LEVELS.CONTEXT,
             fetch_in_download: true,
         },
         ...team_fields,
         cycler_tests: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.CYCLER_TEST),
+            type: key_to_type(LOOKUP_KEYS.CyclerTest),
             many: true,
         },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.EQUIPMENT]: {
+    [LOOKUP_KEYS.Equipment]: {
         ...generic_fields,
         identifier: {
             read_only: false,
@@ -842,7 +845,7 @@ export const FIELDS = {
         },
         family: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.EQUIPMENT_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.EquipmentFamily),
             priority: PRIORITY_LEVELS.CONTEXT,
             fetch_in_download: true,
         },
@@ -850,11 +853,11 @@ export const FIELDS = {
         calibration_date: { read_only: false, type: 'string' },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.SCHEDULE]: {
+    [LOOKUP_KEYS.Schedule]: {
         ...generic_fields,
         family: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.SCHEDULE_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.ScheduleFamily),
             priority: PRIORITY_LEVELS.CONTEXT,
             fetch_in_download: true,
         },
@@ -863,32 +866,32 @@ export const FIELDS = {
         pybamm_schedule_variables: { read_only: false, type: 'object' },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.CELL_FAMILY]: {
+    [LOOKUP_KEYS.CellFamily]: {
         ...generic_fields,
         ...team_fields,
         manufacturer: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.CELL_MANUFACTURER),
+            type: key_to_type(AUTOCOMPLETE_KEYS.CellManufacturer),
             priority: PRIORITY_LEVELS.IDENTITY,
         },
         model: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.CELL_MODEL),
+            type: key_to_type(AUTOCOMPLETE_KEYS.CellModel),
             priority: PRIORITY_LEVELS.IDENTITY,
         },
         form_factor: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR),
+            type: key_to_type(AUTOCOMPLETE_KEYS.CellFormFactor),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         chemistry: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.CELL_CHEMISTRY),
+            type: key_to_type(AUTOCOMPLETE_KEYS.CellChemistry),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         cells: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.CELL),
+            type: key_to_type(LOOKUP_KEYS.Cell),
             many: true,
         },
         nominal_voltage_v: { read_only: false, type: 'number' },
@@ -899,37 +902,37 @@ export const FIELDS = {
         power_density: { read_only: false, type: 'number' },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: {
+    [LOOKUP_KEYS.EquipmentFamily]: {
         ...generic_fields,
         ...team_fields,
         manufacturer: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER),
+            type: key_to_type(AUTOCOMPLETE_KEYS.EquipmentManufacturer),
             priority: PRIORITY_LEVELS.IDENTITY,
         },
         model: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL),
+            type: key_to_type(AUTOCOMPLETE_KEYS.EquipmentModel),
             priority: PRIORITY_LEVELS.IDENTITY,
         },
         type: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE),
+            type: key_to_type(AUTOCOMPLETE_KEYS.EquipmentType),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         equipment: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.EQUIPMENT),
+            type: key_to_type(LOOKUP_KEYS.Equipment),
             many: true,
         },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: {
+    [LOOKUP_KEYS.ScheduleFamily]: {
         ...generic_fields,
         ...team_fields,
         identifier: {
             read_only: false,
-            type: key_to_type(AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER),
+            type: key_to_type(AUTOCOMPLETE_KEYS.ScheduleIdentifier),
             priority: PRIORITY_LEVELS.IDENTITY,
         },
         description: { read_only: false, type: 'string' },
@@ -937,12 +940,12 @@ export const FIELDS = {
         pybamm_template: { read_only: false, type: 'object' },
         schedules: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.SCHEDULE),
+            type: key_to_type(LOOKUP_KEYS.Schedule),
             many: true,
         },
         in_use: { read_only: true, type: 'boolean' },
     },
-    [LOOKUP_KEYS.TEAM]: {
+    [LOOKUP_KEYS.Team]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         name: {
@@ -953,83 +956,83 @@ export const FIELDS = {
         lab: {
             read_only: true,
             create_only: true,
-            type: key_to_type(LOOKUP_KEYS.LAB),
+            type: key_to_type(LOOKUP_KEYS.Lab),
             priority: PRIORITY_LEVELS.CONTEXT,
             fetch_in_download: true,
         },
         member_group: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.USER),
+            type: key_to_type(LOOKUP_KEYS.User),
             many: true,
 
             fetch_in_download: true,
         },
         admin_group: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.USER),
+            type: key_to_type(LOOKUP_KEYS.User),
             many: true,
 
             fetch_in_download: true,
         },
         monitored_paths: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.PATH),
+            type: key_to_type(LOOKUP_KEYS.Path),
             many: true,
         },
         cellfamily_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.CELL_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.CellFamily),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         cell_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.CELL),
+            type: key_to_type(LOOKUP_KEYS.Cell),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         equipmentfamily_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.EQUIPMENT_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.EquipmentFamily),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         equipment_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.EQUIPMENT),
+            type: key_to_type(LOOKUP_KEYS.Equipment),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         schedulefamily_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.SCHEDULE_FAMILY),
+            type: key_to_type(LOOKUP_KEYS.ScheduleFamily),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         schedule_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.SCHEDULE),
+            type: key_to_type(LOOKUP_KEYS.Schedule),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         cyclertest_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.CYCLER_TEST),
+            type: key_to_type(LOOKUP_KEYS.CyclerTest),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         experiment_resources: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.EXPERIMENT),
+            type: key_to_type(LOOKUP_KEYS.Experiment),
             many: true,
             priority: PRIORITY_LEVELS.CONTEXT,
         },
     },
-    [LOOKUP_KEYS.ARBITRARY_FILE]: {
+    [LOOKUP_KEYS.ArbitraryFile]: {
         ...generic_fields,
         lab: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.LAB),
+            type: key_to_type(LOOKUP_KEYS.Lab),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         name: {
@@ -1045,7 +1048,7 @@ export const FIELDS = {
         },
         team: team_fields.team,
     },
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: {
+    [LOOKUP_KEYS.ValidationSchema]: {
         ...generic_fields,
         name: {
             read_only: false,
@@ -1055,7 +1058,7 @@ export const FIELDS = {
         schema: { read_only: false, type: 'object' },
         ...team_fields,
     },
-    [LOOKUP_KEYS.LAB]: {
+    [LOOKUP_KEYS.Lab]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         name: {
@@ -1066,28 +1069,28 @@ export const FIELDS = {
         description: { read_only: false, type: 'string' },
         admin_group: {
             read_only: false,
-            type: key_to_type(LOOKUP_KEYS.USER),
+            type: key_to_type(LOOKUP_KEYS.User),
             many: true,
 
             fetch_in_download: true,
         },
         storages: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.ADDITIONAL_STORAGE),
+            type: key_to_type(LOOKUP_KEYS.AdditionalStorage),
             many: true,
         },
         teams: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.TEAM),
+            type: key_to_type(LOOKUP_KEYS.Team),
             many: true,
         },
         harvesters: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.HARVESTER),
+            type: key_to_type(LOOKUP_KEYS.Harvester),
             many: true,
         },
     },
-    [LOOKUP_KEYS.USER]: {
+    [LOOKUP_KEYS.User]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         username: {
@@ -1111,7 +1114,7 @@ export const FIELDS = {
             priority: PRIORITY_LEVELS.HIDDEN,
         },
     },
-    [LOOKUP_KEYS.TOKEN]: {
+    [LOOKUP_KEYS.Token]: {
         ...always_fields,
         id: { read_only: true, type: 'number' },
         name: {
@@ -1123,7 +1126,7 @@ export const FIELDS = {
         created: { read_only: true, type: 'string' },
         expiry: { read_only: true, type: 'datetime' },
     },
-    [LOOKUP_KEYS.GALV_STORAGE]: {
+    [LOOKUP_KEYS.GalvStorage]: {
         ...generic_fields,
         name: {
             read_only: false,
@@ -1132,7 +1135,7 @@ export const FIELDS = {
         },
         lab: {
             read_only: true,
-            type: key_to_type(LOOKUP_KEYS.LAB),
+            type: key_to_type(LOOKUP_KEYS.Lab),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         quota_bytes: { read_only: true, type: 'number' },
@@ -1140,7 +1143,7 @@ export const FIELDS = {
         priority: { read_only: false, type: 'number' },
         enabled: { read_only: false, type: 'boolean' },
     },
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: {
+    [LOOKUP_KEYS.AdditionalStorage]: {
         ...generic_fields,
         name: {
             read_only: false,
@@ -1150,7 +1153,7 @@ export const FIELDS = {
         lab: {
             read_only: true,
             create_only: true,
-            type: key_to_type(LOOKUP_KEYS.LAB),
+            type: key_to_type(LOOKUP_KEYS.Lab),
             priority: PRIORITY_LEVELS.CONTEXT,
         },
         quota_bytes: { read_only: false, type: 'number' },
@@ -1164,14 +1167,14 @@ export const FIELDS = {
         custom_domain: { read_only: false, type: 'string' },
         enabled: { read_only: false, type: 'boolean' },
     },
-    [AUTOCOMPLETE_KEYS.CELL_MANUFACTURER]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.CELL_MODEL]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.CELL_FORM_FACTOR]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.CELL_CHEMISTRY]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_TYPE]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MANUFACTURER]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.EQUIPMENT_MODEL]: autocomplete_fields,
-    [AUTOCOMPLETE_KEYS.SCHEDULE_IDENTIFIER]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.CellManufacturer]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.CellModel]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.CellFormFactor]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.CellChemistry]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.EquipmentType]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.EquipmentManufacturer]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.EquipmentModel]: autocomplete_fields,
+    [AUTOCOMPLETE_KEYS.ScheduleIdentifier]: autocomplete_fields,
 } as const
 
 /**
@@ -1183,12 +1186,12 @@ export const FIELDS = {
  * cell, equipment, and schedule all share the 'family' filter,
  * so the url path must also be appropriate.
  export const FILTER_NAMES = {
- [LOOKUP_KEYS.CELL_FAMILY]: "family_id",
- [LOOKUP_KEYS.EQUIPMENT_FAMILY]: "family_id",
- [LOOKUP_KEYS.SCHEDULE_FAMILY]: "family_id",
- [LOOKUP_KEYS.CELL]: "cell_id",
- [LOOKUP_KEYS.EQUIPMENT]: "equipment_id",
- [LOOKUP_KEYS.SCHEDULE]: "schedule_id",
+ [LOOKUP_KEYS.CellFamily]: "family_id",
+ [LOOKUP_KEYS.EquipmentFamily]: "family_id",
+ [LOOKUP_KEYS.ScheduleFamily]: "family_id",
+ [LOOKUP_KEYS.Cell]: "cell_id",
+ [LOOKUP_KEYS.Equipment]: "equipment_id",
+ [LOOKUP_KEYS.Schedule]: "schedule_id",
  [LOOKUP_KEYS.TEAM]: "team_id",
  } as const
  */
@@ -1197,9 +1200,9 @@ export const FIELDS = {
  * Lookup map to get the family lookup key for each resource type.
  */
 export const FAMILY_LOOKUP_KEYS = {
-    [LOOKUP_KEYS.CELL]: 'CELL_FAMILY',
-    [LOOKUP_KEYS.EQUIPMENT]: 'EQUIPMENT_FAMILY',
-    [LOOKUP_KEYS.SCHEDULE]: 'SCHEDULE_FAMILY',
+    [LOOKUP_KEYS.Cell]: 'CellFamily',
+    [LOOKUP_KEYS.Equipment]: 'EquipmentFamily',
+    [LOOKUP_KEYS.Schedule]: 'ScheduleFamily',
 } as const
 
 export const get_has_family = (
@@ -1210,18 +1213,18 @@ export const get_has_family = (
  * Lookup map to get the child lookup key for each resource family.
  */
 export const CHILD_LOOKUP_KEYS = {
-    [LOOKUP_KEYS.CELL_FAMILY]: 'CELL',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: 'EQUIPMENT',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: 'SCHEDULE',
+    [LOOKUP_KEYS.CellFamily]: 'Cell',
+    [LOOKUP_KEYS.EquipmentFamily]: 'Equipment',
+    [LOOKUP_KEYS.ScheduleFamily]: 'Schedule',
 } as const
 
 /**
  * Lookup map to get the child field name for each resource family.
  */
 export const CHILD_PROPERTY_NAMES = {
-    [LOOKUP_KEYS.CELL_FAMILY]: 'cells',
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: 'equipment',
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: 'schedules',
+    [LOOKUP_KEYS.CellFamily]: 'cells',
+    [LOOKUP_KEYS.EquipmentFamily]: 'equipment',
+    [LOOKUP_KEYS.ScheduleFamily]: 'schedules',
 } as const
 
 export const get_is_family = (
@@ -1230,23 +1233,23 @@ export const get_is_family = (
     Object.keys(CHILD_PROPERTY_NAMES).includes(key as string)
 
 export const INTRODUCTIONS = {
-    [LOOKUP_KEYS.HARVESTER]: `
+    [LOOKUP_KEYS.Harvester]: `
 Harvesters are specialized tools designed to gather data from external sources. 
-Each harvester is associated with a [lab](${PATHS[LOOKUP_KEYS.LAB]}), 
-and any team within that lab can configure a [monitored path](${PATHS[LOOKUP_KEYS.PATH]}) for it.
+Each harvester is associated with a [lab](${PATHS[LOOKUP_KEYS.Lab]}), 
+and any team within that lab can configure a [monitored path](${PATHS[LOOKUP_KEYS.Path]}) for it.
 
 To create a new harvester, you can utilize a Python script on a computer with access to the desired data source. 
 Visit the [harvester repository](https://github.com/galv-team/galv-harvester) for detailed instructions on setting up and configuring harvesters. 
 You will need the following information:
 
 1. Server URL: \`${import.meta.env.VITE_GALV_API_BASE_URL}\`
-2. API token: Generate a new token in the [token section](${PATHS[LOOKUP_KEYS.TOKEN]})
+2. API token: Generate a new token in the [token section](${PATHS[LOOKUP_KEYS.Token]})
 
-Below, you can view all the harvesters that are associated with your [labs](${PATHS[LOOKUP_KEYS.LAB]}).
+Below, you can view all the harvesters that are associated with your [labs](${PATHS[LOOKUP_KEYS.Lab]}).
     `,
-    [LOOKUP_KEYS.PATH]: `
+    [LOOKUP_KEYS.Path]: `
 Monitored paths collect data from external sources via file paths on 
-[harvester-running](${PATHS[LOOKUP_KEYS.HARVESTER]}) computers. Lab members can set up paths for their lab's 
+[harvester-running](${PATHS[LOOKUP_KEYS.Harvester]}) computers. Lab members can set up paths for their lab's 
 harvesters. Matching files are added to the database when:
 
 1. They match the path and specified regex
@@ -1256,118 +1259,118 @@ harvesters. Matching files are added to the database when:
 Harvesters continuously monitor paths, uploading new files as they appear.
 You can see all the paths that have been set up by your team below.
     `,
-    [LOOKUP_KEYS.PARQUET_PARTITION]: `
+    [LOOKUP_KEYS.ParquetPartition]: `
 Parquet partitions are the individual partitions of a parquet file.
-They are created when a [file](${PATHS[LOOKUP_KEYS.FILE]}) is uploaded to the database.
+They are created when a [file](${PATHS[LOOKUP_KEYS.File]}) is uploaded to the database.
     `,
-    [LOOKUP_KEYS.FILE]: `
+    [LOOKUP_KEYS.File]: `
 Files are data files produced by battery cyclers, simulations, or any combination of them.
-Files are collected when [harvesters](${PATHS[LOOKUP_KEYS.HARVESTER]}) crawl [monitored paths](${PATHS[LOOKUP_KEYS.PATH]}).
+Files are collected when [harvesters](${PATHS[LOOKUP_KEYS.Harvester]}) crawl [monitored paths](${PATHS[LOOKUP_KEYS.Path]}).
 
-The data in each file is parsed either automatically if it matches one of the predefined [mapping](${PATHS[LOOKUP_KEYS.MAPPING]}) or manually with a prompt if a mapping is not found.
+The data in each file is parsed either automatically if it matches one of the predefined [mapping](${PATHS[LOOKUP_KEYS.ColumnMapping]}) or manually with a prompt if a mapping is not found.
 Parsed files are then uploaded to the database, where metadata can be attached and the data can be downloaded.
 Files are required to have, at minimum, columns for "ElapsedTime_s", "Voltage_V", and "Current_A".
 
-You can see all the files that have been collected on [monitored paths](${PATHS[LOOKUP_KEYS.PATH]}) created by your team.
+You can see all the files that have been collected on [monitored paths](${PATHS[LOOKUP_KEYS.Path]}) created by your team.
     `,
-    [LOOKUP_KEYS.COLUMN_FAMILY]: `
-Column types serve as identifiers for the data type present in a specific column of a [file](${PATHS[LOOKUP_KEYS.FILE]}). 
-They establish a connection between a column and its corresponding [unit](${PATHS[LOOKUP_KEYS.UNIT]}), enabling accurate interpretation and analysis of the data.
+    [LOOKUP_KEYS.ColumnFamily]: `
+Column types serve as identifiers for the data type present in a specific column of a [file](${PATHS[LOOKUP_KEYS.File]}). 
+They establish a connection between a column and its corresponding [unit](${PATHS[LOOKUP_KEYS.Unit]}), enabling accurate interpretation and analysis of the data.
 
-When new column types are added or existing ones are modified, the mapping selection for columns in the associated [file](${PATHS[LOOKUP_KEYS.FILE]}) is automatically updated. 
+When new column types are added or existing ones are modified, the mapping selection for columns in the associated [file](${PATHS[LOOKUP_KEYS.File]}) is automatically updated. 
 This dynamic updating mechanism ensures that the column mappings remain aligned with the defined column types.
     `,
-    [LOOKUP_KEYS.UNIT]: `
-Units represent the specific units of measurement employed to quantify and express the data contained within a [file](${PATHS[LOOKUP_KEYS.FILE]}). 
+    [LOOKUP_KEYS.Unit]: `
+Units represent the specific units of measurement employed to quantify and express the data contained within a [file](${PATHS[LOOKUP_KEYS.File]}). 
 These units provide the necessary context and scale for interpreting and understanding the numerical values present in the data.
     `,
-    [LOOKUP_KEYS.CELL_FAMILY]: `
-Cell families are collections of [cells](${PATHS[LOOKUP_KEYS.CELL]}) that share some common properties.
+    [LOOKUP_KEYS.CellFamily]: `
+Cell families are collections of [cells](${PATHS[LOOKUP_KEYS.Cell]}) that share some common properties.
 
-A [cell](${PATHS[LOOKUP_KEYS.CELL]}) will have all the properties of the family it belongs to, but it can override them if the property is declared on the cell itself.
+A [cell](${PATHS[LOOKUP_KEYS.Cell]}) will have all the properties of the family it belongs to, but it can override them if the property is declared on the cell itself.
     `,
-    [LOOKUP_KEYS.CELL]: `
+    [LOOKUP_KEYS.Cell]: `
 Cells represent the fundamental instance of a battery within the Galv ecosystem. 
-Each [cycler test](${PATHS[LOOKUP_KEYS.CYCLER_TEST]}) is conducted on a single cell.
+Each [cycler test](${PATHS[LOOKUP_KEYS.CyclerTest]}) is conducted on a single cell.
 
-Cells are organised into [cell families](${PATHS[LOOKUP_KEYS.CELL_FAMILY]}), which define their shared properties and characteristics. 
+Cells are organised into [cell families](${PATHS[LOOKUP_KEYS.CellFamily]}), which define their shared properties and characteristics. 
 Most properties of an individual cell are inherited from its associated family, promoting consistency and standardization across related cells. 
 However, if necessary, these inherited properties can be overridden or customized at the individual cell level.
 
 For the majority of cells, it is likely that only the identifier and family information will need to be specified. 
 This streamlined approach simplifies the process of managing and tracking individual cells while leveraging the inherited properties defined by their respective cell families.
     `,
-    [LOOKUP_KEYS.EQUIPMENT_FAMILY]: `
-Equipment families serve as logical groupings for [equipment](${PATHS[LOOKUP_KEYS.EQUIPMENT]}) resources that share common properties or characteristics. 
+    [LOOKUP_KEYS.EquipmentFamily]: `
+Equipment families serve as logical groupings for [equipment](${PATHS[LOOKUP_KEYS.Equipment]}) resources that share common properties or characteristics. 
 They provide an organisational framework for managing and categorizing equipment within the Galv ecosystem.
-Each individual [equipment](${PATHS[LOOKUP_KEYS.EQUIPMENT]}) resource inherits the properties defined by the equipment family it belongs to. 
+Each individual [equipment](${PATHS[LOOKUP_KEYS.Equipment]}) resource inherits the properties defined by the equipment family it belongs to. 
 This inheritance mechanism ensures consistency and standardisation across related equipment resources.
 However, if a specific property is explicitly declared at the individual equipment level, it takes precedence and overrides the inherited value from the family. 
 This flexibility allows for customisation and accommodation of unique equipment characteristics or configurations when necessary.
     `,
-    [LOOKUP_KEYS.EQUIPMENT]: `
-Equipment resources in the Galv ecosystem encompass a comprehensive description of all pieces of equipment relevant to battery [cycler tests](${PATHS[LOOKUP_KEYS.CYCLER_TEST]}). 
+    [LOOKUP_KEYS.Equipment]: `
+Equipment resources in the Galv ecosystem encompass a comprehensive description of all pieces of equipment relevant to battery [cycler tests](${PATHS[LOOKUP_KEYS.CyclerTest]}). 
 This includes not only the cycler itself but also any ancillary equipment utilized during the testing process, such as temperature chambers, power supplies, or other auxiliary devices.
 
-These equipment resources are organized into [equipment families](${PATHS[LOOKUP_KEYS.EQUIPMENT_FAMILY]}), which define their shared properties and characteristics. 
+These equipment resources are organized into [equipment families](${PATHS[LOOKUP_KEYS.EquipmentFamily]}), which define their shared properties and characteristics. 
 Most properties of an individual equipment resource are inherited from its associated family, ensuring consistency and standardisation. 
 However, if necessary, these inherited properties can be overridden or customized at the individual equipment level.
     `,
-    [LOOKUP_KEYS.SCHEDULE_FAMILY]: `
-Schedule families are logical groupings of [schedules](${PATHS[LOOKUP_KEYS.SCHEDULE]}) that share common properties or characteristics. 
+    [LOOKUP_KEYS.ScheduleFamily]: `
+Schedule families are logical groupings of [schedules](${PATHS[LOOKUP_KEYS.Schedule]}) that share common properties or characteristics. 
 They serve as a organisational framework for managing and categorising schedules within the Galv ecosystem.
 
-Each [schedule](${PATHS[LOOKUP_KEYS.SCHEDULE]}) inherits the properties defined by the schedule family it belongs to. 
+Each [schedule](${PATHS[LOOKUP_KEYS.Schedule]}) inherits the properties defined by the schedule family it belongs to. 
 However, if a specific property is explicitly declared at the individual schedule level, it takes precedence and overrides the inherited value from the family.
 
 Schedule families define schedule templates that can contain variables. 
 These variables are dynamically replaced with specific values when a schedule is created and applied to a cycler test. 
 The values used to replace these variables can be derived from multiple sources, following a predefined order of priority:
 
-1. Individual [cell](${PATHS[LOOKUP_KEYS.CELL]}) being tested (highest priority)
-2. [Family](${PATHS[LOOKUP_KEYS.CELL_FAMILY]}) of the cell being tested
+1. Individual [cell](${PATHS[LOOKUP_KEYS.Cell]}) being tested (highest priority)
+2. [Family](${PATHS[LOOKUP_KEYS.CellFamily]}) of the cell being tested
 3. Individual schedule (lowest priority)
 
 This hierarchical variable replacement mechanism ensures that the most specific and relevant values are used for each cycler test, while maintaining a consistent and organised structure defined by the schedule families and templates.
     `,
-    [LOOKUP_KEYS.SCHEDULE]: `
-Schedules serve as the instructions that govern the execution of battery [cycler tests](${PATHS[LOOKUP_KEYS.CYCLER_TEST]}). 
+    [LOOKUP_KEYS.Schedule]: `
+Schedules serve as the instructions that govern the execution of battery [cycler tests](${PATHS[LOOKUP_KEYS.CyclerTest]}). 
 They define the specific pattern of charging and discharging cycles, as well as the ambient temperature conditions under which the tests are conducted.
 
-Schedules are organized into [schedule families](${PATHS[LOOKUP_KEYS.SCHEDULE_FAMILY]}), which define their shared properties and characteristics. 
+Schedules are organized into [schedule families](${PATHS[LOOKUP_KEYS.ScheduleFamily]}), which define their shared properties and characteristics. 
 Most properties of a schedule are inherited from its associated family, but they can be overridden or customized at the individual schedule level if necessary.
 
 Additionally, schedules can specify values for variables defined within their families template. 
-These variable values can be further overridden or superseded by values set in the [family](${PATHS[LOOKUP_KEYS.CELL_FAMILY]}) of the cell being tested or in the individual [cell](${PATHS[LOOKUP_KEYS.CELL]}) itself. 
+These variable values can be further overridden or superseded by values set in the [family](${PATHS[LOOKUP_KEYS.CellFamily]}) of the cell being tested or in the individual [cell](${PATHS[LOOKUP_KEYS.Cell]}) itself. 
     `,
-    [LOOKUP_KEYS.EXPERIMENT]: `
+    [LOOKUP_KEYS.Experiment]: `
 They serve as a logical grouping mechanism for related tests conducted under similar conditions or with shared objectives.
 
-Typically, a single experiment is performed on a specific cell family, employing a variety of different [schedules](${PATHS[LOOKUP_KEYS.SCHEDULE]}) designed to characterise and evaluate different properties or aspects of the cells under investigation.
+Typically, a single experiment is performed on a specific cell family, employing a variety of different [schedules](${PATHS[LOOKUP_KEYS.Schedule]}) designed to characterise and evaluate different properties or aspects of the cells under investigation.
 
 Within an experiment, the metadata associated with the constituent tests is consolidated. 
-This includes information about the [authors](${PATHS[LOOKUP_KEYS.USER]}) involved, the specific [cells](${PATHS[LOOKUP_KEYS.CELL]}) tested, the [schedules](${PATHS[LOOKUP_KEYS.SCHEDULE]}) employed, and the [equipment](${PATHS[LOOKUP_KEYS.EQUIPMENT]}) utilised during the testing process. 
-Additionally, the actual data produced by these tests, in the form of [files](${PATHS[LOOKUP_KEYS.FILE]}), is also organised and associated with the respective experiment.
+This includes information about the [authors](${PATHS[LOOKUP_KEYS.User]}) involved, the specific [cells](${PATHS[LOOKUP_KEYS.Cell]}) tested, the [schedules](${PATHS[LOOKUP_KEYS.Schedule]}) employed, and the [equipment](${PATHS[LOOKUP_KEYS.Equipment]}) utilised during the testing process. 
+Additionally, the actual data produced by these tests, in the form of [files](${PATHS[LOOKUP_KEYS.File]}), is also organised and associated with the respective experiment.
     `,
-    [LOOKUP_KEYS.CYCLER_TEST]: `
+    [LOOKUP_KEYS.CyclerTest]: `
 Cycler tests represent the fundamental application of battery testing within the Galv ecosystem. 
-Each test is conducted on a single [cell](${PATHS[LOOKUP_KEYS.CELL]}) and follows a specific [schedule](${PATHS[LOOKUP_KEYS.SCHEDULE]}) that outlines the testing parameters and procedures. 
-Additionally, a cycler test may involve the use of multiple pieces of [equipment](${PATHS[LOOKUP_KEYS.EQUIPMENT]}, such as cyclers, temperature chambers, or other auxiliary devices.
+Each test is conducted on a single [cell](${PATHS[LOOKUP_KEYS.Cell]}) and follows a specific [schedule](${PATHS[LOOKUP_KEYS.Schedule]}) that outlines the testing parameters and procedures. 
+Additionally, a cycler test may involve the use of multiple pieces of [equipment](${PATHS[LOOKUP_KEYS.Equipment]}, such as cyclers, temperature chambers, or other auxiliary devices.
 
 The cycler test encapsulates the conditions under which the cell was tested, as well as the resulting data generated during the testing process. 
 These tests provide a comprehensive record of the experimental setup, testing parameters, and the acquired data, ensuring traceability and reproducibility.
 
-Furthermore, cycler tests can be logically grouped into [experiments](${PATHS[LOOKUP_KEYS.EXPERIMENT]}), allowing researchers to organise and manage related tests under a common umbrella. 
+Furthermore, cycler tests can be logically grouped into [experiments](${PATHS[LOOKUP_KEYS.Experiment]}), allowing researchers to organise and manage related tests under a common umbrella. 
     `,
-    [LOOKUP_KEYS.ARBITRARY_FILE]: `
+    [LOOKUP_KEYS.ArbitraryFile]: `
 Attachments are files that are related to the battery testing process but are not directly generated by the cycling equipment itself. 
 These files can serve various purposes, such as storing experimental protocols, equipment datasheets, or any other supplementary information relevant to the testing procedures.
 
 By incorporating attachments, researchers can maintain a comprehensive record of all pertinent details associated with their battery experiments. 
 This includes detailed experimental protocols outlining the specific steps and parameters employed during the testing process, as well as technical specifications and datasheets for the equipment utilised.
     `,
-    [LOOKUP_KEYS.VALIDATION_SCHEMA]: `
-Validation schemas serve as powerful tools for ensuring the integrity and consistency of data within [files](${PATHS[LOOKUP_KEYS.FILE]}) and validating the metadata associated with other resources in the Galv ecosystem.
+    [LOOKUP_KEYS.ValidationSchema]: `
+Validation schemas serve as powerful tools for ensuring the integrity and consistency of data within [files](${PATHS[LOOKUP_KEYS.File]}) and validating the metadata associated with other resources in the Galv ecosystem.
 
 These validation schemas are defined using the JSON Schema specification, a widely adopted standard for describing and validating JSON data structures. 
 This flexible format enables the creation of schemas capable of validating any JSON data, regardless of its complexity or structure.
@@ -1378,20 +1381,20 @@ Additionally, this default schema checks for the presence of the minimal require
 However, users have the flexibility to define and apply more stringent validation schemas tailored to their specific needs. 
 These custom schemas can enforce additional constraints, such as data types, value ranges, and complex relationships between different fields. 
     `,
-    [LOOKUP_KEYS.LAB]: `
-Labs are the top-level organizational units in Galv, composed of [teams](${PATHS[LOOKUP_KEYS.TEAM]}) that contain all resources. 
+    [LOOKUP_KEYS.Lab]: `
+Labs are the top-level organizational units in Galv, composed of [teams](${PATHS[LOOKUP_KEYS.Team]}) that contain all resources. 
 Your lab membership is determined by your affiliation with teams within that lab. 
 Lab administrators can create new teams and manage existing team permissions, but cannot directly manage resources unless they are team members.
 
-Labs house data from battery cycling experiments, which can be automatically collected by [harvesters](${PATHS[LOOKUP_KEYS.HARVESTER]}). 
-The collected data are stored in Galv's systems or an [additional storage resource](${PATHS[LOOKUP_KEYS.ADDITIONAL_STORAGE]}) managed by the lab, allowing flexibility for large datasets or specific storage requirements.
+Labs house data from battery cycling experiments, which can be automatically collected by [harvesters](${PATHS[LOOKUP_KEYS.Harvester]}). 
+The collected data are stored in Galv's systems or an [additional storage resource](${PATHS[LOOKUP_KEYS.AdditionalStorage]}) managed by the lab, allowing flexibility for large datasets or specific storage requirements.
 
 While raw data files are stored in designated locations, associated metadata is stored in Galv's database and can be opened for collaboration within or between labs, facilitating data sharing and collaborative research efforts.
 Proper management of lab structures, team memberships, and access permissions is crucial for maintaining a secure and efficient collaborative environment within the Galv ecosystem.
     `,
-    [LOOKUP_KEYS.TEAM]: `
+    [LOOKUP_KEYS.Team]: `
 Teams are the fundamental organisational units within the Galv platform. 
-They serve as collaborative spaces where [users](${PATHS[LOOKUP_KEYS.USER]}) can work together and manage shared resources.
+They serve as collaborative spaces where [users](${PATHS[LOOKUP_KEYS.User]}) can work together and manage shared resources.
 Each team is composed of a collection of users, and they collectively own and have control over the resources within Galv. 
 The team that owns a particular resource has the authority to alter its permissions and, if necessary, delete it.
 
@@ -1405,12 +1408,12 @@ This level of control enables administrators to manage the team's structure, mem
 It's important to note that team membership and roles should be carefully managed to ensure the appropriate level of access and collaboration within the Galv ecosystem. 
 Best practices include periodically reviewing team memberships, assigning roles based on project needs, and implementing access controls to protect sensitive data when necessary.
     `,
-    [LOOKUP_KEYS.USER]: `
+    [LOOKUP_KEYS.User]: `
 Users are individuals who interact with and utilise the Galv platform. 
 Each user is identified by a unique username, an associated email address, and a secure password.
 
 One of the key features of Galv is its support for team-based collaboration. 
-Users can be members of multiple [teams](${PATHS[LOOKUP_KEYS.TEAM]}), enabling them to work together on projects, share resources, and coordinate efforts effectively.
+Users can be members of multiple [teams](${PATHS[LOOKUP_KEYS.Team]}), enabling them to work together on projects, share resources, and coordinate efforts effectively.
 
 In this section, you can view and modify your own user details. 
 This includes updating your personal information, such as your email address or password, as well as managing your team memberships. 
@@ -1418,7 +1421,7 @@ This includes updating your personal information, such as your email address or
 It's important to note that user accounts and associated information should be treated with care, as they grant access to sensitive data and resources within the Galv platform. 
 Best practices include using strong and unique passwords, and regularly reviewing and updating your user details to maintain a secure and reliable user experience.
     `,
-    [LOOKUP_KEYS.TOKEN]: `
+    [LOOKUP_KEYS.Token]: `
 Tokens can be created by users and are utilised for authenticating with Galv's API. 
 This allows programmatic access and integration with Galv's services. 
 Additionally, you'll see Browser session tokens, which are automatically generated when you log in to the Galv web interface, facilitating seamless authentication for your browser sessions.
@@ -1429,7 +1432,7 @@ These tokens act as secure credentials, granting authorized access to the API en
 It's important to note that tokens should be treated with care and kept confidential, as they grant access to your Galv account and associated resources. 
 Best practices include generating tokens with appropriate scopes and permissions, and revoking or regenerating them periodically to maintain a high level of security.
     `,
-    [LOOKUP_KEYS.GALV_STORAGE]: `
+    [LOOKUP_KEYS.GalvStorage]: `
 Storage in Galv is utilised for various purposes, including storing harvested data files, attachments, and generating image previews of datasets. 
 This storage functionality is essential for efficient data management and collaboration within the platform.
 
@@ -1437,16 +1440,16 @@ Galv provides a default storage resource, referred to as Galv storage.
 This storage is hosted on the Galv server instance, and each lab is allocated a specific storage quota. 
 This default storage option offers a convenient and centralized solution for managing data within the Galv ecosystem.
 
-However, if you prefer not to store files on the Galv server, you have the option to disable Galv storage and set up an [additional storage resource](${PATHS[LOOKUP_KEYS.ADDITIONAL_STORAGE]}). 
+However, if you prefer not to store files on the Galv server, you have the option to disable Galv storage and set up an [additional storage resource](${PATHS[LOOKUP_KEYS.AdditionalStorage]}). 
 This alternative storage resource can be hosted and managed according to your specific requirements, providing greater flexibility and control over data storage.
 
-In scenarios where you are at risk of exceeding your allocated storage quota on the Galv server, you can proactively set up an [additional storage resource](${PATHS[LOOKUP_KEYS.ADDITIONAL_STORAGE]}) to accommodate the excess data. 
+In scenarios where you are at risk of exceeding your allocated storage quota on the Galv server, you can proactively set up an [additional storage resource](${PATHS[LOOKUP_KEYS.AdditionalStorage]}) to accommodate the excess data. 
 This approach ensures that you can seamlessly continue storing and managing your data without disruptions or limitations.
 
 The priority setting determines the order in which the available storage resources are utilized for storing data. 
 Higher priority numbers are used first, allowing you to define the preferred storage location based on your specific needs and preferences.
     `,
-    [LOOKUP_KEYS.ADDITIONAL_STORAGE]: `
+    [LOOKUP_KEYS.AdditionalStorage]: `
 Storage is utilised for harvested data files, attachments, and image previews of datasets.
 
 Additional storage resources can be used for data uploaded to Galv, with the location managed by the Lab. 
@@ -1460,19 +1463,19 @@ Storages are shown in the order of their priority, with the highest priority sto
     DASHBOARD: `
 The dashboard provides an overview of the resources pertinent to you and your teams. 
 
-It displays the [files](${PATHS[LOOKUP_KEYS.FILE]}) gathered from the [monitored paths](${PATHS[LOOKUP_KEYS.PATH]}) 
-set up by your [teams](${PATHS[LOOKUP_KEYS.TEAM]}), along with their respective upload and validation statuses.
+It displays the [files](${PATHS[LOOKUP_KEYS.File]}) gathered from the [monitored paths](${PATHS[LOOKUP_KEYS.Path]}) 
+set up by your [teams](${PATHS[LOOKUP_KEYS.Team]}), along with their respective upload and validation statuses.
 
 Additionally, the dashboard lists the resources you have permission to edit, accompanied by their validation statuses.
 
 In the event you encounter any issues on your dashboard, you can investigate the relevant resource for more detailed information.
     `,
-    MAPPING: `
-Mappings are utilised to map the columns in a [file](${PATHS[LOOKUP_KEYS.FILE]}) to recognised standard columns. 
+    ColumnMapping: `
+Mappings are utilised to map the columns in a [file](${PATHS[LOOKUP_KEYS.File]}) to recognised standard columns. 
 This enables Galv to comprehend the data within the file and promotes homogeneity across datasets. 
 When a set of files employs the same column names to represent the same type of data, analyses can be performed across all the files.
 
-Mappings can be automatically applied to files during the harvesting process by a [harvester](${PATHS[LOOKUP_KEYS.HARVESTER]}). 
+Mappings can be automatically applied to files during the harvesting process by a [harvester](${PATHS[LOOKUP_KEYS.Harvester]}). 
 If there is a clear 'best mapping' for a file, it will be applied automatically. 
 However, if there are multiple equally suitable mappings, the user will need to choose a mapping or define a more appropriate one.
 
diff --git a/src/stories/IntroText.stories.tsx b/src/stories/IntroText.stories.tsx
index bde13a2..1e9639b 100644
--- a/src/stories/IntroText.stories.tsx
+++ b/src/stories/IntroText.stories.tsx
@@ -19,7 +19,7 @@ const meta = {
         k: { options: Object.values(LOOKUP_KEYS) },
     },
     // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
-    args: { k: LOOKUP_KEYS.CELL },
+    args: { k: LOOKUP_KEYS.Cell },
 } satisfies Meta<typeof IntroText>
 
 export default meta
diff --git a/src/stories/ResourceCard.stories.tsx b/src/stories/ResourceCard.stories.tsx
index e18b072..a4bcce1 100644
--- a/src/stories/ResourceCard.stories.tsx
+++ b/src/stories/ResourceCard.stories.tsx
@@ -40,7 +40,7 @@ const meta = {
                         <FetchResourceContextProvider>
                             <ApiResourceContextProvider
                                 lookupKey={
-                                    context.args.lookupKey ?? LOOKUP_KEYS.CELL
+                                    context.args.lookupKey ?? LOOKUP_KEYS.Cell
                                 }
                                 resourceId={
                                     context.args.resourceId ?? cells[0].id
@@ -90,7 +90,7 @@ const meta = {
     // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
     args: {
         resourceId: cells[0].id,
-        lookupKey: LOOKUP_KEYS.CELL,
+        lookupKey: LOOKUP_KEYS.Cell,
     },
     beforeEach: async () => {
         window.confirm = fn(() => true)
@@ -292,7 +292,7 @@ export const DeleteError: Story = {
  */
 export const CompleteUpload: Story = {
     args: {
-        lookupKey: LOOKUP_KEYS.FILE,
+        lookupKey: LOOKUP_KEYS.File,
         resourceId: files.find((f) => f.name === 'partial.csv')?.id,
     },
 }
diff --git a/src/stories/ResourceChip.stories.tsx b/src/stories/ResourceChip.stories.tsx
index 7f335f6..a37f8f3 100644
--- a/src/stories/ResourceChip.stories.tsx
+++ b/src/stories/ResourceChip.stories.tsx
@@ -71,7 +71,7 @@ const meta = {
     args: {
         short_name: false,
         resourceId: cells[0].id,
-        lookupKey: LOOKUP_KEYS.CELL,
+        lookupKey: LOOKUP_KEYS.Cell,
     },
 } satisfies Meta<typeof ResourceChip>
 
diff --git a/src/stories/ResourceCreator.stories.tsx b/src/stories/ResourceCreator.stories.tsx
index 3c633d7..80eccfb 100644
--- a/src/stories/ResourceCreator.stories.tsx
+++ b/src/stories/ResourceCreator.stories.tsx
@@ -80,7 +80,7 @@ const meta = {
         },
     },
     args: {
-        lookupKey: LOOKUP_KEYS.CELL,
+        lookupKey: LOOKUP_KEYS.Cell,
     },
     beforeEach: async () => {
         window.confirm = fn(() => true)
diff --git a/src/stories/ResourceList.stories.tsx b/src/stories/ResourceList.stories.tsx
index 74f0cae..ef31a70 100644
--- a/src/stories/ResourceList.stories.tsx
+++ b/src/stories/ResourceList.stories.tsx
@@ -45,7 +45,7 @@ const meta = {
     },
     // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
     args: {
-        lookupKey: LOOKUP_KEYS.CELL,
+        lookupKey: LOOKUP_KEYS.Cell,
     },
 } satisfies Meta<typeof ResourceList>
 
diff --git a/src/stories/utilities/CardActionBar.stories.tsx b/src/stories/utilities/CardActionBar.stories.tsx
index 2f31ca7..79b0fb6 100644
--- a/src/stories/utilities/CardActionBar.stories.tsx
+++ b/src/stories/utilities/CardActionBar.stories.tsx
@@ -32,7 +32,7 @@ const meta = {
                     <FetchResourceContextProvider>
                         <ApiResourceContextProvider
                             lookupKey={
-                                context.args.lookupKey ?? LOOKUP_KEYS.CELL
+                                context.args.lookupKey ?? LOOKUP_KEYS.Cell
                             }
                             resourceId={context.args.resourceId ?? cells[0].id}
                         >
@@ -60,7 +60,7 @@ const meta = {
     },
     // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
     args: {
-        lookupKey: LOOKUP_KEYS.CELL,
+        lookupKey: LOOKUP_KEYS.Cell,
     },
     render: function Render(args) {
         const [{ editing, expanded }, updateArgs] = useArgs()
diff --git a/src/stories/utilities/CountBadge.stories.tsx b/src/stories/utilities/CountBadge.stories.tsx
index 2fc1ae1..9b2620b 100644
--- a/src/stories/utilities/CountBadge.stories.tsx
+++ b/src/stories/utilities/CountBadge.stories.tsx
@@ -47,7 +47,7 @@ type Story = StoryObj<typeof meta>
 export const WithURL: Story = {
     args: {
         url: 'http://example.com/',
-        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.TEAM} />,
+        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.Team} />,
         tooltip: 'Go to example.com',
         badgeContent: 10,
     },
@@ -58,7 +58,7 @@ export const WithURL: Story = {
  */
 export const NoURL: Story = {
     args: {
-        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.TEAM} />,
+        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.Team} />,
         badgeContent: 10,
     },
 }
@@ -68,7 +68,7 @@ export const NoURL: Story = {
  */
 export const NoCount: Story = {
     args: {
-        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.TEAM} />,
+        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.Team} />,
         badgeContent: 0,
     },
 }
diff --git a/src/stories/utilities/LoadingChip.stories.tsx b/src/stories/utilities/LoadingChip.stories.tsx
index 7d52b39..18005a3 100644
--- a/src/stories/utilities/LoadingChip.stories.tsx
+++ b/src/stories/utilities/LoadingChip.stories.tsx
@@ -42,7 +42,7 @@ type Story = StoryObj<typeof meta>
 export const WithURL: Story = {
     args: {
         url: 'http://example.com/',
-        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.TEAM} />,
+        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.Team} />,
     },
 }
 
@@ -51,6 +51,6 @@ export const WithURL: Story = {
  */
 export const NoURL: Story = {
     args: {
-        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.TEAM} />,
+        icon: <LookupKeyIcon lookupKey={LOOKUP_KEYS.Team} />,
     },
 }
diff --git a/src/stories/utilities/LookupKeyIcon.stories.tsx b/src/stories/utilities/LookupKeyIcon.stories.tsx
index cbab2b2..9024f5e 100644
--- a/src/stories/utilities/LookupKeyIcon.stories.tsx
+++ b/src/stories/utilities/LookupKeyIcon.stories.tsx
@@ -19,7 +19,7 @@ const meta = {
         lookupKey: { options: Object.values(LOOKUP_KEYS) },
     },
     // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
-    args: { lookupKey: LOOKUP_KEYS.CELL, tooltip: false },
+    args: { lookupKey: LOOKUP_KEYS.Cell, tooltip: false },
 } satisfies Meta<typeof LookupKeyIcon>
 
 export default meta
diff --git a/src/test/Mapping.test.tsx b/src/test/Mapping.test.tsx
index c511ba7..1792cb0 100644
--- a/src/test/Mapping.test.tsx
+++ b/src/test/Mapping.test.tsx
@@ -76,7 +76,7 @@ it('renders', async () => {
                 <FetchResourceContextProvider>
                     <ApiResourceContextProvider
                         resourceId={file.id}
-                        lookupKey={LOOKUP_KEYS.FILE}
+                        lookupKey={LOOKUP_KEYS.File}
                     >
                         <Mapping />
                     </ApiResourceContextProvider>
diff --git a/src/test/Representation.test.tsx b/src/test/Representation.test.tsx
index ba570a2..c0e19a7 100644
--- a/src/test/Representation.test.tsx
+++ b/src/test/Representation.test.tsx
@@ -10,7 +10,7 @@ import { render, screen } from '@testing-library/react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import FetchResourceContextProvider from '../Components/FetchResourceContext'
 import { expect, it } from 'vitest'
-import Representation from '../Components/Representation'
+import Representation from '../Components/representation/GenericRepresentation'
 import { teams } from './fixtures/fixtures'
 
 it('renders', async () => {
@@ -21,7 +21,7 @@ it('renders', async () => {
         <QueryClientProvider client={queryClient}>
             <FetchResourceContextProvider>
                 <Representation
-                    lookupKey={LOOKUP_KEYS.TEAM}
+                    lookupKey={LOOKUP_KEYS.Team}
                     resourceId={team.id}
                     prefix="T"
                     suffix="!"
diff --git a/src/test/ResourceCard.test.tsx b/src/test/ResourceCard.test.tsx
index f8741da..be379a8 100644
--- a/src/test/ResourceCard.test.tsx
+++ b/src/test/ResourceCard.test.tsx
@@ -28,7 +28,7 @@ import { has } from '../Components/misc'
 // @ts-expect-error - globalThis is not defined in Jest
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 
-vi.mock('../Components/Representation')
+vi.mock('/Components/representation/GenericRepresentation')
 vi.mock('../Components/ResourceChip')
 vi.mock('../DatasetChart')
 
@@ -64,7 +64,7 @@ const do_render = async () => {
     render(
         <ContextStack>
             <ResourceCardFromQuery<Cell>
-                lookupKey={LOOKUP_KEYS.CELL}
+                lookupKey={LOOKUP_KEYS.Cell}
                 resourceId={cells[0].id}
                 expanded
             />
@@ -672,19 +672,19 @@ describe('ResourceCard', () => {
                 id_label.parentElement! as HTMLElement,
             ).getByRole('combobox')
             expect(input).toHaveValue(
-                `representation: CELL_FAMILY [${cell_family.id}]`,
+                `representation: CellFamily [${cell_family.id}]`,
             )
             await user.click(input)
             await user.clear(input)
             await user.keyboard('2') // should match the second cell family
             const autocomplete = await screen.findByRole('listbox')
             const option = within(autocomplete).getByText(
-                `representation: CELL_FAMILY [${cell_families[1].id}]`,
+                `representation: CellFamily [${cell_families[1].id}]`,
             )
             await user.click(option)
             await wait()
             expect(input).toHaveValue(
-                `representation: CELL_FAMILY [${cell_families[1].id}]`,
+                `representation: CellFamily [${cell_families[1].id}]`,
             )
         })
     }, 15000)
@@ -957,23 +957,23 @@ describe('ResourceCard', () => {
         // TODO: Fix these tests - can't get them to actually change the type
         // The button registers as clicked, but the type update rerender doesn't seem to happen.
         // it('allows changing the type of a string to a resource', async () => {
-        //     const row = await setup("key str", "galv_CELL");
+        //     const row = await setup("key str", "galv_Cell");
         //     expect(within(row).getByRole('combobox')).toHaveValue("undefined/cells/custom")
         // })
         // it('allows changing the type of a boolean to a resource', async () => {
-        //     const row = await setup("key bool", "galv_CELL");
+        //     const row = await setup("key bool", "galv_Cell");
         //     expect(within(row).getByRole('combobox')).toHaveValue("")
         // })
         // it('allows changing the type of a number to a resource', async () => {
-        //     const row = await setup("key num", "galv_CELL");
+        //     const row = await setup("key num", "galv_Cell");
         //     expect(within(row).getByRole('combobox')).toHaveValue("")
         // })
         // it('allows changing the type of an array to a resource', async () => {
-        //     const row = await setup("key arr", "galv_CELL");
+        //     const row = await setup("key arr", "galv_Cell");
         //     expect(within(row).getByRole('combobox')).toHaveValue("")
         // })
         // it('allows changing the type of an object to a resource', async () => {
-        //     const row = await setup("key obj", "galv_CELL");
+        //     const row = await setup("key obj", "galv_Cell");
         //     expect(within(row).getByRole('combobox')).toHaveValue("")
         // })
     }, 500000) // Takes forever on MacOS 13 for some reason?
diff --git a/src/test/ResourceChip.test.tsx b/src/test/ResourceChip.test.tsx
index 77e3787..0785777 100644
--- a/src/test/ResourceChip.test.tsx
+++ b/src/test/ResourceChip.test.tsx
@@ -15,7 +15,7 @@ import { expect, it, vi } from 'vitest'
 import { cells } from './fixtures/fixtures'
 import ResourceChip from '../Components/ResourceChip'
 
-vi.mock('../Components/Representation')
+vi.mock('../Components/representation/GenericRepresentation')
 
 const cell = cells[0]
 
@@ -28,7 +28,7 @@ it('renders', async () => {
                 <FetchResourceContextProvider>
                     <FilterContextProvider>
                         <ResourceChip
-                            lookupKey={LOOKUP_KEYS.CELL}
+                            lookupKey={LOOKUP_KEYS.Cell}
                             resourceId={cell.id}
                         />
                     </FilterContextProvider>
@@ -36,6 +36,6 @@ it('renders', async () => {
             </QueryClientProvider>
         </MemoryRouter>,
     )
-    await screen.findByText(/DummyRepresentation/)
+    await screen.findByText(/Dummy.*GenericRepresentation/)
     expect(screen.getByText((t) => t.includes(cell.id))).toBeInTheDocument()
 })
diff --git a/src/test/ResourceCreator.test.tsx b/src/test/ResourceCreator.test.tsx
index e7b7a92..cb3e96b 100644
--- a/src/test/ResourceCreator.test.tsx
+++ b/src/test/ResourceCreator.test.tsx
@@ -29,7 +29,7 @@ it('renders', async () => {
                     <FilterContextProvider>
                         <AttachmentUploadContextProvider>
                             <WrappedResourceCreator
-                                lookupKey={LOOKUP_KEYS.CELL}
+                                lookupKey={LOOKUP_KEYS.Cell}
                             />
                         </AttachmentUploadContextProvider>
                     </FilterContextProvider>
diff --git a/src/test/ResourceList.test.tsx b/src/test/ResourceList.test.tsx
index 24a72f5..de499b6 100644
--- a/src/test/ResourceList.test.tsx
+++ b/src/test/ResourceList.test.tsx
@@ -19,7 +19,7 @@ vi.mock('../Components/IntroText')
 vi.mock('../Components/card/ResourceCard')
 vi.mock('../ClientCodeDemo')
 
-const doRender = async (key: LookupKey = LOOKUP_KEYS.CELL) => {
+const doRender = async (key: LookupKey = LOOKUP_KEYS.Cell) => {
     const queryClient = new QueryClient()
 
     render(
@@ -58,7 +58,7 @@ describe('ResourceList', () => {
     })
 
     it('shows a create button', async () => {
-        await doRender(LOOKUP_KEYS.EXPERIMENT)
+        await doRender(LOOKUP_KEYS.Experiment)
         await screen.findByText((t) => t.includes(experiments[0].id))
 
         expect(
@@ -79,7 +79,7 @@ describe('ResourceList', () => {
     })
 
     it('shows an upload button for files', async () => {
-        await doRender(LOOKUP_KEYS.FILE)
+        await doRender(LOOKUP_KEYS.File)
         await screen.findByText((t) => t.includes(files[0].id))
 
         expect(
diff --git a/src/test/UploadFilePage.test.tsx b/src/test/UploadFilePage.test.tsx
index aa4de0d..35af915 100644
--- a/src/test/UploadFilePage.test.tsx
+++ b/src/test/UploadFilePage.test.tsx
@@ -28,7 +28,7 @@ import { LOOKUP_KEYS } from '../constants'
 // @ts-expect-error - globalThis is not defined in Jest
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 
-vi.mock('../Components/Representation')
+vi.mock('/Components/representation/GenericRepresentation')
 vi.mock('../Components/ResourceChip')
 vi.mock('../DatasetChart')
 vi.mock('../Components/AuthImage')
@@ -182,7 +182,7 @@ describe('UploadFilePage', () => {
             render(
                 <ContextStack>
                     <ApiResourceContextProvider
-                        lookupKey={LOOKUP_KEYS.FILE}
+                        lookupKey={LOOKUP_KEYS.File}
                         resourceId={f!.id}
                     >
                         <FileSummary resource={f!} />
diff --git a/src/test/fixtures/fixtures.ts b/src/test/fixtures/fixtures.ts
index eeb4f69..1480c86 100644
--- a/src/test/fixtures/fixtures.ts
+++ b/src/test/fixtures/fixtures.ts
@@ -84,7 +84,7 @@ export const cells: Cell[] = [
                 },
             },
             cf: {
-                _type: 'galv_CELL_FAMILY',
+                _type: 'galv_CellFamily',
                 _value: 'http://example.com/cell_families/1000-1000-1000-1000',
             },
         },
diff --git a/src/test/handlers.ts b/src/test/handlers.ts
index 8ea2d67..e509b9d 100644
--- a/src/test/handlers.ts
+++ b/src/test/handlers.ts
@@ -137,6 +137,41 @@ const build_get_endpoints =
 
         const data = resources[resource_name]
 
+        // Return the type of a key in the resource and whether it's a Galv resource
+        const get_type = (
+            k: keyof (typeof data)[0],
+            override_value?: unknown,
+        ): { type: string; galv_resource: boolean } => {
+            console.log('get_type', { k, override_value })
+            const value = override_value ?? (data[0][k] as unknown)
+            const regex = /https?:\/\/[^/]+\/([\w_]+)\/[a-zA-Z0-9_-]+/
+            if (value instanceof Array) {
+                const types = value.map((x) => get_type(k, x))
+                if (!types.every((x) => x.type === types[0].type)) {
+                    console.warn(`Array ${k} has multiple types: ${types}`)
+                    return { type: 'Unknown', galv_resource: false }
+                }
+                return types[0]
+            }
+            const match = regex.exec(String(value))
+            if (k === ('url' as typeof k) || !match)
+                return { type: typeof value, galv_resource: false }
+            // Split the match section into parts on _ and then capitalize each part
+            const parts = match[1]
+                .split('_')
+                .map((x) => x.charAt(0).toUpperCase() + x.slice(1))
+
+            const fix_ending = (s: string) => {
+                if (s.endsWith('ies')) return s.slice(0, -3) + 'y'
+                if (s.endsWith('s')) return s.slice(0, -1)
+                return s
+            }
+
+            const type = fix_ending(parts.join(''))
+            console.log('type', type)
+            return { type, galv_resource: true }
+        }
+
         // If there's a description request, return the description
         if (/describe\/$/.test(url_extras)) {
             const d = data[0]
@@ -144,7 +179,7 @@ const build_get_endpoints =
             for (const key in d) {
                 if (['custom_properties'].includes(key)) continue
                 dict[key as keyof typeof d] = {
-                    type: typeof d[key as keyof typeof d],
+                    ...get_type(key as keyof typeof d),
                     many: Array.isArray(d[key as keyof typeof d]),
                     help_text: key,
                     required: false,
diff --git a/src/test/type_change.test.ts b/src/test/type_change.test.ts
index ffd8b3d..011ebf6 100644
--- a/src/test/type_change.test.ts
+++ b/src/test/type_change.test.ts
@@ -4,8 +4,8 @@
 
 import { convert } from '../Components/prettify/TypeChanger'
 import {
-    TypeValueNotationWrapper,
     TypeValueNotation,
+    TypeValueNotationWrapper,
 } from '../Components/TypeValueNotation'
 import { describe, expect, test } from 'vitest'
 
@@ -20,7 +20,7 @@ const makeNullCases = () => {
         'boolean',
         'array',
         'object',
-        'galv_CELL',
+        'galv_Cell',
     ]
     return types.map((type) => {
         const input = { _type: type, _value: null }
@@ -52,7 +52,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'string', _value: '1' } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: 'undefined/cells/1' },
+            galv_Cell: { _type: 'galv_Cell', _value: 'undefined/cells/1' },
         },
     },
     {
@@ -68,7 +68,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'string', _value: 'true' } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: null },
+            galv_Cell: { _type: 'galv_Cell', _value: null },
         },
     },
     {
@@ -84,7 +84,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'string', _value: 'false' } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: null },
+            galv_Cell: { _type: 'galv_Cell', _value: null },
         },
     },
     {
@@ -97,7 +97,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'number', _value: 1 } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: 'undefined/cells/1' },
+            galv_Cell: { _type: 'galv_Cell', _value: 'undefined/cells/1' },
         },
     },
     {
@@ -113,7 +113,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'boolean', _value: true } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: null },
+            galv_Cell: { _type: 'galv_Cell', _value: null },
         },
     },
     {
@@ -126,7 +126,7 @@ const cases = [
                 _type: 'object',
                 _value: { 0: { _type: 'string', _value: '1' } },
             },
-            galv_CELL: { _type: 'galv_CELL', _value: null },
+            galv_Cell: { _type: 'galv_Cell', _value: null },
         },
     },
     {
@@ -142,11 +142,11 @@ const cases = [
                 _type: 'array',
                 _value: [{ _type: 'string', _value: '1' }],
             },
-            galv_CELL: { _type: 'galv_CELL', _value: null },
+            galv_Cell: { _type: 'galv_Cell', _value: null },
         },
     },
     {
-        input: { _type: 'galv_CELL', _value: 'https://example.com/cells/1' },
+        input: { _type: 'galv_Cell', _value: 'https://example.com/cells/1' },
         outputs: {
             string: { _type: 'string', _value: 'https://example.com/cells/1' },
             number: { _type: 'number', _value: null },
@@ -155,7 +155,7 @@ const cases = [
                 _type: 'array',
                 _value: [
                     {
-                        _type: 'galv_CELL',
+                        _type: 'galv_Cell',
                         _value: 'https://example.com/cells/1',
                     },
                 ],