diff --git a/web-app/src/app/about/about.component.html b/web-app/src/app/about/about.component.html
index ee40a92a9..159ba7011 100644
--- a/web-app/src/app/about/about.component.html
+++ b/web-app/src/app/about/about.component.html
@@ -12,13 +12,13 @@
   <div>
     <div class="mat-h1">About</div>
     <p>
-      MAGE is a dynamic, secure, mobile situational awareness and field data collection platform that supports
-      low-bandwidth and disconnected users. MAGE can integrate with existing command centers and common operating
-      pictures or stand alone as a complete, mission-ready solution. The MAGE mobile app on iOS and Android
+      Mage is a dynamic, secure, mobile situational awareness and field data collection platform that supports
+      low-bandwidth and disconnected users. Mage can integrate with existing command centers and common operating
+      pictures or stand alone as a complete, mission-ready solution. The Mage mobile app on iOS and Android
       allows agents in the field to create and share geo-tagged observations with attached photos, videos,
-      audio, and form data. MAGE's data collection forms are easily tailored to suit any team and mission with
-      custom form fields and map symbologies. In addition to data collection, the MAGE mobile app can optionally
-      report field agents' locations at regular intervals to the MAGE server. The MAGE server's web app provides
+      audio, and form data. Mage's data collection forms are easily tailored to suit any team and mission with
+      custom form fields and map symbologies. In addition to data collection, the Mage mobile app can optionally
+      report field agents' locations at regular intervals to the Mage server. The Mage server's web app provides
       a common operating picture of field agents' observations and latest reported locations.
     </p>
 
@@ -35,7 +35,7 @@
   <div>
     <div class="mat-h1">API</div>
     <div>
-      Browse and try the MAGE API live with <a href="#/swagger">Swagger UI.</a> Swagger interactive documentation will modify MAGE data via API calls; please be careful with <strong>POST/PUT/DELETE</strong> operations.
+      Browse and try the Mage API live with <a href="#/swagger">Swagger UI.</a> Swagger interactive documentation will modify Mage data via API calls; please be careful with <strong>POST/PUT/DELETE</strong> operations.
     </div>
   </div>
 
@@ -48,7 +48,7 @@
 
   <div>
     <div class="mat-h1">Acknowledgements</div>
-      <div>The MAGE is built with the MEAN stack;
+      <div>Mage is built with the MEAN stack
         <a href="https://www.mongodb.org/" target="_blank">MongoDB</a>, 
         <a href="https://expressjs.com/" target="_blank">Express</a>, 
         <a href="https://angular.dev/" target="_blank">Angular</a> and
