diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f102fb5..935e7ecd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -126,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#154](https://github.com/alleslabs/celatone-frontend/pull/154) Stay on the same contract list page after renaming the list
 - [#155](https://github.com/alleslabs/celatone-frontend/pull/155) Fix uncontrolled input error and fix space bar issue in editable cell
 - [#156](https://github.com/alleslabs/celatone-frontend/pull/156) Fix json editor cannot focus by clicking on empty area
 - [#166](https://github.com/alleslabs/celatone-frontend/pull/166) Change default list when editing contract information
diff --git a/src/lib/app-provider/hooks/useInternalNavigate.ts b/src/lib/app-provider/hooks/useInternalNavigate.ts
index 00b5d0c3f..9cf2a561e 100644
--- a/src/lib/app-provider/hooks/useInternalNavigate.ts
+++ b/src/lib/app-provider/hooks/useInternalNavigate.ts
@@ -7,14 +7,21 @@ interface NavigationArgs {
   pathname: string;
   query?: ParsedUrlQueryInput;
   options?: Parameters<Pick<Router, "push">["push"]>[2];
+  replace?: boolean;
 }
 
 export const useInternalNavigate = () => {
   const router = useRouter();
 
   return useCallback(
-    ({ pathname, query = {}, options = {} }: NavigationArgs) => {
-      router.push(
+    ({
+      pathname,
+      query = {},
+      options = {},
+      replace = false,
+    }: NavigationArgs) => {
+      const routerFn = replace ? router.replace : router.push;
+      routerFn(
         {
           pathname: `/[network]${pathname}`,
           /**
diff --git a/src/lib/components/ContractSelectSection.tsx b/src/lib/components/ContractSelectSection.tsx
index 40bdc8751..70d8aece2 100644
--- a/src/lib/components/ContractSelectSection.tsx
+++ b/src/lib/components/ContractSelectSection.tsx
@@ -12,7 +12,7 @@ import type { ContractLocalInfo } from "lib/stores/contract";
 import type { ContractAddr, Option } from "lib/types";
 
 import { ExplorerLink } from "./ExplorerLink";
-import { EditContractDetails, SaveContractDetails } from "./modal";
+import { EditContractDetailsModal, SaveContractDetailsModal } from "./modal";
 import {
   SelectContractAdmin,
   SelectContractInstantiator,
@@ -68,7 +68,7 @@ const ContractDetailsButton = ({
 }: ContractDetailsButtonProps) => {
   const isExist = !!contractLocalInfo?.lists;
   return isExist ? (
-    <EditContractDetails
+    <EditContractDetailsModal
       contractLocalInfo={contractLocalInfo}
       triggerElement={
         <Button
@@ -81,7 +81,7 @@ const ContractDetailsButton = ({
       }
     />
   ) : (
-    <SaveContractDetails
+    <SaveContractDetailsModal
       contractLocalInfo={{
         contractAddress,
         instantiator,
diff --git a/src/lib/components/button/AdminButton.tsx b/src/lib/components/button/AdminButton.tsx
index fb2cc0271..16518ac68 100644
--- a/src/lib/components/button/AdminButton.tsx
+++ b/src/lib/components/button/AdminButton.tsx
@@ -16,7 +16,7 @@ import {
   MdReadMore,
 } from "react-icons/md";
 
-import { ClearAdminContract } from "../modal/contract/ClearAdminContract";
+import { ClearAdminModal } from "../modal/contract/ClearAdmin";
 import { useInternalNavigate } from "lib/app-provider";
 import type { ContractAddr, HumanAddr, Option } from "lib/types";
 
@@ -86,7 +86,7 @@ export const AdminButton = ({ contractAddress, admin }: AdminButtonProps) => {
         >
           Update Admin
         </StyledMenuItem>
-        <ClearAdminContract
+        <ClearAdminModal
           contractAddress={contractAddress}
           triggerElement={
             <StyledMenuItem
diff --git a/src/lib/components/forms/ListSelection.tsx b/src/lib/components/forms/ListSelection.tsx
index 9d5ea5838..0de9ce4bc 100644
--- a/src/lib/components/forms/ListSelection.tsx
+++ b/src/lib/components/forms/ListSelection.tsx
@@ -18,7 +18,7 @@ import type { CSSProperties } from "react";
 import { useState, useRef, forwardRef } from "react";
 import { MdCheck, MdClose, MdAdd } from "react-icons/md";
 
-import { CreateNewList } from "lib/components/modal/list";
+import { CreateNewListModal } from "lib/components/modal/list";
 import { useContractStore, useUserKey } from "lib/hooks";
 import type { LVPair } from "lib/types";
 import { formatSlugName, mergeRefs } from "lib/utils";
@@ -235,7 +235,7 @@ export const ListSelection = forwardRef<HTMLInputElement, ListSelectionProps>(
               ))}
               {/* creation section */}
               {canCreateOption && (
-                <CreateNewList
+                <CreateNewListModal
                   trigger={
                     <ListItem
                       w="full"
diff --git a/src/lib/components/modal/code/CodeDetailsTemplate.tsx b/src/lib/components/modal/code/CodeDetailsTemplate.tsx
index 1228945e1..c2901b692 100644
--- a/src/lib/components/modal/code/CodeDetailsTemplate.tsx
+++ b/src/lib/components/modal/code/CodeDetailsTemplate.tsx
@@ -9,7 +9,7 @@ import { MAX_CODE_DESCRIPTION_LENGTH } from "lib/data";
 import { useCodeStore, useGetAddressType } from "lib/hooks";
 import type { CodeLocalInfo } from "lib/stores/code";
 
-interface CodeDetailsTemplateProps {
+interface CodeDetailsTemplateModalProps {
   title: string;
   helperText?: string;
   mainBtnTitle: string;
@@ -18,14 +18,14 @@ interface CodeDetailsTemplateProps {
   triggerElement: JSX.Element;
 }
 
-export const CodeDetailsTemplate = ({
+export const CodeDetailsTemplateModal = ({
   title,
   helperText,
   mainBtnTitle,
   isNewCode,
   codeLocalInfo,
   triggerElement,
-}: CodeDetailsTemplateProps) => {
+}: CodeDetailsTemplateModalProps) => {
   const { saveNewCode, updateCodeInfo } = useCodeStore();
   const toast = useToast();
   const getAddressType = useGetAddressType();
diff --git a/src/lib/components/modal/code/EditCodeDetails.tsx b/src/lib/components/modal/code/EditCodeDetails.tsx
index 40f821f8a..2c45f3841 100644
--- a/src/lib/components/modal/code/EditCodeDetails.tsx
+++ b/src/lib/components/modal/code/EditCodeDetails.tsx
@@ -1,16 +1,16 @@
 import type { CodeLocalInfo } from "lib/stores/code";
 
-import { CodeDetailsTemplate } from "./CodeDetailsTemplate";
+import { CodeDetailsTemplateModal } from "./CodeDetailsTemplate";
 
-interface EditCodeDetailsProps {
+interface EditCodeDetailsModalProps {
   codeLocalInfo: CodeLocalInfo;
   triggerElement: JSX.Element;
 }
-export const EditCodeDetails = ({
+export const EditCodeDetailsModal = ({
   codeLocalInfo,
   triggerElement,
-}: EditCodeDetailsProps) => (
-  <CodeDetailsTemplate
+}: EditCodeDetailsModalProps) => (
+  <CodeDetailsTemplateModal
     title="Edit Code Description"
     mainBtnTitle="Save"
     isNewCode={false}
diff --git a/src/lib/components/modal/code/RemoveCode.tsx b/src/lib/components/modal/code/RemoveCode.tsx
index 256db8869..1e5094dae 100644
--- a/src/lib/components/modal/code/RemoveCode.tsx
+++ b/src/lib/components/modal/code/RemoveCode.tsx
@@ -21,7 +21,7 @@ interface RemoveCodeModalProps {
   trigger?: JSX.Element;
 }
 
-export function RemoveCode({
+export function RemoveCodeModal({
   codeId,
   description,
   trigger = (
diff --git a/src/lib/components/modal/code/SaveCodeDetails.tsx b/src/lib/components/modal/code/SaveCodeDetails.tsx
index f99406054..a44123033 100644
--- a/src/lib/components/modal/code/SaveCodeDetails.tsx
+++ b/src/lib/components/modal/code/SaveCodeDetails.tsx
@@ -1,16 +1,16 @@
 import type { CodeLocalInfo } from "lib/stores/code";
 
-import { CodeDetailsTemplate } from "./CodeDetailsTemplate";
+import { CodeDetailsTemplateModal } from "./CodeDetailsTemplate";
 
-interface SaveCodeDetailsProps {
+interface SaveCodeDetailsModalProps {
   codeLocalInfo: CodeLocalInfo;
   triggerElement: JSX.Element;
 }
-export const SaveCodeDetails = ({
+export const SaveCodeDetailsModal = ({
   codeLocalInfo,
   triggerElement,
-}: SaveCodeDetailsProps) => (
-  <CodeDetailsTemplate
+}: SaveCodeDetailsModalProps) => (
+  <CodeDetailsTemplateModal
     title="Save New Code"
     helperText={`Save other stored codes to your "Saved Codes" list`}
     mainBtnTitle="Save New Code"
diff --git a/src/lib/components/modal/code/SaveNewCode.tsx b/src/lib/components/modal/code/SaveNewCode.tsx
index 8a1fddc25..7eae87239 100644
--- a/src/lib/components/modal/code/SaveNewCode.tsx
+++ b/src/lib/components/modal/code/SaveNewCode.tsx
@@ -15,11 +15,11 @@ import { useCodeStore, useLCDEndpoint } from "lib/hooks";
 import { getCodeIdInfo } from "lib/services/code";
 import { getDescriptionDefault } from "lib/utils";
 
-interface ModalProps {
+interface SaveNewCodeModalProps {
   buttonProps: ButtonProps;
 }
 
-export function SaveNewCodeModal({ buttonProps }: ModalProps) {
+export function SaveNewCodeModal({ buttonProps }: SaveNewCodeModalProps) {
   /* STATE */
   const [codeId, setCodeId] = useState("");
   const [codeIdStatus, setCodeIdStatus] = useState<FormStatus>({
diff --git a/src/lib/components/modal/code/SaveOrEditCode.tsx b/src/lib/components/modal/code/SaveOrEditCode.tsx
index 589e337ec..3563485d3 100644
--- a/src/lib/components/modal/code/SaveOrEditCode.tsx
+++ b/src/lib/components/modal/code/SaveOrEditCode.tsx
@@ -4,8 +4,8 @@ import { MdBookmark, MdMode } from "react-icons/md";
 
 import type { CodeLocalInfo } from "lib/stores/code";
 
-import { EditCodeDetails } from "./EditCodeDetails";
-import { SaveCodeDetails } from "./SaveCodeDetails";
+import { EditCodeDetailsModal } from "./EditCodeDetails";
+import { SaveCodeDetailsModal } from "./SaveCodeDetails";
 
 interface SaveOrEditCodeModalProps {
   mode: "save" | "edit";
@@ -21,7 +21,7 @@ const StyledIcon = chakra(Icon, {
 export const SaveOrEditCodeModal = observer(
   ({ mode, codeLocalInfo }: SaveOrEditCodeModalProps) => {
     return mode === "save" ? (
-      <SaveCodeDetails
+      <SaveCodeDetailsModal
         codeLocalInfo={codeLocalInfo}
         triggerElement={
           <Button
@@ -33,7 +33,7 @@ export const SaveOrEditCodeModal = observer(
         }
       />
     ) : (
-      <EditCodeDetails
+      <EditCodeDetailsModal
         codeLocalInfo={codeLocalInfo}
         triggerElement={
           <Button variant="ghost-gray" leftIcon={<StyledIcon as={MdMode} />}>
diff --git a/src/lib/components/modal/code/SaveOrRemoveCode.tsx b/src/lib/components/modal/code/SaveOrRemoveCode.tsx
index f33566294..2fe7866e3 100644
--- a/src/lib/components/modal/code/SaveOrRemoveCode.tsx
+++ b/src/lib/components/modal/code/SaveOrRemoveCode.tsx
@@ -3,8 +3,8 @@ import { MdBookmark, MdBookmarkBorder } from "react-icons/md";
 
 import type { CodeInfo } from "lib/types";
 
-import { RemoveCode } from "./RemoveCode";
-import { SaveCodeDetails } from "./SaveCodeDetails";
+import { RemoveCodeModal } from "./RemoveCode";
+import { SaveCodeDetailsModal } from "./SaveCodeDetails";
 
 const StyledIconButton = chakra(IconButton, {
   baseStyle: {
@@ -19,9 +19,11 @@ interface SaveOrRemoveCodeModalProps {
   codeInfo: CodeInfo;
 }
 
-export function SaveOrRemoveCode({ codeInfo }: SaveOrRemoveCodeModalProps) {
+export function SaveOrRemoveCodeModal({
+  codeInfo,
+}: SaveOrRemoveCodeModalProps) {
   return codeInfo.isSaved ? (
-    <RemoveCode
+    <RemoveCodeModal
       codeId={codeInfo.id}
       description={codeInfo.description}
       trigger={
@@ -33,7 +35,7 @@ export function SaveOrRemoveCode({ codeInfo }: SaveOrRemoveCodeModalProps) {
       }
     />
   ) : (
-    <SaveCodeDetails
+    <SaveCodeDetailsModal
       codeLocalInfo={codeInfo}
       triggerElement={
         <StyledIconButton
diff --git a/src/lib/components/modal/contract/AddToOtherList.tsx b/src/lib/components/modal/contract/AddToOtherList.tsx
index 11ea45f3a..1afcca194 100644
--- a/src/lib/components/modal/contract/AddToOtherList.tsx
+++ b/src/lib/components/modal/contract/AddToOtherList.tsx
@@ -10,13 +10,13 @@ import { useHandleContractSave } from "lib/hooks/useHandleSave";
 import type { ContractLocalInfo } from "lib/stores/contract";
 import type { LVPair } from "lib/types";
 
-interface AddToOtherListProps {
+interface AddToOtherListModalProps {
   contractLocalInfo: ContractLocalInfo;
   triggerElement: JSX.Element;
 }
 
-export const AddToOtherList = observer(
-  ({ contractLocalInfo, triggerElement }: AddToOtherListProps) => {
+export const AddToOtherListModal = observer(
+  ({ contractLocalInfo, triggerElement }: AddToOtherListModalProps) => {
     const [contractLists, setContractLists] = useState<LVPair[]>([]);
 
     const handleSave = useHandleContractSave({
diff --git a/src/lib/components/modal/contract/ClearAdminContract.tsx b/src/lib/components/modal/contract/ClearAdmin.tsx
similarity index 92%
rename from src/lib/components/modal/contract/ClearAdminContract.tsx
rename to src/lib/components/modal/contract/ClearAdmin.tsx
index feb7b080d..9b85a89c1 100644
--- a/src/lib/components/modal/contract/ClearAdminContract.tsx
+++ b/src/lib/components/modal/contract/ClearAdmin.tsx
@@ -7,15 +7,15 @@ import { useClearAdminTx } from "lib/app-provider";
 import { useTxBroadcast } from "lib/providers/tx-broadcast";
 import type { ContractAddr } from "lib/types";
 
-interface ClearAdminContractProps {
+interface ClearAdminModalProps {
   contractAddress: ContractAddr;
   triggerElement: JSX.Element;
 }
 
-export const ClearAdminContract = ({
+export const ClearAdminModal = ({
   contractAddress,
   triggerElement,
-}: ClearAdminContractProps) => {
+}: ClearAdminModalProps) => {
   const { broadcast } = useTxBroadcast();
   const clearAdminTx = useClearAdminTx(contractAddress);
 
diff --git a/src/lib/components/modal/contract/ContractDetailsTemplate.tsx b/src/lib/components/modal/contract/ContractDetailsTemplate.tsx
index 9d03d15dd..cd7da62b6 100644
--- a/src/lib/components/modal/contract/ContractDetailsTemplate.tsx
+++ b/src/lib/components/modal/contract/ContractDetailsTemplate.tsx
@@ -11,20 +11,20 @@ import type { ContractLocalInfo } from "lib/stores/contract";
 import type { LVPair } from "lib/types";
 import { getDescriptionDefault, getTagsDefault } from "lib/utils";
 
-interface ContractDetailsTemplateProps {
+interface ContractDetailsTemplateModalProps {
   title: string;
   subtitle?: string;
   contractLocalInfo: ContractLocalInfo;
   triggerElement: JSX.Element;
   defaultList?: LVPair[];
 }
-export const ContractDetailsTemplate = ({
+export const ContractDetailsTemplateModal = ({
   title,
   subtitle,
   contractLocalInfo,
   triggerElement,
   defaultList = [],
-}: ContractDetailsTemplateProps) => {
+}: ContractDetailsTemplateModalProps) => {
   const defaultValues = useMemo(() => {
     return {
       name: contractLocalInfo.name ?? "",
diff --git a/src/lib/components/modal/contract/EditContractDetails.tsx b/src/lib/components/modal/contract/EditContractDetails.tsx
index 4a2cdf426..bda05ad5d 100644
--- a/src/lib/components/modal/contract/EditContractDetails.tsx
+++ b/src/lib/components/modal/contract/EditContractDetails.tsx
@@ -1,16 +1,16 @@
 import type { ContractLocalInfo } from "lib/stores/contract";
 
-import { ContractDetailsTemplate } from "./ContractDetailsTemplate";
+import { ContractDetailsTemplateModal } from "./ContractDetailsTemplate";
 
-interface EditContractDetailsProps {
+interface EditContractDetailsModalProps {
   contractLocalInfo: ContractLocalInfo;
   triggerElement: JSX.Element;
 }
-export const EditContractDetails = ({
+export const EditContractDetailsModal = ({
   contractLocalInfo,
   triggerElement,
-}: EditContractDetailsProps) => (
-  <ContractDetailsTemplate
+}: EditContractDetailsModalProps) => (
+  <ContractDetailsTemplateModal
     title="Edit Contract Details"
     subtitle="Filled information below will be saved on Celatone only and able to edit later."
     contractLocalInfo={contractLocalInfo}
diff --git a/src/lib/components/modal/contract/RemoveContract.tsx b/src/lib/components/modal/contract/RemoveContract.tsx
index f509fc892..42a681ae8 100644
--- a/src/lib/components/modal/contract/RemoveContract.tsx
+++ b/src/lib/components/modal/contract/RemoveContract.tsx
@@ -8,17 +8,17 @@ import type { ContractLocalInfo } from "lib/stores/contract";
 import type { LVPair } from "lib/types";
 import { truncate } from "lib/utils";
 
-interface ModalProps {
+interface RemoveContractModalProps {
   contractLocalInfo: ContractLocalInfo;
   contractRemovalInfo: LVPair;
   menuItemProps: MenuItemProps;
 }
 
-export function RemoveContract({
+export function RemoveContractModal({
   contractLocalInfo,
   contractRemovalInfo,
   menuItemProps,
-}: ModalProps) {
+}: RemoveContractModalProps) {
   const displayName = contractLocalInfo.name
     ? contractLocalInfo.name
     : truncate(contractLocalInfo.contractAddress);
diff --git a/src/lib/components/modal/contract/SaveContractDetails.tsx b/src/lib/components/modal/contract/SaveContractDetails.tsx
index 445e042a3..132eb481f 100644
--- a/src/lib/components/modal/contract/SaveContractDetails.tsx
+++ b/src/lib/components/modal/contract/SaveContractDetails.tsx
@@ -1,17 +1,17 @@
 import { DEFAULT_LIST } from "lib/data";
 import type { ContractLocalInfo } from "lib/stores/contract";
 
-import { ContractDetailsTemplate } from "./ContractDetailsTemplate";
+import { ContractDetailsTemplateModal } from "./ContractDetailsTemplate";
 
 interface SaveContractDetailsProps {
   contractLocalInfo: ContractLocalInfo;
   triggerElement: JSX.Element;
 }
-export const SaveContractDetails = ({
+export const SaveContractDetailsModal = ({
   contractLocalInfo,
   triggerElement,
 }: SaveContractDetailsProps) => (
-  <ContractDetailsTemplate
+  <ContractDetailsTemplateModal
     title="Save Contract Details"
     contractLocalInfo={contractLocalInfo}
     triggerElement={triggerElement}
diff --git a/src/lib/components/modal/contract/SaveNewContract.tsx b/src/lib/components/modal/contract/SaveNewContract.tsx
index acb6861a7..1011ba9ed 100644
--- a/src/lib/components/modal/contract/SaveNewContract.tsx
+++ b/src/lib/components/modal/contract/SaveNewContract.tsx
@@ -33,11 +33,14 @@ interface SaveNewContractDetail extends OffchainDetail {
   label: string;
 }
 
-interface SaveNewContractProps {
+interface SaveNewContractModalProps {
   list: LVPair;
   buttonProps: ButtonProps;
 }
-export function SaveNewContract({ list, buttonProps }: SaveNewContractProps) {
+export function SaveNewContractModal({
+  list,
+  buttonProps,
+}: SaveNewContractModalProps) {
   const endpoint = useLCDEndpoint();
   const { indexerGraphClient } = useCelatoneApp();
   const { getContractLocalInfo } = useContractStore();
diff --git a/src/lib/components/modal/list/CreateNewList.tsx b/src/lib/components/modal/list/CreateNewList.tsx
index 21332916e..c659d513a 100644
--- a/src/lib/components/modal/list/CreateNewList.tsx
+++ b/src/lib/components/modal/list/CreateNewList.tsx
@@ -11,7 +11,7 @@ import { getMaxListNameLengthError, MAX_LIST_NAME_LENGTH } from "lib/data";
 import { useContractStore, useUserKey } from "lib/hooks";
 import { shortenName } from "lib/utils";
 
-interface CreateNewListProps {
+interface CreateNewListModalProps {
   buttonProps?: ButtonProps;
   trigger?: ReactNode;
   onCreate?: (listName: string) => void;
@@ -19,13 +19,13 @@ interface CreateNewListProps {
   inputValue?: string;
 }
 
-export function CreateNewList({
+export function CreateNewListModal({
   buttonProps,
   trigger,
   inputValue,
   onCreate,
   onClose,
-}: CreateNewListProps) {
+}: CreateNewListModalProps) {
   const userKey = useUserKey();
   const { createNewList, isContractListExist } = useContractStore();
 
diff --git a/src/lib/components/modal/list/EditListName.tsx b/src/lib/components/modal/list/EditListName.tsx
index 8bfef2bc0..bb1e93334 100644
--- a/src/lib/components/modal/list/EditListName.tsx
+++ b/src/lib/components/modal/list/EditListName.tsx
@@ -3,6 +3,7 @@ import { MenuItem, useToast, Icon } from "@chakra-ui/react";
 import { useEffect, useState } from "react";
 import { MdAddCircleOutline, MdCheckCircle } from "react-icons/md";
 
+import { useInternalNavigate } from "lib/app-provider";
 import type { FormStatus } from "lib/components/forms";
 import { TextInput } from "lib/components/forms/TextInput";
 import { ActionModal } from "lib/components/modal/ActionModal";
@@ -11,13 +12,19 @@ import { useContractStore, useUserKey } from "lib/hooks";
 import type { LVPair } from "lib/types";
 import { formatSlugName, shortenName } from "lib/utils";
 
-interface ModalProps {
+interface EditListNameModalProps {
   list: LVPair;
   menuItemProps: MenuItemProps;
+  reroute?: boolean;
 }
-export function EditList({ list, menuItemProps }: ModalProps) {
+export function EditListNameModal({
+  list,
+  menuItemProps,
+  reroute = false,
+}: EditListNameModalProps) {
   const userKey = useUserKey();
   const { renameList, isContractListExist } = useContractStore();
+  const navigate = useInternalNavigate();
 
   const [listName, setListName] = useState<string>(list.label);
   const [status, setStatus] = useState<FormStatus>({ state: "init" });
@@ -69,7 +76,14 @@ export function EditList({ list, menuItemProps }: ModalProps) {
       icon={MdAddCircleOutline}
       trigger={<MenuItem {...menuItemProps} />}
       mainBtnTitle="Save"
-      mainAction={handleSave}
+      mainAction={() => {
+        handleSave();
+        if (reroute)
+          navigate({
+            pathname: `/contract-list/${formatSlugName(listName)}`,
+            replace: true,
+          });
+      }}
       disabledMain={status.state !== "success"}
       otherAction={() => setListName(list.label)}
     >
diff --git a/src/lib/components/modal/list/RemoveList.tsx b/src/lib/components/modal/list/RemoveList.tsx
index 16e5281f3..444e4b580 100644
--- a/src/lib/components/modal/list/RemoveList.tsx
+++ b/src/lib/components/modal/list/RemoveList.tsx
@@ -8,12 +8,12 @@ import { useContractStore, useUserKey } from "lib/hooks";
 import type { LVPair } from "lib/types";
 import { shortenName } from "lib/utils";
 
-interface ModalProps {
+interface RemoveListModalProps {
   list: LVPair;
   menuItemProps: MenuItemProps;
 }
 
-export function RemoveList({ list, menuItemProps }: ModalProps) {
+export function RemoveListModal({ list, menuItemProps }: RemoveListModalProps) {
   const userKey = useUserKey();
   const { removeList } = useContractStore();
 
diff --git a/src/lib/components/modal/select-contract/ContractListCard.tsx b/src/lib/components/modal/select-contract/ContractListCard.tsx
index a18ab4c2b..c4c28bd0d 100644
--- a/src/lib/components/modal/select-contract/ContractListCard.tsx
+++ b/src/lib/components/modal/select-contract/ContractListCard.tsx
@@ -14,7 +14,7 @@ import {
 } from "@chakra-ui/react";
 import { MdMoreHoriz, MdMode, MdDelete } from "react-icons/md";
 
-import { EditList, RemoveList } from "../list";
+import { EditListNameModal, RemoveListModal } from "../list";
 import { getListIcon, INSTANTIATED_LIST_NAME } from "lib/data";
 import type { ContractListInfo } from "lib/stores/contract";
 import { dateFromNow, formatSlugName } from "lib/utils";
@@ -94,14 +94,14 @@ export const ContractListCard = ({
               <MdMoreHoriz />
             </MenuButton>
             <MenuList>
-              <EditList
+              <EditListNameModal
                 list={{ label: item.name, value: item.slug }}
                 menuItemProps={{
                   icon: <StyledIcon as={MdMode} color="pebble.600" />,
                   children: "Edit list name",
                 }}
               />
-              <RemoveList
+              <RemoveListModal
                 list={{ label: item.name, value: item.slug }}
                 menuItemProps={{
                   icon: <StyledIcon as={MdDelete} color="error.light" />,
diff --git a/src/lib/components/state/ZeroState.tsx b/src/lib/components/state/ZeroState.tsx
index f6e1e6044..92ec5f80f 100644
--- a/src/lib/components/state/ZeroState.tsx
+++ b/src/lib/components/state/ZeroState.tsx
@@ -3,7 +3,7 @@ import { useWallet } from "@cosmos-kit/react";
 import { MdOutlineAdd, MdBookmarkBorder, MdSearch } from "react-icons/md";
 
 import { useInternalNavigate } from "lib/app-provider";
-import { SaveNewContract } from "lib/components/modal/contract";
+import { SaveNewContractModal } from "lib/components/modal/contract";
 import { ADMIN_SPECIAL_SLUG, INSTANTIATED_LIST_NAME } from "lib/data";
 import type { LVPair } from "lib/types";
 import { formatSlugName } from "lib/utils";
@@ -29,7 +29,7 @@ const ActionSection = ({ list, handleAction }: ActionSectionProps) =>
     <Flex alignItems="center" gap="4" color="text.dark" direction="column">
       <Flex align="center">
         Save existing contracts to the list with
-        <SaveNewContract
+        <SaveNewContractModal
           key={list.value}
           list={list}
           buttonProps={{
diff --git a/src/lib/layout/Navbar.tsx b/src/lib/layout/Navbar.tsx
index 07d63c3e9..e61859515 100644
--- a/src/lib/layout/Navbar.tsx
+++ b/src/lib/layout/Navbar.tsx
@@ -18,7 +18,7 @@ import {
 } from "react-icons/md";
 
 import { AppLink } from "lib/components/AppLink";
-import { CreateNewList } from "lib/components/modal";
+import { CreateNewListModal } from "lib/components/modal";
 import { INSTANTIATED_LIST_NAME, getListIcon, SAVED_LIST_NAME } from "lib/data";
 import { useContractStore, usePublicProjectStore } from "lib/hooks";
 import { cmpContractListInfo } from "lib/stores/contract";
@@ -180,7 +180,7 @@ const Navbar = observer(() => {
                 {item.category}
               </Text>
               {item.category === "Contracts" && (
-                <CreateNewList
+                <CreateNewListModal
                   buttonProps={{
                     variant: "ghost-info",
                     size: "xs",
diff --git a/src/lib/pages/code-details/components/CTASection.tsx b/src/lib/pages/code-details/components/CTASection.tsx
index d4e6e7b9b..ab29779f2 100644
--- a/src/lib/pages/code-details/components/CTASection.tsx
+++ b/src/lib/pages/code-details/components/CTASection.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
 import { MdCheck } from "react-icons/md";
 
 import { InstantiateButton } from "lib/components/button";
-import { RemoveCode } from "lib/components/modal/code/RemoveCode";
+import { RemoveCodeModal } from "lib/components/modal/code/RemoveCode";
 import { SaveOrEditCodeModal } from "lib/components/modal/code/SaveOrEditCode";
 import { useCodeStore } from "lib/hooks";
 import type { CodeInfo } from "lib/types";
@@ -34,7 +34,7 @@ export const CTASection = observer(
           size="md"
         />
         {isSaved ? (
-          <RemoveCode
+          <RemoveCodeModal
             codeId={id}
             description={codeInfo.description}
             trigger={
diff --git a/src/lib/pages/code-details/components/table/contracts/ContractTableRow.tsx b/src/lib/pages/code-details/components/table/contracts/ContractTableRow.tsx
index 1fc041048..d7ebd7dce 100644
--- a/src/lib/pages/code-details/components/table/contracts/ContractTableRow.tsx
+++ b/src/lib/pages/code-details/components/table/contracts/ContractTableRow.tsx
@@ -3,7 +3,10 @@ import { MdBookmark, MdBookmarkBorder } from "react-icons/md";
 
 import { useInternalNavigate } from "lib/app-provider";
 import { ExplorerLink } from "lib/components/ExplorerLink";
-import { AddToOtherList, SaveContractDetails } from "lib/components/modal";
+import {
+  AddToOtherListModal,
+  SaveContractDetailsModal,
+} from "lib/components/modal";
 import { TableRow } from "lib/components/table/tableComponents";
 import { ContractNameCell } from "lib/pages/contract-list/components/table/ContractNameCell";
 import { TagsCell } from "lib/pages/contract-list/components/table/TagsCell";
@@ -98,7 +101,7 @@ export const ContractTableRow = ({
       <TableRow>
         <Box onClick={(e) => e.stopPropagation()}>
           {contractInfo.lists ? (
-            <AddToOtherList
+            <AddToOtherListModal
               contractLocalInfo={contractInfo}
               triggerElement={
                 <StyledIconButton
@@ -109,7 +112,7 @@ export const ContractTableRow = ({
               }
             />
           ) : (
-            <SaveContractDetails
+            <SaveContractDetailsModal
               contractLocalInfo={contractInfo}
               triggerElement={
                 <StyledIconButton
diff --git a/src/lib/pages/codes/components/CodesTable.tsx b/src/lib/pages/codes/components/CodesTable.tsx
index 9133cac34..86c21610c 100644
--- a/src/lib/pages/codes/components/CodesTable.tsx
+++ b/src/lib/pages/codes/components/CodesTable.tsx
@@ -15,8 +15,8 @@ import { MdSearchOff } from "react-icons/md";
 import { useInternalNavigate } from "lib/app-provider";
 import { InstantiateButton } from "lib/components/button";
 import { ExplorerLink } from "lib/components/ExplorerLink";
-import { RemoveCode } from "lib/components/modal/code/RemoveCode";
-import { SaveOrRemoveCode } from "lib/components/modal/code/SaveOrRemoveCode";
+import { RemoveCodeModal } from "lib/components/modal/code/RemoveCode";
+import { SaveOrRemoveCodeModal } from "lib/components/modal/code/SaveOrRemoveCode";
 import { PermissionChip } from "lib/components/PermissionChip";
 import { DisconnectedState } from "lib/components/state/DisconnectedState";
 import {
@@ -179,9 +179,12 @@ const CodeTableRow = ({ code, isRemovable }: CodesRowProps) => {
               codeId={code.id}
             />
             {isRemovable ? (
-              <RemoveCode codeId={code.id} description={code.description} />
+              <RemoveCodeModal
+                codeId={code.id}
+                description={code.description}
+              />
             ) : (
-              <SaveOrRemoveCode codeInfo={code} />
+              <SaveOrRemoveCodeModal codeInfo={code} />
             )}
           </HStack>
         </Flex>
diff --git a/src/lib/pages/contract-details/components/ContractTop.tsx b/src/lib/pages/contract-details/components/ContractTop.tsx
index 237f12346..4f63f71a6 100644
--- a/src/lib/pages/contract-details/components/ContractTop.tsx
+++ b/src/lib/pages/contract-details/components/ContractTop.tsx
@@ -16,9 +16,9 @@ import { useInternalNavigate } from "lib/app-provider";
 import { AdminButton } from "lib/components/button";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import {
-  AddToOtherList,
-  EditContractDetails,
-  SaveContractDetails,
+  AddToOtherListModal,
+  EditContractDetailsModal,
+  SaveContractDetailsModal,
 } from "lib/components/modal";
 import type { ContractData } from "lib/model/contract";
 import type { ContractAddr } from "lib/types";
@@ -54,7 +54,7 @@ export const ContractTop = ({ contractData }: ContractTopProps) => {
   const renderSaveButton = () => {
     if (contractLocalInfo) {
       return (
-        <AddToOtherList
+        <AddToOtherListModal
           contractLocalInfo={contractLocalInfo}
           triggerElement={
             <IconButton
@@ -72,7 +72,7 @@ export const ContractTop = ({ contractData }: ContractTopProps) => {
     }
     if (instantiateInfo) {
       return (
-        <SaveContractDetails
+        <SaveContractDetailsModal
           contractLocalInfo={{
             contractAddress: contractAddress as ContractAddr,
             instantiator: instantiateInfo.instantiator,
@@ -166,7 +166,7 @@ export const ContractTop = ({ contractData }: ContractTopProps) => {
         </Button>
         <Flex>
           {contractLocalInfo && (
-            <EditContractDetails
+            <EditContractDetailsModal
               contractLocalInfo={contractLocalInfo}
               triggerElement={
                 <IconButton
diff --git a/src/lib/pages/contract-details/components/contract-description/UserContractDesc.tsx b/src/lib/pages/contract-details/components/contract-description/UserContractDesc.tsx
index 9b591d323..f3f2e2651 100644
--- a/src/lib/pages/contract-details/components/contract-description/UserContractDesc.tsx
+++ b/src/lib/pages/contract-details/components/contract-description/UserContractDesc.tsx
@@ -5,7 +5,7 @@ import Linkify from "react-linkify";
 import { useClampText } from "use-clamp-text";
 
 import { ShowMoreButton } from "lib/components/button";
-import { EditContractDetails } from "lib/components/modal";
+import { EditContractDetailsModal } from "lib/components/modal";
 import type { ContractData } from "lib/model/contract";
 import { textLine } from "lib/utils";
 
@@ -33,7 +33,7 @@ export const UserContractDesc = ({ contractData }: UserContractDescProps) => {
   const renderEditContractButton = () => {
     if (!contractData.instantiateInfo) return null;
     return (
-      <EditContractDetails
+      <EditContractDetailsModal
         contractLocalInfo={{
           contractAddress: contractData.instantiateInfo.contractAddress,
           instantiator: contractData.instantiateInfo.instantiator,
diff --git a/src/lib/pages/contract-list/components/ContractListTable.tsx b/src/lib/pages/contract-list/components/ContractListTable.tsx
index 8ce826def..abaf099c4 100644
--- a/src/lib/pages/contract-list/components/ContractListTable.tsx
+++ b/src/lib/pages/contract-list/components/ContractListTable.tsx
@@ -24,11 +24,11 @@ import { useInternalNavigate } from "lib/app-provider";
 import { AppLink } from "lib/components/AppLink";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import {
-  AddToOtherList,
-  EditContractDetails,
-  RemoveContract,
+  AddToOtherListModal,
+  EditContractDetailsModal,
+  RemoveContractModal,
 } from "lib/components/modal/contract";
-import { ClearAdminContract } from "lib/components/modal/contract/ClearAdminContract";
+import { ClearAdminModal } from "lib/components/modal/contract/ClearAdmin";
 import {
   TableContainer,
   TableHeaderNoBorder,
@@ -160,7 +160,7 @@ export const ContractListTable = ({
                       />
                     </MenuButton>
                     <MenuList>
-                      <EditContractDetails
+                      <EditContractDetailsModal
                         contractLocalInfo={item}
                         triggerElement={
                           <StyledMenuItem
@@ -170,7 +170,7 @@ export const ContractListTable = ({
                           </StyledMenuItem>
                         }
                       />
-                      <AddToOtherList
+                      <AddToOtherListModal
                         contractLocalInfo={item}
                         triggerElement={
                           <StyledMenuItem
@@ -197,7 +197,7 @@ export const ContractListTable = ({
                       >
                         Update Admin
                       </StyledMenuItem>
-                      <ClearAdminContract
+                      <ClearAdminModal
                         contractAddress={item.contractAddress}
                         triggerElement={
                           <StyledMenuItem
@@ -216,7 +216,7 @@ export const ContractListTable = ({
                       {!!contractRemovalInfo && (
                         <>
                           <MenuDivider />
-                          <RemoveContract
+                          <RemoveContractModal
                             contractLocalInfo={item}
                             contractRemovalInfo={contractRemovalInfo}
                             menuItemProps={{
diff --git a/src/lib/pages/contract-list/index.tsx b/src/lib/pages/contract-list/index.tsx
index e4d454e6e..798f5e323 100644
--- a/src/lib/pages/contract-list/index.tsx
+++ b/src/lib/pages/contract-list/index.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
 import { MdOutlineAdd } from "react-icons/md";
 
 import { useInternalNavigate } from "lib/app-provider";
-import { CreateNewList } from "lib/components/modal/list";
+import { CreateNewListModal } from "lib/components/modal/list";
 import { AllContractLists } from "lib/components/modal/select-contract";
 import PageContainer from "lib/components/PageContainer";
 import { useContractStore } from "lib/hooks";
@@ -25,7 +25,7 @@ const AllContractListsPage = observer(() => {
           <Heading as="h5" variant="h5">
             Contract lists
           </Heading>
-          <CreateNewList
+          <CreateNewListModal
             buttonProps={{
               variant: "outline-primary",
               rightIcon: <MdOutlineAdd />,
diff --git a/src/lib/pages/contract-list/slug.tsx b/src/lib/pages/contract-list/slug.tsx
index 3857935a3..6d811760b 100644
--- a/src/lib/pages/contract-list/slug.tsx
+++ b/src/lib/pages/contract-list/slug.tsx
@@ -26,8 +26,8 @@ import {
 
 import { useInternalNavigate } from "lib/app-provider";
 import { AppLink } from "lib/components/AppLink";
-import { SaveNewContract } from "lib/components/modal/contract";
-import { EditList, RemoveList } from "lib/components/modal/list";
+import { SaveNewContractModal } from "lib/components/modal/contract";
+import { EditListNameModal, RemoveListModal } from "lib/components/modal/list";
 import { ContractListDetail } from "lib/components/modal/select-contract";
 import { INSTANTIATED_LIST_NAME } from "lib/data";
 import { useContractStore } from "lib/hooks";
@@ -112,7 +112,7 @@ const ContractsByList = observer(() => {
                 Deploy New Contract
               </Button>
             ) : (
-              <SaveNewContract
+              <SaveNewContractModal
                 key={listSlug}
                 list={{
                   label: contractListInfo.name,
@@ -136,7 +136,7 @@ const ContractsByList = observer(() => {
                   />
                 </MenuButton>
                 <MenuList>
-                  <EditList
+                  <EditListNameModal
                     list={{
                       label: contractListInfo.name,
                       value: contractListInfo.slug,
@@ -145,8 +145,9 @@ const ContractsByList = observer(() => {
                       icon: <StyledIcon as={MdMode} color="pebble.600" />,
                       children: "Edit list name",
                     }}
+                    reroute
                   />
-                  <RemoveList
+                  <RemoveListModal
                     list={{
                       label: contractListInfo.name,
                       value: contractListInfo.slug,