diff --git a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
index 4b00efeee568..56cfb47d53ab 100644
--- a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
@@ -22,7 +22,7 @@ export const EditableEntityName = (props: EditableEntityNameProps) => {
     isFixedWidth,
     isLoading,
     name,
-    normalizeName = false,
+    normalizeName = true,
     onExitEditing,
     onNameSave,
     showEllipsis = false,
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
index 5d8abdcb23eb..fbfbda204126 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
@@ -15,7 +15,7 @@ import * as Styled from "./EntityContextMenu.styles";
 
 interface Props {
   dataTestId?: string;
-  children?: React.ReactNode[] | React.ReactNode;
+  children: React.ReactNode[] | React.ReactNode;
   tooltipContent?: React.ReactNode;
 }
 
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
index f917db4cdafe..2fe21fc7f524 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
@@ -17,7 +17,7 @@ export const EntityItem = (props: EntityItemProps) => {
     canEdit,
     isEditing,
     isLoading,
-    normalizeName = false,
+    normalizeName = true,
     onEditComplete,
     onNameSave,
     validateName,
diff --git a/app/client/src/IDE/Components/EntityContextMenu.tsx b/app/client/src/IDE/Components/EntityContextMenu.tsx
deleted file mode 100644
index afe349768134..000000000000
--- a/app/client/src/IDE/Components/EntityContextMenu.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from "react";
-import { Button, Menu, MenuContent, MenuTrigger, Tooltip } from "@appsmith/ads";
-import { useToggle } from "@mantine/hooks";
-import {
-  createMessage,
-  ENTITY_MORE_ACTIONS_TOOLTIP,
-} from "ee/constants/messages";
-import { EntityClassNames } from "pages/Editor/Explorer/Entity";
-
-interface Props {
-  children: React.ReactNode[] | React.ReactNode;
-  dataTestId?: string;
-}
-
-const EntityContextMenu = (props: Props) => {
-  const [isMenuOpen, toggleMenuOpen] = useToggle([false, true]);
-
-  return (
-    <Menu onOpenChange={toggleMenuOpen} open={isMenuOpen}>
-      <MenuTrigger className="t--context-menu">
-        <div className="relative">
-          <Tooltip
-            content={createMessage(ENTITY_MORE_ACTIONS_TOOLTIP)}
-            isDisabled={isMenuOpen}
-            mouseLeaveDelay={0}
-            placement="right"
-          >
-            <Button
-              className={EntityClassNames.CONTEXT_MENU}
-              data-testid={props.dataTestId}
-              isIconButton
-              kind="tertiary"
-              startIcon="more-2-fill"
-            />
-          </Tooltip>
-        </div>
-      </MenuTrigger>
-      <MenuContent
-        align="start"
-        className={`t--entity-context-menu ${EntityClassNames.CONTEXT_MENU_CONTENT}`}
-        side="right"
-        style={{ maxHeight: "unset" }}
-        width="220px"
-      >
-        {props.children}
-      </MenuContent>
-    </Menu>
-  );
-};
-
-export default EntityContextMenu;