diff --git a/components/core/Shell/NavBar/NavBar.jsx b/components/core/Shell/NavBar/NavBar.jsx
index af32e4e..c012a4c 100644
--- a/components/core/Shell/NavBar/NavBar.jsx
+++ b/components/core/Shell/NavBar/NavBar.jsx
@@ -188,7 +188,7 @@ export const NavBar = ({ notifications, disableNav, settings }) => {
             <Avatar
               onClick={() => onUserIconClick()}
             >
-              {`${user?.firstName[0]}${user?.lastName[0]}`}
+              {`${user?.first_name[0]}${user?.last_name[0]}`}
             </Avatar>
           </Tab>
           <SlidingIndicator style={indicatorStyle} />
diff --git a/src/pages/Settings/Settings.jsx b/src/pages/Settings/Settings.jsx
index ef80197..5a409da 100644
--- a/src/pages/Settings/Settings.jsx
+++ b/src/pages/Settings/Settings.jsx
@@ -186,7 +186,7 @@ const settingsFields = [
             readOnly: true
           },
           {
-            id: 'billingAddress',
+            id: 'billing_address',
             label: 'Billing Address',
             type: 'text'
           },
@@ -216,7 +216,7 @@ const settingsFields = [
             type: 'phone'
           },
           {
-            id: 'displayTime',
+            id: 'display_time',
             label: 'Display Time',
             type: 'select',
             options: [
@@ -225,7 +225,7 @@ const settingsFields = [
             ]
           },
           {
-            id: 'startDay',
+            id: 'start_day',
             label: 'Calendar Start Day',
             type: 'select',
             options: [
diff --git a/src/router/AppRouter.jsx b/src/router/AppRouter.jsx
index 4a33f34..888dfde 100644
--- a/src/router/AppRouter.jsx
+++ b/src/router/AppRouter.jsx
@@ -7,18 +7,18 @@ import { useLocalStore } from '@components';
 const dept = {
   id: 1,
   company: 'Darien EMS - Post 53',
-  Abv: 'DEMS',
-  billingAddress: '0 Ledge Road',
+  abv: 'DEMS',
+  billing_address: '0 Ledge Road',
   town: 'Darien',
   state: 'Connecticut',
   postal: '06820',
   country: 'United States',
   phone: '',
-  displayTime: '12',
-  startDay: 'sunday',
-  companyLogo: '',
-  employeeCount: 1,
-  subscriptionExpiration: '10/01/2025',
+  display_time: '12',
+  start_day: 'sunday',
+  company_logo: '',
+  employee_count: 1,
+  subscription_expiration: '10/01/2025',
   schedulers: [],
   managers: [],
   administrators: [1]
@@ -32,19 +32,19 @@ const AppRouter = () => {
     setDepartment(dept);
     setUser({
       id: 1,
-      firstName: 'ShiftSync-Manager',
-      lastName: 'Test-User',
+      first_name: 'ShiftSync-Manager',
+      last_name: 'Test-User',
       email: 'testuser@shift-sync.com',
       scheduler: dept?.schedulers?.includes(1),
       manager: dept?.managers?.includes(1),
       administrator: dept?.administrators?.includes(1),
-      isSSAdmin: false
+      is_ss_admin: false
     });
   }, []);
 
   useEffect(() => {
     if (!userChanged && user) {
-      if (user?.isSSAdmin) {
+      if (user?.is_ss_admin) {
         setUser({
           ...user,
           scheduler: true,