diff --git a/web-app/src/app/contact/contact-dialog.component.ts b/web-app/src/app/contact/contact-dialog.component.ts
index 53dc4d71f..764739849 100644
--- a/web-app/src/app/contact/contact-dialog.component.ts
+++ b/web-app/src/app/contact/contact-dialog.component.ts
@@ -39,7 +39,7 @@ export class ContactDialogComponent  {
 				var message = ""
         if (emailLink || phoneLink) {
             message += "<br /><br />"
-					  message += "You may contact your MAGE administrator via "
+          message += "You may contact your Mage administrator via "
             if (emailLink) {
 							message += "<a href=" + emailLink + ">Email</a>"
             }
diff --git a/web-app/src/app/ingress/authentication/idp/idp-authentication.component.ts b/web-app/src/app/ingress/authentication/idp/idp-authentication.component.ts
index d4a025c21..3aa15252a 100644
--- a/web-app/src/app/ingress/authentication/idp/idp-authentication.component.ts
+++ b/web-app/src/app/ingress/authentication/idp/idp-authentication.component.ts
@@ -23,12 +23,12 @@ export class IdpAuthenticationComponent {
     this.userService.idpSignin(this.strategy.name).subscribe({
       next: (response: any) => {
         if (!response.token || !response.user) {
-          let message = 'There was a problem signing in, Please contact a MAGE administrator for assistance.'
+          let message = 'There was a problem signing in, Please contact a Mage administrator for assistance.'
           if (response.user) {
             if (!response.user.active) {
-              message = 'Your account has been created but it is not active. A MAGE administrator needs to activate your account before you can log in.'
+              message = 'Your account has been created but it is not active. A Mage administrator needs to activate your account before you can log in.'
             } else if (!response.user.enabled) {
-              message = 'Your account has been disabled, please contact a MAGE administrator for assistance.'
+              message = 'Your account has been disabled, please contact a Mage administrator for assistance.'
             }
           }
 
diff --git a/web-app/src/app/map/layers/layers.component.html b/web-app/src/app/map/layers/layers.component.html
index 200241166..424293a15 100644
--- a/web-app/src/app/map/layers/layers.component.html
+++ b/web-app/src/app/map/layers/layers.component.html
@@ -1,5 +1,5 @@
 <div class="map-layers">
-  <h4 class="header">MAGE</h4>
+  <h4 class="header">Mage</h4>
   <mat-accordion class="layer-list" cdkDropList cdkDropListLockAxis="y" displayMode="flat" multi="true" (cdkDropListDropped)="reorderLayers($event, 'feature', mageLayers)" >
     <ng-container *ngFor="let layer of mageLayers">
       <mat-expansion-panel hideToggle #expansionPanel cdkDrag>
diff --git a/web-app/src/app/map/map.component.html b/web-app/src/app/map/map.component.html
index 65238cb5c..602471d46 100644
--- a/web-app/src/app/map/map.component.html
+++ b/web-app/src/app/map/map.component.html
@@ -5,7 +5,7 @@
 <mat-sidenav-container class="map-container" hasBackdrop="false">
   <mat-sidenav #drawer mode="over" position="end" autoFocus="false">
     <map-layers-panel 
-      [mageLayers]="groups['MAGE'].layers" 
+      [mageLayers]="groups['mage'].layers" 
       [feedLayers]="groups['feed'].layers"
       [baseLayers]="groups['base'].layers" 
       [tileOverlays]="groups['tile'].layers" 
diff --git a/web-app/src/app/map/map.component.ts b/web-app/src/app/map/map.component.ts
index 938a48123..561d6b684 100644
--- a/web-app/src/app/map/map.component.ts
+++ b/web-app/src/app/map/map.component.ts
@@ -57,7 +57,7 @@ export class MapComponent implements OnDestroy, AfterViewInit {
       offset: MapComponent.BASE_PANE_Z_INDEX_OFFSET,
       layers: []
     },
-    'MAGE': {
+    'mage': {
       offset: MapComponent.MAGE_PANE_Z_INDEX_OFFSET,
       layers: []
     },
diff --git a/web-app/src/app/map/map.service.ts b/web-app/src/app/map/map.service.ts
index 7fc9f5b47..ce8b94e3d 100644
--- a/web-app/src/app/map/map.service.ts
+++ b/web-app/src/app/map/map.service.ts
@@ -37,7 +37,7 @@ export class MapService {
     const observationLayer = {
       id: 'observations',
       name: 'Observations',
-      group: 'MAGE',
+      group: 'mage',
       type: 'geojson',
       featureIdToLayer: {},
       options: {
@@ -64,7 +64,7 @@ export class MapService {
     const peopleLayer = {
       id: 'people',
       name: 'People',
-      group: 'MAGE',
+      group: 'mage',
       type: 'geojson',
       options: {
         selected: true,
diff --git a/web-app/src/app/navigation/navigation.component.html b/web-app/src/app/navigation/navigation.component.html
index 0a2e6bbd2..fa42c83c1 100644
--- a/web-app/src/app/navigation/navigation.component.html
+++ b/web-app/src/app/navigation/navigation.component.html
@@ -9,7 +9,7 @@
         <mat-icon>menu</mat-icon>
       </button>
 
-      <span class="title">MAGE</span>
+      <span class="title">Mage</span>
     </div>
 
     <div>
diff --git a/web-app/src/app/navigation/navigation.component.ts b/web-app/src/app/navigation/navigation.component.ts
index 210f8dac4..3e1a95c02 100644
--- a/web-app/src/app/navigation/navigation.component.ts
+++ b/web-app/src/app/navigation/navigation.component.ts
@@ -41,7 +41,7 @@ export class NavigationComponent implements OnInit, OnDestroy {
         this.filterService.setFilter({ event: recentEvent });
         this.pollingService.setPollingInterval(this.pollingService.getPollingInterval());
       } else if (events.length > 0) {
-        // TODO 'welcome to MAGE dialog'
+        // TODO 'welcome to Mage dialog'
         this.filterService.setFilter({ event: events[0] });
         this.pollingService.setPollingInterval(this.pollingService.getPollingInterval());
       } else {