diff --git a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
index 236ffdb161..1d309d4e12 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList.tsx
@@ -2,7 +2,7 @@
 import { Flex } from '@invoke-ai/ui-library';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import { ControlAdapterList } from 'features/controlLayers/components/ControlAdapter/ControlAdapterList';
-import { IM } from 'features/controlLayers/components/InpaintMask/IM';
+import { InpaintMask } from 'features/controlLayers/components/InpaintMask/InpaintMask';
 import { IPAEntityList } from 'features/controlLayers/components/IPAdapter/IPAEntityList';
 import { LayerEntityList } from 'features/controlLayers/components/Layer/LayerEntityList';
 import { RGEntityList } from 'features/controlLayers/components/RegionalGuidance/RGEntityList';
@@ -12,7 +12,7 @@ export const CanvasEntityList = memo(() => {
   return (
     <ScrollableContent>
       <Flex flexDir="column" gap={2} data-testid="control-layers-layer-list">
-        <IM />
+        <InpaintMask />
         <RGEntityList />
         <ControlAdapterList />
         <IPAEntityList />
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IM.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx
similarity index 71%
rename from invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IM.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx
index 0193cfa3c9..be9ebbfd67 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IM.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx
@@ -3,15 +3,15 @@ import { CanvasEntityContainer } from 'features/controlLayers/components/common/
 import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
 import { CanvasEntityTitle } from 'features/controlLayers/components/common/CanvasEntityTitle';
-import { IMActionsMenu } from 'features/controlLayers/components/InpaintMask/IMActionsMenu';
-import { IMSettings } from 'features/controlLayers/components/InpaintMask/IMSettings';
+import { InpaintMaskActionsMenu } from 'features/controlLayers/components/InpaintMask/InpaintMaskActionsMenu';
+import { InpaintMaskSettings } from 'features/controlLayers/components/InpaintMask/InpaintMaskSettings';
 import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
 import { memo, useMemo } from 'react';
 
-import { IMMaskFillColorPicker } from './IMMaskFillColorPicker';
+import { InpaintMaskMaskFillColorPicker } from './InpaintMaskMaskFillColorPicker';
 
-export const IM = memo(() => {
+export const InpaintMask = memo(() => {
   const entityIdentifier = useMemo<CanvasEntityIdentifier>(() => ({ id: 'inpaint_mask', type: 'inpaint_mask' }), []);
   const { isOpen, onToggle } = useDisclosure({ defaultIsOpen: false });
   return (
@@ -21,13 +21,13 @@ export const IM = memo(() => {
           <CanvasEntityEnabledToggle />
           <CanvasEntityTitle />
           <Spacer />
-          <IMMaskFillColorPicker />
-          <IMActionsMenu />
+          <InpaintMaskMaskFillColorPicker />
+          <InpaintMaskActionsMenu />
         </CanvasEntityHeader>
-        {isOpen && <IMSettings />}
+        {isOpen && <InpaintMaskSettings />}
       </CanvasEntityContainer>
     </EntityIdentifierContext.Provider>
   );
 });
 
-IM.displayName = 'IM';
+InpaintMask.displayName = 'InpaintMask';
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMActionsMenu.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskActionsMenu.tsx
similarity index 80%
rename from invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMActionsMenu.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskActionsMenu.tsx
index a7cfc75eb2..5ce4024195 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMActionsMenu.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskActionsMenu.tsx
@@ -3,7 +3,7 @@ import { CanvasEntityActionMenuItems } from 'features/controlLayers/components/c
 import { CanvasEntityMenuButton } from 'features/controlLayers/components/common/CanvasEntityMenuButton';
 import { memo } from 'react';
 
-export const IMActionsMenu = memo(() => {
+export const InpaintMaskActionsMenu = memo(() => {
   return (
     <Menu>
       <CanvasEntityMenuButton />
@@ -14,4 +14,4 @@ export const IMActionsMenu = memo(() => {
   );
 });
 
-IMActionsMenu.displayName = 'IMActionsMenu';
+InpaintMaskActionsMenu.displayName = 'InpaintMaskActionsMenu';
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMMaskFillColorPicker.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMaskFillColorPicker.tsx
similarity index 91%
rename from invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMMaskFillColorPicker.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMaskFillColorPicker.tsx
index 144012143d..891b38a418 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMMaskFillColorPicker.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMaskFillColorPicker.tsx
@@ -8,7 +8,7 @@ import { memo, useCallback } from 'react';
 import type { RgbColor } from 'react-colorful';
 import { useTranslation } from 'react-i18next';
 
-export const IMMaskFillColorPicker = memo(() => {
+export const InpaintMaskMaskFillColorPicker = memo(() => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const fill = useAppSelector((s) => s.canvasV2.inpaintMask.fill);
@@ -43,4 +43,4 @@ export const IMMaskFillColorPicker = memo(() => {
   );
 });
 
-IMMaskFillColorPicker.displayName = 'IMMaskFillColorPicker';
+InpaintMaskMaskFillColorPicker.displayName = 'InpaintMaskMaskFillColorPicker';
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMSettings.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskSettings.tsx
similarity index 66%
rename from invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMSettings.tsx
rename to invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskSettings.tsx
index 3c1b7296d9..d7719694a8 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/IMSettings.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskSettings.tsx
@@ -1,8 +1,8 @@
 import { CanvasEntitySettings } from 'features/controlLayers/components/common/CanvasEntitySettings';
 import { memo } from 'react';
 
-export const IMSettings = memo(() => {
+export const InpaintMaskSettings = memo(() => {
   return <CanvasEntitySettings>PLACEHOLDER</CanvasEntitySettings>;
 });
 
-IMSettings.displayName = 'IMSettings';
+InpaintMaskSettings.displayName = 'InpaintMaskSettings';