diff --git a/client/src/components/RcraProfile/RcraProfile.tsx b/client/src/components/RcraProfile/RcraProfile.tsx
index a143c5e08..7ddf6874b 100644
--- a/client/src/components/RcraProfile/RcraProfile.tsx
+++ b/client/src/components/RcraProfile/RcraProfile.tsx
@@ -1,21 +1,12 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { AxiosError } from 'axios';
-import { RcraApiUserBtn } from 'components/Rcrainfo';
+import { SyncRcrainfoProfileBtn } from 'components/RcraProfile/SyncRcrainfoProfileBtn';
 import { HtForm, HtSpinner } from 'components/UI';
 import { useProgressTracker } from 'hooks';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Button, Col, Container, Form, Row, Table } from 'react-bootstrap';
 import { useForm } from 'react-hook-form';
-import { toast } from 'react-toastify';
-import { UserApi } from 'services';
-import {
-  addAlert,
-  addTask,
-  getRcraProfile,
-  RcrainfoProfileState,
-  updateProfile,
-  useAppDispatch,
-} from 'store';
+import { RcrainfoProfileState, useAppDispatch, useUpdateRcrainfoProfileMutation } from 'store';
+import { authApi } from 'store/userSlice/user.slice';
 import { z } from 'zod';
 
 interface ProfileViewProps {
@@ -23,24 +14,28 @@ interface ProfileViewProps {
 }
 
 const rcraProfileForm = z.object({
-  rcraAPIID: z.string().min(36).optional(),
-  rcraAPIKey: z.string().min(20).optional(),
+  rcraAPIID: z.string().min(36).optional().or(z.string().nullable()),
+  rcraAPIKey: z.string().min(20).optional().or(z.string().nullable()),
   rcraUsername: z.string().min(8).optional(),
 });
 
 type RcraProfileForm = z.infer<typeof rcraProfileForm>;
 
 export function RcraProfile({ profile }: ProfileViewProps) {
+  const dispatch = useAppDispatch();
   const [editable, setEditable] = useState(false);
   const [profileLoading, setProfileLoading] = useState(false);
   const [taskId, setTaskId] = useState<undefined | string>();
+  const [updateRcrainfoProfile] = useUpdateRcrainfoProfileMutation();
   const { rcraSites, isLoading, ...formValues } = profile;
-  const dispatch = useAppDispatch();
   const { inProgress } = useProgressTracker({
     taskId: taskId,
-    reduxAction: getRcraProfile(),
   });
 
+  useEffect(() => {
+    dispatch(authApi.util?.invalidateTags(['rcrainfoProfile']));
+  }, [inProgress]);
+
   const {
     register,
     reset,
@@ -51,20 +46,11 @@ export function RcraProfile({ profile }: ProfileViewProps) {
     resolver: zodResolver(rcraProfileForm),
   });
 
-  /**
-   * submitting the RcraProfile form (RCRAInfo API ID, Key, username, etc.)
-   * @param data {ProfileSlice}
-   */
+  /** submitting the RcrainfoProfile form (RCRAInfo API ID, Key, username, etc.)*/
   const onSubmit = (data: RcraProfileForm) => {
     setProfileLoading(!profileLoading);
     setEditable(!editable);
-    UserApi.updateRcrainfoProfile({ username: profile.user, data: data })
-      .then((r) => {
-        dispatch(updateProfile(r.data));
-      })
-      .then(() => dispatch(getRcraProfile()))
-      .then(() => setProfileLoading(!profileLoading))
-      .catch((error: AxiosError) => toast.error(error.message));
+    updateRcrainfoProfile({ username: profile.user, data: data });
   };
 
   if (profile.isLoading) return <HtSpinner center />;
@@ -126,10 +112,9 @@ export function RcraProfile({ profile }: ProfileViewProps) {
                 <>
                   <Button
                     className="mx-2"
-                    variant="success"
+                    variant="outline-info"
                     type="button"
-                    onClick={(event) => {
-                      event.preventDefault();
+                    onClick={() => {
                       setEditable(!editable);
                     }}
                   >
@@ -191,29 +176,8 @@ export function RcraProfile({ profile }: ProfileViewProps) {
           </Table>
         )}
       </Container>
-      <div className="mx-1 d-flex flex-row-reverse">
-        <RcraApiUserBtn
-          className="mx-2"
-          variant="primary"
-          onClick={() => {
-            UserApi.syncRcrainfoProfile()
-              .then((response) => {
-                dispatch(
-                  addTask({
-                    taskId: response.data.taskId,
-                    status: 'PENDING',
-                    taskName: 'Syncing RCRAInfo Profile',
-                  })
-                );
-                setTaskId(response.data.taskId);
-              })
-              .catch((error: AxiosError) =>
-                dispatch(addAlert({ message: error.message, type: 'error' }))
-              );
-          }}
-        >
-          Sync Site Permissions
-        </RcraApiUserBtn>
+      <div className="m-1 d-flex flex-row-reverse">
+        <SyncRcrainfoProfileBtn taskId={taskId} setTaskId={setTaskId} />
       </div>
     </>
   );
diff --git a/client/src/components/RcraProfile/SyncRcrainfoProfileBtn.tsx b/client/src/components/RcraProfile/SyncRcrainfoProfileBtn.tsx
new file mode 100644
index 000000000..bf92226a6
--- /dev/null
+++ b/client/src/components/RcraProfile/SyncRcrainfoProfileBtn.tsx
@@ -0,0 +1,41 @@
+import { RcraApiUserBtn } from 'components/Rcrainfo';
+import React, { useEffect } from 'react';
+import { addTask, updateTask, useAppDispatch, useSyncRcrainfoProfileMutation } from 'store';
+
+interface SyncRcrainfoProfileBtnProps {
+  taskId?: string;
+  setTaskId: (taskId: string) => void;
+}
+
+export function SyncRcrainfoProfileBtn({ taskId, setTaskId }: SyncRcrainfoProfileBtnProps) {
+  const dispatch = useAppDispatch();
+  const [syncRcrainfoProfile, { data, error, isLoading }] = useSyncRcrainfoProfileMutation();
+
+  useEffect(() => {
+    if (data) {
+      dispatch(
+        addTask({
+          taskId: data.taskId,
+          status: 'PENDING',
+          taskName: 'Syncing RCRAInfo Profile',
+        })
+      );
+      setTaskId(data.taskId);
+    }
+    if (error) {
+      dispatch(updateTask({ taskId: taskId, status: 'FAILURE', complete: true }));
+    }
+  }, [data, error, isLoading]);
+
+  return (
+    <RcraApiUserBtn
+      className="mx-2"
+      variant="primary"
+      onClick={() => {
+        syncRcrainfoProfile();
+      }}
+    >
+      Sync Site Permissions
+    </RcraApiUserBtn>
+  );
+}
diff --git a/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx b/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx
index 9b0f8d2cc..e8cc292d5 100644
--- a/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx
+++ b/client/src/components/Rcrainfo/buttons/RcraApiUserBtn/RcraApiUserBtn.tsx
@@ -1,5 +1,5 @@
 import { Button, ButtonProps } from 'react-bootstrap';
-import { selectHaztrakProfile, useAppSelector } from 'store';
+import { useGetProfileQuery } from 'store';
 
 interface HtApiUserBtnProps extends ButtonProps {}
 
@@ -9,8 +9,10 @@ interface HtApiUserBtnProps extends ButtonProps {}
  * @constructor
  */
 export function RcraApiUserBtn({ children, ...props }: HtApiUserBtnProps) {
-  const profile = useAppSelector(selectHaztrakProfile);
-  const active = !props.disabled && profile.org?.rcrainfoIntegrated;
+  const { rcrainfoIntegrated } = useGetProfileQuery(undefined, {
+    selectFromResult: ({ data }) => ({ rcrainfoIntegrated: data?.org?.rcrainfoIntegrated }),
+  });
+  const active = !props.disabled && rcrainfoIntegrated;
 
   return (
     <>
diff --git a/client/src/features/Profile/Profile.tsx b/client/src/features/Profile/Profile.tsx
index ee2d09d6e..93539c8f8 100644
--- a/client/src/features/Profile/Profile.tsx
+++ b/client/src/features/Profile/Profile.tsx
@@ -39,7 +39,7 @@ export function Profile(): ReactElement {
           </Col>
           <Col xs={12} lg={6} className="my-3">
             <HtCard title="My Organization" className="h-100 my-2">
-              <HtCard.Body>{profile.org && <UserOrg profile={profile} />}</HtCard.Body>
+              <HtCard.Body>{profile && <UserOrg profile={profile} />}</HtCard.Body>
             </HtCard>
           </Col>
         </Row>
diff --git a/client/src/services/APIs/UserApi.ts b/client/src/services/APIs/UserApi.ts
deleted file mode 100644
index a983ed8b4..000000000
--- a/client/src/services/APIs/UserApi.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { AxiosResponse } from 'axios';
-import { HaztrakSite } from 'components/HaztrakSite';
-import { HaztrakModulePermissions, HaztrakUser, RcrainfoProfile, RcrainfoProfileSite } from 'store';
-import { htApi } from './htApi';
-
-interface HaztrakOrgResponse {
-  id: string;
-  name: string;
-  rcrainfoIntegrated: boolean;
-}
-
-interface HaztrakProfileResponse {
-  user: string;
-  sites: Array<{
-    site: HaztrakSite;
-    eManifest: HaztrakModulePermissions;
-  }>;
-  org?: HaztrakOrgResponse;
-}
-
-interface RcrainfoProfileResponse extends RcrainfoProfile<Array<RcrainfoProfileSite>> {}
-
-export const UserApi = {
-  /** Fetch the user's Haztrak profile from the Haztrak API*/
-  getUserProfile: async (): Promise<AxiosResponse<HaztrakProfileResponse>> => {
-    return await htApi.get('/user/profile');
-  },
-
-  /** Fetch Haztrak user from server*/
-  getUser: async (): Promise<AxiosResponse<HaztrakUser>> => {
-    return await htApi.get('/user');
-  },
-
-  /** Fetch Haztrak user from server*/
-  updateUser: async (data: Partial<HaztrakUser>): Promise<AxiosResponse<HaztrakUser>> => {
-    return await htApi.put('/user', data);
-  },
-
-  /** Fetch the user's RCRAInfo profile from the Haztrak API*/
-  getRcrainfoProfile: async (username: string): Promise<AxiosResponse<RcrainfoProfileResponse>> => {
-    return await htApi.get(`/user/rcrainfo-profile/${username}`);
-  },
-
-  /** Update user's RCRAInfo Profile information such username, api ID & key*/
-  updateRcrainfoProfile: async ({
-    username,
-    data,
-  }: {
-    username: string;
-    data: any;
-  }): Promise<AxiosResponse<any>> => {
-    return await htApi.put(`/user/rcrainfo-profile/${username}`, data);
-  },
-
-  /** Launch task to pull user's site/module permissions (RCRAInfo profile) from RCRAInfo*/
-  syncRcrainfoProfile: async (): Promise<AxiosResponse<{ taskId: string }>> => {
-    return await htApi.get(`user/rcrainfo-profile/sync`);
-  },
-};
diff --git a/client/src/services/index.ts b/client/src/services/index.ts
index 27aba813c..131e298ef 100644
--- a/client/src/services/index.ts
+++ b/client/src/services/index.ts
@@ -1,3 +1,2 @@
 export { htApi } from 'services/APIs/htApi';
-export { UserApi } from 'services/APIs/UserApi';
 export { manifest } from 'services/manifest/manifest';
diff --git a/client/src/store/index.ts b/client/src/store/index.ts
index dd1def1fb..2e28f106e 100644
--- a/client/src/store/index.ts
+++ b/client/src/store/index.ts
@@ -31,6 +31,8 @@ export const {
   useGetProfileQuery,
   useGetRcrainfoProfileQuery,
   useUpdateUserMutation,
+  useUpdateRcrainfoProfileMutation,
+  useSyncRcrainfoProfileMutation,
 } = authApi;
 
 // Authentication Slice
@@ -43,7 +45,6 @@ export {
 
 // Profile Slice
 export {
-  getRcraProfile,
   selectRcrainfoSites,
   selectRcraProfile,
   siteByEpaIdSelector,
diff --git a/client/src/store/profileSlice/profile.slice.spec.tsx b/client/src/store/profileSlice/profile.slice.spec.tsx
index bcc217b63..cb3d5bcc8 100644
--- a/client/src/store/profileSlice/profile.slice.spec.tsx
+++ b/client/src/store/profileSlice/profile.slice.spec.tsx
@@ -1,5 +1,5 @@
 /**
- *  RcraProfile tests
+ *  RcrainfoProfile tests
  */
 import '@testing-library/jest-dom';
 import { screen } from '@testing-library/react';
diff --git a/client/src/store/profileSlice/profile.slice.ts b/client/src/store/profileSlice/profile.slice.ts
index 46f89e94a..f7629eb5c 100644
--- a/client/src/store/profileSlice/profile.slice.ts
+++ b/client/src/store/profileSlice/profile.slice.ts
@@ -1,11 +1,10 @@
 /**
- * A user's RcraProfile slice encapsulates our logic related what actions and data a user
+ * A user's RcrainfoProfile slice encapsulates our logic related what actions and data a user
  * has access to for each EPA site ID.
  */
-import { createAsyncThunk, createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { HaztrakSite } from 'components/HaztrakSite';
 import { RcraSite } from 'components/RcraSite';
-import { UserApi } from 'services';
 import { RootState } from 'store';
 
 /**The user's RCRAInfo account data stored in the Redux store*/
@@ -64,7 +63,7 @@ export interface RcrainfoSitePermissions {
   myRCRAid: string;
 }
 
-/**initial, state of a user's RcraProfile.*/
+/**initial, state of a user's RcrainfoProfile.*/
 const initialState: ProfileSlice = {
   user: undefined,
   rcrainfoProfile: undefined,
@@ -73,31 +72,6 @@ const initialState: ProfileSlice = {
   error: undefined,
 };
 
-/**Retrieves a user's RcrainfoProfile, if it exists, from the server.*/
-export const getRcraProfile = createAsyncThunk<ProfileSlice>(
-  'profile/getRcrainfoProfile',
-  async (arg, thunkAPI) => {
-    const state = thunkAPI.getState() as RootState;
-    const username = state.auth.user?.username;
-    if (!username) {
-      throw new Error('User is not logged in');
-    }
-    const { data } = await UserApi.getRcrainfoProfile(username);
-    const { rcraSites, ...rest } = data;
-    return {
-      rcrainfoProfile: {
-        ...rest,
-        rcraSites: rcraSites?.reduce((obj, site) => {
-          return {
-            ...obj,
-            [site.epaSiteId]: { epaSiteId: site.epaSiteId, permissions: site.permissions },
-          };
-        }, {}),
-      },
-    } as ProfileSlice;
-  }
-);
-
 const profileSlice = createSlice({
   name: 'profile',
   initialState,
@@ -109,30 +83,6 @@ const profileSlice = createSlice({
       };
     },
   },
-  extraReducers: (builder) => {
-    builder
-      .addCase(getRcraProfile.pending, (state) => {
-        return {
-          ...state,
-          loading: true,
-          error: undefined,
-        };
-      })
-      .addCase(getRcraProfile.fulfilled, (state, action) => {
-        return {
-          ...state,
-          ...action.payload,
-          loading: false,
-          error: undefined,
-        };
-      })
-      .addCase(getRcraProfile.rejected, (state, action) => {
-        state.loading = false;
-        // @ts-ignore
-        state.error = action.payload.error;
-        return state;
-      });
-  },
 });
 
 /** Retrieve a Haztrak site from the users Profile by the site's EPA ID number */
@@ -183,7 +133,7 @@ export const selectRcrainfoSites = createSelector(
   }
 );
 
-/** Retrieve a user's RcraProfile from the Redux store. */
+/** Retrieve a user's RcrainfoProfile from the Redux store. */
 export const selectRcraProfile = createSelector(
   (state: RootState) => state,
   (state: RootState) => state.profile.rcrainfoProfile
diff --git a/client/src/store/userSlice/user.slice.ts b/client/src/store/userSlice/user.slice.ts
index d27138d76..72976a720 100644
--- a/client/src/store/userSlice/user.slice.ts
+++ b/client/src/store/userSlice/user.slice.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { createApi } from '@reduxjs/toolkit/query/react';
 import { HaztrakSite } from 'components/HaztrakSite';
-import { htApiBaseQuery } from 'store/haztrakApiSlice';
+import { htApiBaseQuery, TaskResponse } from 'store/haztrakApiSlice';
 import {
   HaztrakModulePermissions,
   ProfileSlice,
@@ -169,5 +169,20 @@ export const authApi = createApi({
         };
       },
     }),
+    updateRcrainfoProfile: build.mutation<any, { username: string; data: any }>({
+      query: (data) => ({
+        url: `/rcrainfo-profile/${data.username}`,
+        method: 'PUT',
+        data: data.data,
+      }),
+      invalidatesTags: ['rcrainfoProfile'],
+    }),
+    syncRcrainfoProfile: build.mutation<TaskResponse, void>({
+      query: () => ({
+        url: `/rcrainfo-profile/sync`,
+        method: 'POST',
+      }),
+      invalidatesTags: ['rcrainfoProfile'],
+    }),
   }),
 });
diff --git a/client/src/test-utils/mock/handlers.ts b/client/src/test-utils/mock/handlers.ts
index 5161741da..828706099 100644
--- a/client/src/test-utils/mock/handlers.ts
+++ b/client/src/test-utils/mock/handlers.ts
@@ -23,7 +23,7 @@ export const handlers = [
       { status: 200 }
     );
   }),
-  /** User RcraProfile data*/
+  /** User RcrainfoProfile data*/
   http.get(`${API_BASE_URL}/api/user/rcrainfo-profile/${mockUsername}`, (info) => {
     return HttpResponse.json(
       {
diff --git a/server/apps/conftest.py b/server/apps/conftest.py
index f7910753c..ff01160b9 100644
--- a/server/apps/conftest.py
+++ b/server/apps/conftest.py
@@ -13,7 +13,7 @@
 from faker.providers import BaseProvider
 from rest_framework.test import APIClient
 
-from apps.core.models import HaztrakProfile, HaztrakUser, RcraProfile
+from apps.core.models import HaztrakProfile, HaztrakUser, RcrainfoProfile
 from apps.site.models import (
     Address,
     Contact,
@@ -80,14 +80,14 @@ def create_user(
 
 @pytest.fixture
 def rcra_profile_factory(db, user_factory, faker: Faker):
-    """Abstract factory for Haztrak RcraProfile model"""
+    """Abstract factory for Haztrak RcrainfoProfile model"""
 
     def create_profile(
         rcra_api_id: Optional[str] = str(faker.uuid4()),
         rcra_api_key: Optional[str] = faker.pystr(min_chars=15),
         rcra_username: Optional[str] = faker.pystr(min_chars=12),
-    ) -> RcraProfile:
-        return RcraProfile.objects.create(
+    ) -> RcrainfoProfile:
+        return RcrainfoProfile.objects.create(
             rcra_api_id=rcra_api_id,
             rcra_api_key=rcra_api_key,
             rcra_username=rcra_username,
@@ -98,11 +98,11 @@ def create_profile(
 
 @pytest.fixture
 def haztrak_profile_factory(db, user_factory, rcra_profile_factory, haztrak_org_factory):
-    """Abstract factory for Haztrak RcraProfile model"""
+    """Abstract factory for Haztrak RcrainfoProfile model"""
 
     def create_profile(
         user: Optional[User] = None,
-        rcrainfo_profile: Optional[RcraProfile] = rcra_profile_factory(),
+        rcrainfo_profile: Optional[RcrainfoProfile] = rcra_profile_factory(),
         org: Optional[HaztrakOrg] = haztrak_org_factory(),
     ) -> HaztrakProfile:
         return HaztrakProfile.objects.create(
@@ -329,7 +329,7 @@ def user_with_org_factory(
     def create_fixtures(
         user: Optional[User] = None,
         org: Optional[HaztrakOrg] = None,
-        admin_rcrainfo_profile: Optional[RcraProfile] = None,
+        admin_rcrainfo_profile: Optional[RcrainfoProfile] = None,
         is_rcrainfo_enabled: Optional[bool] = True,
     ):
         if is_rcrainfo_enabled:
diff --git a/server/apps/core/admin.py b/server/apps/core/admin.py
index 2a5cba6b7..a9dd05d7b 100644
--- a/server/apps/core/admin.py
+++ b/server/apps/core/admin.py
@@ -4,7 +4,7 @@
 from django.utils.html import format_html, urlencode
 
 from ..site.models import RcraSitePermissions, SitePermissions
-from .models import HaztrakProfile, HaztrakUser, RcraProfile
+from .models import HaztrakProfile, HaztrakUser, RcrainfoProfile
 
 
 class HiddenListView(admin.ModelAdmin):
@@ -70,7 +70,7 @@ def number_of_sites(profile: HaztrakProfile) -> str:
         return str(profile.site_permissions.all().count())
 
 
-@admin.register(RcraProfile)
+@admin.register(RcrainfoProfile)
 class RcraProfileAdmin(admin.ModelAdmin):
     list_display = ["__str__", "related_user", "rcra_username", "api_user"]
     search_fields = ["haztrak_profile__user__username", "rcra_username"]
@@ -84,7 +84,7 @@ def related_user(self, user):
         url = reverse("admin:core_haztrakuser_changelist") + "?" + urlencode({"q": str(user.id)})
         return format_html("<a href='{}'>{}</a>", url, user)
 
-    def api_user(self, profile: RcraProfile) -> bool:
+    def api_user(self, profile: RcrainfoProfile) -> bool:
         return profile.has_rcrainfo_api_id_key
 
     api_user.boolean = True
diff --git a/server/apps/core/migrations/0001_initial.py b/server/apps/core/migrations/0001_initial.py
index b7af7d12b..78da9c7db 100644
--- a/server/apps/core/migrations/0001_initial.py
+++ b/server/apps/core/migrations/0001_initial.py
@@ -1,67 +1,129 @@
 # Generated by Django 4.2.7 on 2023-11-20 16:47
 
+import uuid
+
 import django.contrib.auth.models
 import django.contrib.auth.validators
-from django.db import migrations, models
 import django.utils.timezone
-import uuid
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='HaztrakUser',
+            name="HaztrakUser",
             fields=[
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    models.DateTimeField(blank=True, null=True, verbose_name="last login"),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={"unique": "A user with that username already exists."},
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(blank=True, max_length=150, verbose_name="first name"),
+                ),
+                (
+                    "last_name",
+                    models.CharField(blank=True, max_length=150, verbose_name="last name"),
+                ),
+                (
+                    "email",
+                    models.EmailField(blank=True, max_length=254, verbose_name="email address"),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'User',
-                'verbose_name_plural': 'Users',
-                'ordering': ['username'],
+                "verbose_name": "User",
+                "verbose_name_plural": "Users",
+                "ordering": ["username"],
             },
             managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ("objects", django.contrib.auth.models.UserManager()),
             ],
         ),
         migrations.CreateModel(
-            name='HaztrakProfile',
+            name="HaztrakProfile",
             fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Haztrak Profile',
-                'ordering': ['user__username'],
-                'default_related_name': 'haztrak_profile',
+                "verbose_name": "Haztrak Profile",
+                "ordering": ["user__username"],
+                "default_related_name": "haztrak_profile",
             },
         ),
         migrations.CreateModel(
-            name='RcraProfile',
+            name="RcrainfoProfile",
             fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
-                ('rcra_api_key', models.CharField(blank=True, max_length=128, null=True)),
-                ('rcra_api_id', models.CharField(blank=True, max_length=128, null=True)),
-                ('rcra_username', models.CharField(blank=True, max_length=128, null=True)),
-                ('phone_number', models.CharField(blank=True, max_length=15, null=True)),
-                ('email', models.EmailField(max_length=254)),
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+                    ),
+                ),
+                ("rcra_api_key", models.CharField(blank=True, max_length=128, null=True)),
+                ("rcra_api_id", models.CharField(blank=True, max_length=128, null=True)),
+                ("rcra_username", models.CharField(blank=True, max_length=128, null=True)),
+                ("phone_number", models.CharField(blank=True, max_length=15, null=True)),
+                ("email", models.EmailField(max_length=254)),
             ],
             options={
-                'ordering': ['rcra_username'],
+                "ordering": ["rcra_username"],
             },
         ),
     ]
diff --git a/server/apps/core/migrations/0002_initial.py b/server/apps/core/migrations/0002_initial.py
index 6fd6ca896..a320f9249 100644
--- a/server/apps/core/migrations/0002_initial.py
+++ b/server/apps/core/migrations/0002_initial.py
@@ -1,8 +1,8 @@
 # Generated by Django 4.2.7 on 2023-11-20 16:47
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.SET_NULL,
                 related_name="haztrak_profile",
-                to="core.rcraprofile",
+                to="core.rcrainfoprofile",
             ),
         ),
         migrations.AddField(
diff --git a/server/apps/core/models.py b/server/apps/core/models.py
index 14c975ec5..2f4502df3 100644
--- a/server/apps/core/models.py
+++ b/server/apps/core/models.py
@@ -38,7 +38,7 @@ class Meta:
         related_name="haztrak_profile",
     )
     rcrainfo_profile = models.OneToOneField(
-        "RcraProfile",
+        "core.RcrainfoProfile",
         on_delete=models.SET_NULL,
         related_name="haztrak_profile",
         null=True,
@@ -61,9 +61,9 @@ def __str__(self):
         return f"{self.user.username}"
 
 
-class RcraProfile(models.Model):
+class RcrainfoProfile(models.Model):
     """
-    Contains a user's RcraProfile information, such as username, and API credentials.
+    Contains a user's RcrainfoProfile information, such as username, and API credentials.
     Has a one-to-one relationship with the User model.
     """
 
diff --git a/server/apps/core/serializers.py b/server/apps/core/serializers.py
index b312fb824..34d9f9f53 100644
--- a/server/apps/core/serializers.py
+++ b/server/apps/core/serializers.py
@@ -4,7 +4,7 @@
 from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
 
-from apps.core.models import HaztrakProfile, HaztrakUser, RcraProfile
+from apps.core.models import HaztrakProfile, HaztrakUser, RcrainfoProfile
 from apps.site.serializers import HaztrakOrgSerializer, RcraSitePermissionSerializer
 from apps.site.serializers.profile_serializer import SitePermissionSerializer
 
@@ -59,8 +59,8 @@ class Meta:
         ]
 
 
-class RcraProfileSerializer(ModelSerializer):
-    """Model serializer for marshalling/unmarshalling a user's RcraProfile"""
+class RcrainfoProfileSerializer(ModelSerializer):
+    """Model serializer for marshalling/unmarshalling a user's RcrainfoProfile"""
 
     user = serializers.StringRelatedField(
         source="haztrak_profile",
@@ -77,11 +77,15 @@ class RcraProfileSerializer(ModelSerializer):
     rcraAPIID = serializers.CharField(
         source="rcra_api_id",
         required=False,
+        allow_null=True,
+        allow_blank=True,
     )
     rcraAPIKey = serializers.CharField(
         source="rcra_api_key",
         required=False,
         write_only=True,
+        allow_blank=True,
+        allow_null=True,
     )
     rcraUsername = serializers.CharField(
         source="rcra_username",
@@ -94,7 +98,7 @@ class RcraProfileSerializer(ModelSerializer):
     )
 
     class Meta:
-        model = RcraProfile
+        model = RcrainfoProfile
         fields = [
             "user",
             "rcraAPIID",
diff --git a/server/apps/core/services/profile_service.py b/server/apps/core/services/profile_service.py
index f74c88951..a6eff5e43 100644
--- a/server/apps/core/services/profile_service.py
+++ b/server/apps/core/services/profile_service.py
@@ -1,4 +1,4 @@
-"""business logic related to a user's Haztrak profile (note: not their RcraProfile)"""
+"""business logic related to a user's Haztrak profile (note: not their RcrainfoProfile)"""
 from django.db import transaction
 
 from apps.core.models import HaztrakProfile, HaztrakUser
diff --git a/server/apps/core/services/rcrainfo_service.py b/server/apps/core/services/rcrainfo_service.py
index 59836863d..393e9bcc9 100644
--- a/server/apps/core/services/rcrainfo_service.py
+++ b/server/apps/core/services/rcrainfo_service.py
@@ -5,7 +5,7 @@
 from django.db import IntegrityError
 from emanifest import RcrainfoClient, RcrainfoResponse  # type: ignore
 
-from apps.core.models import RcraProfile  # type: ignore
+from apps.core.models import RcrainfoProfile  # type: ignore
 from apps.site.models.site_models import HaztrakOrg
 from apps.trak.models import WasteCode  # type: ignore
 
@@ -23,13 +23,13 @@ class RcrainfoService(RcrainfoClient):
     def __init__(
         self,
         *,
-        rcra_profile: Optional[RcraProfile] = None,
+        rcra_profile: Optional[RcrainfoProfile] = None,
         api_id: Optional[str] = None,
         api_key: Optional[str] = None,
         rcrainfo_env: Optional[Literal["preprod"] | Literal["prod"]] = None,
         **kwargs,
     ):
-        self.profile: RcraProfile | None = rcra_profile
+        self.profile: RcrainfoProfile | None = rcra_profile
         self.api_id: str | None = api_id
         self.api_key: str | None = api_key
         self.rcrainfo_env: str = rcrainfo_env or "preprod"
@@ -67,7 +67,7 @@ def get_user_rcrainfo_profile(
         """
         Retrieve a user's site permissions from RCRAInfo, It expects the
         haztrak user to have their unique RCRAInfo user and API credentials in their
-        RcraProfile
+        RcrainfoProfile
         """
         return self.search_users(userId=rcrainfo_username)
 
diff --git a/server/apps/core/tests/test_models.py b/server/apps/core/tests/test_models.py
index d71df4997..4d15a1b37 100644
--- a/server/apps/core/tests/test_models.py
+++ b/server/apps/core/tests/test_models.py
@@ -1,16 +1,16 @@
 import pytest
 
-from apps.core.models import HaztrakProfile, RcraProfile
+from apps.core.models import HaztrakProfile, RcrainfoProfile
 
 
 @pytest.mark.django_db
-class TestRcraProfileModel:
-    """Test related to the RcraProfile model and its API"""
+class TestRcrainfoProfileModel:
+    """Test related to the RcrainfoProfile model and its API"""
 
     def test_rcra_profile_factory(self, rcra_profile_factory):
         """simply check the model saves given our factory's defaults"""
         rcra_profile = rcra_profile_factory()
-        assert isinstance(rcra_profile, RcraProfile)
+        assert isinstance(rcra_profile, RcrainfoProfile)
 
     @pytest.mark.parametrize("rcra_api_id", ["id", None])
     @pytest.mark.parametrize("rcra_api_key", ["key", None])
diff --git a/server/apps/core/tests/test_rcra_profile_views.py b/server/apps/core/tests/test_rcra_profile_views.py
index 59da1fb6f..a3d3d3d95 100644
--- a/server/apps/core/tests/test_rcra_profile_views.py
+++ b/server/apps/core/tests/test_rcra_profile_views.py
@@ -1,15 +1,15 @@
 from rest_framework import status
 from rest_framework.test import APIRequestFactory, force_authenticate
 
-from apps.core.views import RcraProfileView  # type: ignore
+from apps.core.views import RcrainfoProfileView  # type: ignore
 
 
-class TestRcraProfileView:
+class TestRcrainfoProfileView:
     """
-    Tests the for the endpoints related to the user's RcraProfile
+    Tests the for the endpoints related to the user's RcrainfoProfile
     """
 
-    URL = "/api/"
+    URL = "/api/user/"
     id_field = "rcraAPIID"
     key_field = "rcraAPIKey"
     username_field = "rcraUsername"
@@ -26,7 +26,7 @@ def test_returns_a_user_profile(
         rcra_profile = rcra_profile_factory()
         haztrak_profile_factory(user=user, rcrainfo_profile=rcra_profile)
         # Act
-        response = client.get(f"{self.URL}rcra/profile/{user.username}")
+        response = client.get(f"{self.URL}rcrainfo-profile/{user.username}")
         # Assert
         assert response.headers["Content-Type"] == "application/json"
         assert response.status_code == status.HTTP_200_OK
@@ -40,7 +40,7 @@ def test_rcra_profile_updates(
         haztrak_profile_factory(user=user, rcrainfo_profile=rcra_profile)
         factory = APIRequestFactory()
         request = factory.put(
-            f"{self.URL}rcra/profile/{user.username}",
+            f"{self.URL}rcrainfo-profile/{user.username}",
             {
                 self.id_field: rcra_profile.rcra_api_id,
                 self.username_field: user.username,
@@ -50,7 +50,7 @@ def test_rcra_profile_updates(
         )
         force_authenticate(request, user)
         # Act
-        response = RcraProfileView.as_view()(request, username=user.username)
+        response = RcrainfoProfileView.as_view()(request, username=user.username)
         assert response.data[self.id_field] == rcra_profile.rcra_api_id
         assert response.data[self.username_field] == user.username
 
@@ -63,7 +63,7 @@ def test_update_does_not_return_api_key(
         profile = haztrak_profile_factory(user=user, rcrainfo_profile=rcra_profile)
         factory = APIRequestFactory()
         request = factory.put(
-            f"{self.URL}rcra/profile/{user.username}",
+            f"{self.URL}rcrainfo-profile/{user.username}",
             {
                 self.id_field: rcra_profile.rcra_api_id,
                 self.username_field: user.username,
@@ -73,7 +73,7 @@ def test_update_does_not_return_api_key(
         )
         force_authenticate(request, user)
         # Act
-        response = RcraProfileView.as_view()(request, username=profile.user.username)
+        response = RcrainfoProfileView.as_view()(request, username=profile.user.username)
         # Assert
         assert self.key_field not in response.data
         assert self.id_field in response.data
diff --git a/server/apps/core/tests/test_rcrainfo_service.py b/server/apps/core/tests/test_rcrainfo_service.py
index df8958114..1e97ca7ad 100644
--- a/server/apps/core/tests/test_rcrainfo_service.py
+++ b/server/apps/core/tests/test_rcrainfo_service.py
@@ -1,7 +1,6 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 import emanifest
-import pytest
 from responses import matchers
 from rest_framework import status
 
@@ -72,7 +71,7 @@ class TestQuickerSign:
     printed_name = "David Graham"
     site_id = "VATESTGEN001"
     site_type = "Generator"
-    sign_date = datetime.utcnow().replace(tzinfo=timezone.utc)
+    sign_date = datetime.now(UTC)
 
     def test_maps_keywords(
         self,
diff --git a/server/apps/core/urls.py b/server/apps/core/urls.py
index c598bdcfb..c5932c574 100644
--- a/server/apps/core/urls.py
+++ b/server/apps/core/urls.py
@@ -4,8 +4,8 @@
 from .views import (  # type: ignore
     HaztrakProfileView,
     LaunchExampleTaskView,
-    RcraProfileView,
-    SyncRcraProfileView,
+    RcrainfoProfileView,
+    SyncRcrainfoProfileView,
     TaskStatusView,
 )
 
@@ -20,8 +20,8 @@
                 path("/login", LoginView.as_view(), name="rest_login"),
                 path("/logout", LogoutView.as_view(), name="rest_logout"),
                 path("/profile", HaztrakProfileView.as_view()),
-                path("/rcrainfo-profile/sync", SyncRcraProfileView.as_view()),
-                path("/rcrainfo-profile/<str:username>", RcraProfileView.as_view()),
+                path("/rcrainfo-profile/sync", SyncRcrainfoProfileView.as_view()),
+                path("/rcrainfo-profile/<str:username>", RcrainfoProfileView.as_view()),
             ]
         ),
     ),
diff --git a/server/apps/core/views/__init__.py b/server/apps/core/views/__init__.py
index 00aec4f4a..b7da1e2d0 100644
--- a/server/apps/core/views/__init__.py
+++ b/server/apps/core/views/__init__.py
@@ -1,6 +1,6 @@
 from .profile_views import (
     HaztrakProfileView,
-    RcraProfileView,
-    SyncRcraProfileView,
+    RcrainfoProfileView,
+    SyncRcrainfoProfileView,
 )
 from .task_views import LaunchExampleTaskView, TaskStatusView
diff --git a/server/apps/core/views/profile_views.py b/server/apps/core/views/profile_views.py
index aadb56247..ef1768297 100644
--- a/server/apps/core/views/profile_views.py
+++ b/server/apps/core/views/profile_views.py
@@ -5,10 +5,10 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from apps.core.models import HaztrakProfile, RcraProfile
+from apps.core.models import HaztrakProfile, RcrainfoProfile
 from apps.core.serializers import (
     HaztrakProfileSerializer,
-    RcraProfileSerializer,
+    RcrainfoProfileSerializer,
 )
 from apps.site.tasks import sync_user_rcrainfo_sites
 
@@ -24,21 +24,21 @@ def get_object(self):
         return HaztrakProfile.objects.get(user=self.request.user)
 
 
-class RcraProfileView(RetrieveUpdateAPIView):
+class RcrainfoProfileView(RetrieveUpdateAPIView):
     """
-    Responsible for Create/Update operations related to the user RcraProfile,
+    Responsible for Create/Update operations related to the user RcrainfoProfile,
     which maintains a user's RCRAInfo profile data. This info is necessary for
     actions that interface with RCRAInfo.
     """
 
-    queryset = RcraProfile.objects.all()
-    serializer_class = RcraProfileSerializer
+    queryset = RcrainfoProfile.objects.all()
+    serializer_class = RcrainfoProfileSerializer
     response = Response
     lookup_field = "haztrak_profile__user__username"
     lookup_url_kwarg = "username"
 
 
-class SyncRcraProfileView(GenericAPIView):
+class SyncRcrainfoProfileView(GenericAPIView):
     """
     This endpoint launches a task to sync the logged-in user's RCRAInfo profile
     with their haztrak (Rcra)profile.
@@ -47,11 +47,11 @@ class SyncRcraProfileView(GenericAPIView):
     queryset = None
     response = Response
 
-    def get(self, request: Request) -> Response:
+    def post(self, request: Request) -> Response:
         try:
             task: CeleryTask = sync_user_rcrainfo_sites.delay(str(self.request.user))
             return self.response({"taskId": task.id})
-        except RcraProfile.DoesNotExist as exc:
+        except RcrainfoProfile.DoesNotExist as exc:
             return self.response(data={"error": str(exc)}, status=status.HTTP_404_NOT_FOUND)
         except CeleryError as exc:
             return self.response(
diff --git a/server/apps/site/migrations/0001_initial.py b/server/apps/site/migrations/0001_initial.py
index a936116d6..f2a3f85c1 100644
--- a/server/apps/site/migrations/0001_initial.py
+++ b/server/apps/site/migrations/0001_initial.py
@@ -1,11 +1,13 @@
 # Generated by Django 4.2.7 on 2023-11-20 16:47
 
-import apps.site.models.contact_models
-from django.conf import settings
+import uuid
+
 import django.core.validators
-from django.db import migrations, models
 import django.db.models.deletion
-import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+import apps.site.models.contact_models
 
 
 class Migration(migrations.Migration):
@@ -439,7 +441,7 @@ class Migration(migrations.Migration):
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.PROTECT,
                         related_name="permissions",
-                        to="core.rcraprofile",
+                        to="core.rcrainfoprofile",
                     ),
                 ),
                 (
diff --git a/server/apps/site/models/site_models.py b/server/apps/site/models/site_models.py
index 2438f93cc..5109208a7 100644
--- a/server/apps/site/models/site_models.py
+++ b/server/apps/site/models/site_models.py
@@ -10,7 +10,7 @@
 from apps.site.models import Address, Contact
 from apps.site.models.contact_models import RcraPhone
 
-from ...core.models import RcraProfile
+from ...core.models import RcrainfoProfile
 from .base_models import SitesBaseManager, SitesBaseModel
 
 logger = logging.getLogger(__name__)
@@ -45,16 +45,16 @@ class Meta:
     def rcrainfo_api_id_key(self) -> tuple[str, str] | None:
         """Returns the RcraInfo API credentials for the admin user"""
         try:
-            rcrainfo_profile = RcraProfile.objects.get(haztrak_profile__user=self.admin)
+            rcrainfo_profile = RcrainfoProfile.objects.get(haztrak_profile__user=self.admin)
             return rcrainfo_profile.rcra_api_id, rcrainfo_profile.rcra_api_key
-        except RcraProfile.DoesNotExist:
+        except RcrainfoProfile.DoesNotExist:
             return None
 
     @property
     def is_rcrainfo_integrated(self) -> bool:
         """Returns True if the admin user has RcraInfo API credentials"""
-        if RcraProfile.objects.filter(haztrak_profile__user=self.admin).exists():
-            return RcraProfile.objects.get(
+        if RcrainfoProfile.objects.filter(haztrak_profile__user=self.admin).exists():
+            return RcrainfoProfile.objects.get(
                 haztrak_profile__user=self.admin
             ).has_rcrainfo_api_id_key
         else:
@@ -316,7 +316,7 @@ class Meta:
         on_delete=models.CASCADE,
     )
     profile = models.ForeignKey(
-        "core.RcraProfile",
+        "core.RcrainfoProfile",
         on_delete=models.PROTECT,
         related_name="permissions",
     )
diff --git a/server/apps/site/services/rcra_profile_services.py b/server/apps/site/services/rcra_profile_services.py
index b305d8e0b..4964df2bd 100644
--- a/server/apps/site/services/rcra_profile_services.py
+++ b/server/apps/site/services/rcra_profile_services.py
@@ -3,7 +3,7 @@
 
 from django.db import transaction
 
-from apps.core.models import HaztrakProfile, HaztrakUser, RcraProfile  # type: ignore
+from apps.core.models import HaztrakProfile, HaztrakUser, RcrainfoProfile  # type: ignore
 from apps.core.services import (  # type: ignore
     RcrainfoService,
     get_or_create_haztrak_profile,
@@ -18,9 +18,11 @@
 logger = logging.getLogger(__name__)
 
 
-def get_or_create_rcra_profile(*, username: str) -> tuple[RcraProfile, bool]:
-    """Retrieve a user's RcraProfile"""
-    profile, created = RcraProfile.objects.get_or_create(haztrak_profile__user__username=username)
+def get_or_create_rcra_profile(*, username: str) -> tuple[RcrainfoProfile, bool]:
+    """Retrieve a user's RcrainfoProfile"""
+    profile, created = RcrainfoProfile.objects.get_or_create(
+        haztrak_profile__user__username=username
+    )
     if created:
         haztrak_profile, created = get_or_create_haztrak_profile(username=username)
         haztrak_profile.rcrainfo_profile = profile
@@ -38,14 +40,14 @@ def __init__(self, message: str):
 
 class RcraProfileService:
     """
-    RcraProfileService encapsulates the RcraProfile subdomain business logic
+    RcraProfileService encapsulates the RcrainfoProfile subdomain business logic
     of a and exposes method corresponding to use cases.
     """
 
     def __init__(self, *, username: str, rcrainfo: Optional[RcrainfoService] = None):
         self.username = username
         profile, created = get_or_create_rcra_profile(username=username)
-        self.profile: RcraProfile = profile
+        self.profile: RcrainfoProfile = profile
         self.rcrainfo = rcrainfo or get_rcrainfo_client(username=username)
 
     def update_rcrainfo_profile(self, *, rcrainfo_username: Optional[str] = None) -> None:
@@ -64,7 +66,7 @@ def update_rcrainfo_profile(self, *, rcrainfo_username: Optional[str] = None) ->
             )
             permissions = self._parse_rcra_response(rcra_response=profile_response.json())
             self._save_rcrainfo_profile_permissions(permissions)
-        except (RcraProfile.DoesNotExist, RcraSite.DoesNotExist) as exc:
+        except (RcrainfoProfile.DoesNotExist, RcraSite.DoesNotExist) as exc:
             raise RcraProfileServiceError(exc)
 
     def _save_rcrainfo_profile_permissions(self, permissions: list[dict]) -> None:
diff --git a/server/apps/site/tests/conftest.py b/server/apps/site/tests/conftest.py
index ecd7ea783..65a0ab976 100644
--- a/server/apps/site/tests/conftest.py
+++ b/server/apps/site/tests/conftest.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from apps.core.models import RcraProfile
+from apps.core.models import RcrainfoProfile
 from apps.site.models import (
     RcraSite,
     RcraSitePermissions,
@@ -15,7 +15,7 @@ def rcra_permission_factory(db, rcra_site_factory, rcra_profile_factory):
 
     def create_permission(
         site: Optional[RcraSite] = None,
-        profile: Optional[RcraProfile] = None,
+        profile: Optional[RcrainfoProfile] = None,
         site_manager: Optional[bool] = True,
         annual_report: Optional[str] = "Certifier",
         biennial_report: Optional[str] = "Certifier",
diff --git a/server/apps/site/tests/test_services.py b/server/apps/site/tests/test_services.py
index 5c20d6568..3645f08fa 100644
--- a/server/apps/site/tests/test_services.py
+++ b/server/apps/site/tests/test_services.py
@@ -1,6 +1,6 @@
 import uuid
 
-from apps.core.models import HaztrakProfile, RcraProfile
+from apps.core.models import HaztrakProfile, RcrainfoProfile
 from apps.site.services.org_services import get_org, get_org_rcrainfo_api_credentials
 from apps.site.services.rcra_profile_services import get_or_create_rcra_profile
 
@@ -46,7 +46,7 @@ def test_get_or_create_returns_true_if_new_profile(self, user_factory):
         username = "my_username"
         user_factory(username=username)
         retrieved_rcra_profile, created = get_or_create_rcra_profile(username=username)
-        assert isinstance(retrieved_rcra_profile, RcraProfile)
+        assert isinstance(retrieved_rcra_profile, RcrainfoProfile)
         assert created is True
 
     def test_creates_creates_a_haztrak_profile_if_not_present(self, user_factory):
diff --git a/server/apps/site/tests/test_site_views.py b/server/apps/site/tests/test_site_views.py
index 51112d89e..3b9b8ebf1 100644
--- a/server/apps/site/tests/test_site_views.py
+++ b/server/apps/site/tests/test_site_views.py
@@ -2,7 +2,7 @@
 from rest_framework import status
 from rest_framework.test import APIClient, APIRequestFactory, force_authenticate
 
-from apps.core.models import HaztrakUser, RcraProfile  # type: ignore
+from apps.core.models import HaztrakUser, RcrainfoProfile  # type: ignore
 from apps.site.models import HaztrakSite, RcraSite, RcraSitePermissions  # type: ignore
 from apps.site.views import SiteDetailView  # type: ignore
 
diff --git a/server/apps/trak/signals.py b/server/apps/trak/signals.py
index 3e481162e..e9630bae1 100644
--- a/server/apps/trak/signals.py
+++ b/server/apps/trak/signals.py
@@ -2,13 +2,13 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from apps.core.models import RcraProfile
+from apps.core.models import RcrainfoProfile
 
 
 @receiver(post_save, sender=User)
 def create_profile(sender, instance, created, **kwargs):
     if created:
-        RcraProfile.objects.create(user=instance)
+        RcrainfoProfile.objects.create(user=instance)
 
 
 @receiver(post_save, sender=User)
diff --git a/server/fixtures/dev_data.yaml b/server/fixtures/dev_data.yaml
index 3223b1833..a0f11d259 100644
--- a/server/fixtures/dev_data.yaml
+++ b/server/fixtures/dev_data.yaml
@@ -245,19 +245,19 @@
     can_esign: true
     limited_esign: true
     registered_emanifest_user: true
-- model: core.rcraprofile
+- model: core.rcrainfoprofile
   pk: d74f904a-7843-4a60-862c-3b94b6051359
   fields:
     rcra_username: dpgraham4401
     phone_number: null
     email: orgadmin@generator.com
-- model: core.rcraprofile
+- model: core.rcrainfoprofile
   pk: 1fd27bec-8743-4eb3-a44c-fd063ea62021
   fields:
     rcra_username: ''
     phone_number: null
     email: superadmin@gmail.com
-- model: core.rcraprofile
+- model: core.rcrainfoprofile
   pk: 192c73f4-24f1-4f21-8239-dee2da43c547
   fields:
     rcra_username: emanifestpyuser1