diff --git a/src/components/Atoms/Address/Address.stories.tsx b/src/components/Atoms/Address/Address.stories.tsx
index 77272d57..a92546aa 100644
--- a/src/components/Atoms/Address/Address.stories.tsx
+++ b/src/components/Atoms/Address/Address.stories.tsx
@@ -1,14 +1,14 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { AddressView } from "./AddressView";
+import { Address as AddressComponent } from "./Address";
 
-const meta: Meta<typeof AddressView> = {
+const meta: Meta<typeof AddressComponent> = {
     title: "Atoms/Address",
-    component: AddressView,
+    component: AddressComponent,
 };
 
 export default meta;
 
-type Story = StoryObj<typeof AddressView>;
+type Story = StoryObj<typeof AddressComponent>;
 
 export const Address: Story = {
     args: {
diff --git a/src/components/Atoms/Address/AddressView.tsx b/src/components/Atoms/Address/Address.tsx
similarity index 90%
rename from src/components/Atoms/Address/AddressView.tsx
rename to src/components/Atoms/Address/Address.tsx
index 68f2e861..b1c3e1fc 100644
--- a/src/components/Atoms/Address/AddressView.tsx
+++ b/src/components/Atoms/Address/Address.tsx
@@ -2,7 +2,7 @@ import { copyToClipboard, truncate } from "@/utils/functions";
 import { IconWrapper } from "@/components/Shared";
 import { type AddressProps } from "@/utils/types/atoms.types";
 
-export const AddressView: React.FC<AddressProps> = ({ address }) => {
+export const Address: React.FC<AddressProps> = ({ address }) => {
     return (
         <div className="flex items-center gap-x-2">
             <p>{truncate(address)}</p>
diff --git a/src/components/Atoms/AddressAvatar/AddressAvatar.stories.tsx b/src/components/Atoms/AddressAvatar/AddressAvatar.stories.tsx
index d05e4e02..c5315a90 100644
--- a/src/components/Atoms/AddressAvatar/AddressAvatar.stories.tsx
+++ b/src/components/Atoms/AddressAvatar/AddressAvatar.stories.tsx
@@ -1,16 +1,16 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { AddressAvatarView } from "./AddressAvatarView";
+import { AddressAvatar as AddressAvatarComponent } from "./AddressAvatar";
 import { type AddressAvatarProps } from "@/utils/types/atoms.types";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 
-const meta: Meta<typeof AddressAvatarView> = {
+const meta: Meta<typeof AddressAvatarComponent> = {
     title: "Atoms/Address Avatar",
-    component: AddressAvatarView,
+    component: AddressAvatarComponent,
 };
 
 export default meta;
 
-type Story = StoryObj<typeof AddressAvatarView>;
+type Story = StoryObj<typeof AddressAvatarComponent>;
 
 export const AddressAvatar: Story = {
     args: {
@@ -22,7 +22,7 @@ export const AddressAvatar: Story = {
         return (
             <>
                 <div className="m-1">
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={size}
                         type={type}
@@ -31,27 +31,27 @@ export const AddressAvatar: Story = {
                 </div>
 
                 <div className="m-1 mt-20 flex gap-1">
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={GRK_SIZES.LARGE}
                         type={"effigy"}
                     />
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={GRK_SIZES.MEDIUM}
                         type={"wallet"}
                     />
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={GRK_SIZES.SMALL}
                         type={"effigy"}
                     />
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={GRK_SIZES.EXTRA_SMALL}
                         type={"fingerprint"}
                     />
-                    <AddressAvatarView
+                    <AddressAvatarComponent
                         address={address}
                         size={GRK_SIZES.EXTRA_EXTRA_SMALL}
                         type={"wallet"}
diff --git a/src/components/Atoms/AddressAvatar/AddressAvatarView.tsx b/src/components/Atoms/AddressAvatar/AddressAvatar.tsx
similarity index 96%
rename from src/components/Atoms/AddressAvatar/AddressAvatarView.tsx
rename to src/components/Atoms/AddressAvatar/AddressAvatar.tsx
index 8aef716e..410376cb 100644
--- a/src/components/Atoms/AddressAvatar/AddressAvatarView.tsx
+++ b/src/components/Atoms/AddressAvatar/AddressAvatar.tsx
@@ -6,7 +6,7 @@ import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
 import { type AddressAvatarProps } from "@/utils/types/atoms.types";
 import { useMemo } from "react";
 
-export const AddressAvatarView: React.FC<AddressAvatarProps> = ({
+export const AddressAvatar: React.FC<AddressAvatarProps> = ({
     address,
     type,
     size,
diff --git a/src/components/Atoms/TokenAvatar/TokenAvatar.stories.tsx b/src/components/Atoms/TokenAvatar/TokenAvatar.stories.tsx
index c79258d2..dd9c7a4a 100644
--- a/src/components/Atoms/TokenAvatar/TokenAvatar.stories.tsx
+++ b/src/components/Atoms/TokenAvatar/TokenAvatar.stories.tsx
@@ -1,15 +1,15 @@
 import { type Meta, type StoryObj } from "@storybook/react";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
-import { TokenAvatarView } from "./TokenAvatarView";
+import { TokenAvatar as TokenAvatarComponent } from "./TokenAvatar";
 
-const meta: Meta<typeof TokenAvatarView> = {
+const meta: Meta<typeof TokenAvatarComponent> = {
     title: "Atoms/TokenAvatar",
-    component: TokenAvatarView,
+    component: TokenAvatarComponent,
 };
 
 export default meta;
 
-type Story = StoryObj<typeof TokenAvatarView>;
+type Story = StoryObj<typeof TokenAvatarComponent>;
 
 export const TokenAvatar: Story = {
     args: {
@@ -19,36 +19,36 @@ export const TokenAvatar: Story = {
         return (
             <>
                 <div className="m-1">
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.MEDIUM}
                     />
                 </div>
                 <div className="m-1 mt-20 flex gap-1">
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.EXTRA_EXTRA_SMALL}
                     />
 
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.EXTRA_SMALL}
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.SMALL}
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.MEDIUM}
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.LARGE}
                     />
                 </div>
                 <div className="m-1 mt-20 flex gap-3">
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.EXTRA_SMALL}
                         chain_color={"grey"}
@@ -56,7 +56,7 @@ export const TokenAvatar: Story = {
                             "https://www.datocms-assets.com/86369/1699425239-uniswap.jpg"
                         }
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.SMALL}
                         chain_color={"grey"}
@@ -64,7 +64,7 @@ export const TokenAvatar: Story = {
                             "https://www.datocms-assets.com/86369/1699425239-uniswap.jpg"
                         }
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.MEDIUM}
                         chain_color={"grey"}
@@ -72,7 +72,7 @@ export const TokenAvatar: Story = {
                             "https://www.datocms-assets.com/86369/1699425239-uniswap.jpg"
                         }
                     />
-                    <TokenAvatarView
+                    <TokenAvatarComponent
                         token_url="https://logos.covalenthq.com/tokens/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png"
                         size={GRK_SIZES.LARGE}
                         chain_color={"grey"}
diff --git a/src/components/Atoms/TokenAvatar/TokenAvatarView.tsx b/src/components/Atoms/TokenAvatar/TokenAvatar.tsx
similarity index 98%
rename from src/components/Atoms/TokenAvatar/TokenAvatarView.tsx
rename to src/components/Atoms/TokenAvatar/TokenAvatar.tsx
index 7dbcc616..a1bf3d94 100644
--- a/src/components/Atoms/TokenAvatar/TokenAvatarView.tsx
+++ b/src/components/Atoms/TokenAvatar/TokenAvatar.tsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef } from "react";
 import { type TokenAvatarProps } from "@/utils/types/atoms.types";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 
-export const TokenAvatarView: React.FC<TokenAvatarProps> = ({
+export const TokenAvatar: React.FC<TokenAvatarProps> = ({
     token_url,
     sub_url,
     size,
diff --git a/src/components/Molecules/AccountCardView/AccountCardView.stories.tsx b/src/components/Molecules/AccountCard/AccountCard.stories.tsx
similarity index 55%
rename from src/components/Molecules/AccountCardView/AccountCardView.stories.tsx
rename to src/components/Molecules/AccountCard/AccountCard.stories.tsx
index 334a66dc..d81fa1f1 100644
--- a/src/components/Molecules/AccountCardView/AccountCardView.stories.tsx
+++ b/src/components/Molecules/AccountCard/AccountCard.stories.tsx
@@ -1,11 +1,11 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { AccountCardView } from "./AccountCardView";
+import { AccountCard as AccountCardComponent } from "./AccountCard";
 
-type Story = StoryObj<typeof AccountCardView>;
+type Story = StoryObj<typeof AccountCardComponent>;
 
-const meta: Meta<typeof AccountCardView> = {
+const meta: Meta<typeof AccountCardComponent> = {
     title: "Molecules",
-    component: AccountCardView,
+    component: AccountCardComponent,
 };
 
 export default meta;
diff --git a/src/components/Molecules/AccountCardView/AccountCardView.tsx b/src/components/Molecules/AccountCard/AccountCard.tsx
similarity index 94%
rename from src/components/Molecules/AccountCardView/AccountCardView.tsx
rename to src/components/Molecules/AccountCard/AccountCard.tsx
index 5a485a34..4a52738b 100644
--- a/src/components/Molecules/AccountCardView/AccountCardView.tsx
+++ b/src/components/Molecules/AccountCard/AccountCard.tsx
@@ -8,12 +8,12 @@ import {
 import QRCode from "react-qr-code";
 import { useState } from "react";
 import { useToast } from "../../../utils/hooks/use-toast";
-import { AddressAvatarView } from "../../Atoms/AddressAvatar/AddressAvatarView";
+import { AddressAvatar } from "../../Atoms/AddressAvatar/AddressAvatar";
 import { IconWrapper } from "../../Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
-import { type AccountCardViewProps } from "@/utils/types/molecules.types";
+import { type AccountCardProps } from "@/utils/types/molecules.types";
 
-export const AccountCardView: React.FC<AccountCardViewProps> = ({
+export const AccountCard: React.FC<AccountCardProps> = ({
     address,
     type = "effigy",
     name = "Unnamed Wallet",
@@ -34,7 +34,7 @@ export const AccountCardView: React.FC<AccountCardViewProps> = ({
     return (
         <>
             <div className="flex w-full items-center gap-x-4 rounded border p-2 md:max-w-[18rem] lg:max-w-[18rem]">
-                <AddressAvatarView
+                <AddressAvatar
                     type={type}
                     address={address}
                     rounded
diff --git a/src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.stories.tsx b/src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.stories.tsx
similarity index 60%
rename from src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.stories.tsx
rename to src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.stories.tsx
index 51d3a76c..203a2340 100644
--- a/src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.stories.tsx
+++ b/src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.stories.tsx
@@ -1,12 +1,12 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { NFTFloorPriceView } from "./NFTFloorPriceView";
+import { NFTFloorPrice as NFTFloorPriceComponent } from "./NFTFloorPrice";
 import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 
-type Story = StoryObj<typeof NFTFloorPriceView>;
+type Story = StoryObj<typeof NFTFloorPriceComponent>;
 
-const meta: Meta<typeof NFTFloorPriceView> = {
+const meta: Meta<typeof NFTFloorPriceComponent> = {
     title: "Molecules/NFTs",
-    component: NFTFloorPriceView,
+    component: NFTFloorPriceComponent,
 };
 
 export default meta;
diff --git a/src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.tsx b/src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.tsx
similarity index 97%
rename from src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.tsx
rename to src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.tsx
index 147dfb88..f73e22a3 100644
--- a/src/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView.tsx
+++ b/src/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice.tsx
@@ -16,9 +16,9 @@ import {
 } from "@/utils/constants/shared.constants";
 import { CHART_COLORS } from "@/utils/constants/shared.constants";
 import { useCovalent } from "@/utils/store/Covalent";
-import { type NFTFloorPriceViewProps } from "@/utils/types/molecules.types";
+import { type NFTFloorPriceProps } from "@/utils/types/molecules.types";
 
-export const NFTFloorPriceView: React.FC<NFTFloorPriceViewProps> = ({
+export const NFTFloorPrice: React.FC<NFTFloorPriceProps> = ({
     chain_name,
     collection_address,
 }) => {
diff --git a/src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.stories.tsx b/src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.stories.tsx
similarity index 60%
rename from src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.stories.tsx
rename to src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.stories.tsx
index f7342b53..c68a6689 100644
--- a/src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.stories.tsx
+++ b/src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.stories.tsx
@@ -1,12 +1,12 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { NFTSalesCountView } from "./NFTSalesCountView";
+import { NFTSalesCount as NFTSalesCountComponent } from "./NFTSalesCount";
 import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 
-type Story = StoryObj<typeof NFTSalesCountView>;
+type Story = StoryObj<typeof NFTSalesCountComponent>;
 
-const meta: Meta<typeof NFTSalesCountView> = {
+const meta: Meta<typeof NFTSalesCountComponent> = {
     title: "Molecules/NFTs",
-    component: NFTSalesCountView,
+    component: NFTSalesCountComponent,
 };
 
 export default meta;
diff --git a/src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.tsx b/src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.tsx
similarity index 96%
rename from src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.tsx
rename to src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.tsx
index bf95d095..f4ca1a4f 100644
--- a/src/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView.tsx
+++ b/src/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount.tsx
@@ -8,9 +8,9 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES, PERIOD } from "@/utils/constants/shared.constants";
 import { CHART_COLORS } from "@/utils/constants/shared.constants";
 import { useCovalent } from "@/utils/store/Covalent";
-import { type NFTSalesCountViewProps } from "@/utils/types/molecules.types";
+import { type NFTSalesCountProps } from "@/utils/types/molecules.types";
 
-export const NFTSalesCountView: React.FC<NFTSalesCountViewProps> = ({
+export const NFTSalesCount: React.FC<NFTSalesCountProps> = ({
     chain_name,
     collection_address,
 }) => {
diff --git a/src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.stories.tsx b/src/components/Molecules/NFTs/NFTVolume/NFTVolume.stories.tsx
similarity index 88%
rename from src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.stories.tsx
rename to src/components/Molecules/NFTs/NFTVolume/NFTVolume.stories.tsx
index 266162db..4b0bcb84 100644
--- a/src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.stories.tsx
+++ b/src/components/Molecules/NFTs/NFTVolume/NFTVolume.stories.tsx
@@ -1,5 +1,5 @@
 import { type Meta, type StoryObj } from "@storybook/react";
-import { NFTVolumeView } from "./NFTVolumeView";
+import { NFTVolume as NFTVolumeView } from "./NFTVolume";
 import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 
 type Story = StoryObj<typeof NFTVolumeView>;
diff --git a/src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.tsx b/src/components/Molecules/NFTs/NFTVolume/NFTVolume.tsx
similarity index 97%
rename from src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.tsx
rename to src/components/Molecules/NFTs/NFTVolume/NFTVolume.tsx
index 73630d67..c6948f00 100644
--- a/src/components/Molecules/NFTs/NFTVolumeView/NFTVolumeView.tsx
+++ b/src/components/Molecules/NFTs/NFTVolume/NFTVolume.tsx
@@ -12,10 +12,10 @@ import {
 } from "@/utils/constants/shared.constants";
 import { CHART_COLORS } from "@/utils/constants/shared.constants";
 import { useCovalent } from "@/utils/store/Covalent";
-import { type NFTVolumeViewProps } from "@/utils/types/molecules.types";
+import { type NFTVolumeProps } from "@/utils/types/molecules.types";
 import { prettifyCurrency } from "@covalenthq/client-sdk";
 
-export const NFTVolumeView: React.FC<NFTVolumeViewProps> = ({
+export const NFTVolume: React.FC<NFTVolumeProps> = ({
     chain_name,
     collection_address,
 }) => {
diff --git a/src/components/Organisms/NFTs/NFTDetailsView/NFTDetailsView.tsx b/src/components/Organisms/NFTs/NFTDetailsView/NFTDetailsView.tsx
index 100e85aa..2b8cfe50 100644
--- a/src/components/Organisms/NFTs/NFTDetailsView/NFTDetailsView.tsx
+++ b/src/components/Organisms/NFTs/NFTDetailsView/NFTDetailsView.tsx
@@ -1,8 +1,8 @@
 import { Separator } from "@/components/ui/separator";
 import { TypographyH1, TypographyH4 } from "@/components/ui/typography";
 import { useCovalent } from "@/utils/store/Covalent";
-import { NFTSalesCountView } from "@/components/Molecules/NFTs/NFTSalesCountView/NFTSalesCountView";
-import { NFTFloorPriceView } from "@/components/Molecules/NFTs/NFTFloorPriceView/NFTFloorPriceView";
+import { NFTSalesCount } from "@/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount";
+import { NFTFloorPrice } from "@/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice";
 import { type Option, Some, None } from "@/utils/option";
 import { type NFTDetailsViewProps } from "@/utils/types/organisms.types";
 import { type NftTokenContract } from "@covalenthq/client-sdk";
@@ -74,14 +74,14 @@ export const NFTDetailsView: React.FC<NFTDetailsViewProps> = ({
 
                     <div className="mt-4 flex place-content-between space-x-4">
                         <div className=" w-[50%]">
-                            <NFTSalesCountView
+                            <NFTSalesCount
                                 chain_name={chain_name}
                                 collection_address={collection_address}
                                 token_id={token_id}
                             />
                         </div>
                         <div className=" w-[50%]">
-                            <NFTFloorPriceView
+                            <NFTFloorPrice
                                 chain_name={chain_name}
                                 collection_address={collection_address}
                                 token_id={token_id}
diff --git a/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx b/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
index 32cc5a82..e6dd8e02 100644
--- a/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
+++ b/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
@@ -13,7 +13,7 @@ import {
 } from "@/components/ui/card";
 import { TypographyH3 } from "@/components/ui/typography";
 import { Badge } from "@/components/ui/badge";
-import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCardView";
+import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
 import { type NFTWalletCollectionViewProps } from "@/utils/types/organisms.types";
 import { Skeleton } from "@/components/ui/skeleton";
 import { sum } from "lodash";
@@ -119,7 +119,7 @@ export const NFTWalletCollectionView: React.FC<
             return (
                 <div className="space-y-4 ">
                     <div className="flex flex-wrap place-content-between gap-2">
-                        <AccountCardView address={address} />
+                        <AccountCard address={address} />
 
                         <div className="w-full rounded border p-2 md:w-min lg:w-min">
                             <h2 className="text-base font-semibold  text-secondary ">
diff --git a/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx b/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
index 0a2482ed..d761718f 100644
--- a/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
+++ b/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
@@ -14,11 +14,11 @@ import {
 } from "@/components/ui/card";
 import flatMap from "lodash/flatMap";
 import sum from "lodash/sum";
-import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCardView";
+import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useCovalent } from "@/utils/store/Covalent";
 import { type NFTWalletTokenListViewProps } from "@/utils/types/organisms.types";
-import { TokenAvatarView } from "@/components/Atoms/TokenAvatar/TokenAvatarView";
+import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
 
 export const NFTWalletTokenListView: React.FC<NFTWalletTokenListViewProps> = ({
     chain_names,
@@ -140,7 +140,7 @@ export const NFTWalletTokenListView: React.FC<NFTWalletTokenListViewProps> = ({
                                                     borderColor: `${chainColor}`,
                                                 }}
                                             >
-                                                <TokenAvatarView
+                                                <TokenAvatar
                                                     is_chain_logo
                                                     size={GRK_SIZES.EXTRA_SMALL}
                                                     chain_color={chainColor}
@@ -181,7 +181,7 @@ export const NFTWalletTokenListView: React.FC<NFTWalletTokenListViewProps> = ({
             return (
                 <div className="space-y-4 ">
                     <div className="flex flex-wrap place-content-between gap-2 ">
-                        <AccountCardView address={address} />
+                        <AccountCard address={address} />
 
                         <div className="w-full rounded border p-2 md:max-w-[15rem] lg:max-w-[15rem]">
                             <h2 className="text-md  text-secondary ">
diff --git a/src/components/Organisms/TokenBalances/AddressActivityListView/AddressActivityListView.tsx b/src/components/Organisms/TokenBalances/AddressActivityListView/AddressActivityListView.tsx
index c491891b..ca09f20c 100644
--- a/src/components/Organisms/TokenBalances/AddressActivityListView/AddressActivityListView.tsx
+++ b/src/components/Organisms/TokenBalances/AddressActivityListView/AddressActivityListView.tsx
@@ -18,10 +18,10 @@ import {
     TableRow,
 } from "@/components/ui/table";
 import { Checkbox } from "@/components/ui/checkbox";
-import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCardView";
+import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
 import { Skeleton } from "@/components/ui/skeleton";
 import { timestampParser } from "@/utils/functions";
-import { TokenAvatarView } from "@/components/Atoms/TokenAvatar/TokenAvatarView";
+import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
@@ -122,7 +122,7 @@ export const AddressActivityListView: React.FC<
             cell: ({ row }) => {
                 return (
                     <div className="flex items-center gap-x-1 ">
-                        <TokenAvatarView
+                        <TokenAvatar
                             is_chain_logo={true}
                             token_url={row.original.logo_url}
                             size={GRK_SIZES.EXTRA_EXTRA_SMALL}
@@ -261,7 +261,7 @@ export const AddressActivityListView: React.FC<
     return (
         <div className="space-y-4 ">
             <div className="flex flex-wrap place-content-between gap-2">
-                <AccountCardView address={address} />
+                <AccountCard address={address} />
                 <div className="w-full rounded border p-2 md:max-w-[15rem] lg:max-w-[15rem]">
                     <div className="flex place-content-between items-center space-x-1">
                         {" "}
diff --git a/src/components/Organisms/TokenBalances/TokenBalancesListView/TokenBalancesListView.tsx b/src/components/Organisms/TokenBalances/TokenBalancesListView/TokenBalancesListView.tsx
index dfcdf26a..6a4fed09 100644
--- a/src/components/Organisms/TokenBalances/TokenBalancesListView/TokenBalancesListView.tsx
+++ b/src/components/Organisms/TokenBalances/TokenBalancesListView/TokenBalancesListView.tsx
@@ -32,11 +32,11 @@ import {
 } from "@/components/ui/table";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Skeleton } from "@/components/ui/skeleton";
-import { TokenAvatarView } from "../../../Atoms/TokenAvatar/TokenAvatarView";
+import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
 import { Button } from "@/components/ui/button";
 import { timestampParser } from "@/utils/functions";
 import { BalancePriceDelta, IconWrapper } from "@/components/Shared";
-import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCardView";
+import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCard";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { sum } from "lodash";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
@@ -186,7 +186,7 @@ export const TokenBalancesListView: React.FC<TokenBalancesListViewProps> = ({
 
                 return (
                     <div className="flex items-center gap-3">
-                        <TokenAvatarView
+                        <TokenAvatar
                             size={GRK_SIZES.EXTRA_SMALL}
                             chain_color={chainColor}
                             sub_url={protocol_url}
@@ -419,7 +419,7 @@ export const TokenBalancesListView: React.FC<TokenBalancesListViewProps> = ({
 
                 return (
                     <div className="flex items-center gap-3">
-                        <TokenAvatarView
+                        <TokenAvatar
                             size={GRK_SIZES.EXTRA_SMALL}
                             chain_color={chainColor}
                             sub_url={protocol_url}
diff --git a/src/components/Organisms/TokenBalances/TokenTransfersListView/TokenTransfersListView.tsx b/src/components/Organisms/TokenBalances/TokenTransfersListView/TokenTransfersListView.tsx
index 9505f793..99a75a94 100644
--- a/src/components/Organisms/TokenBalances/TokenTransfersListView/TokenTransfersListView.tsx
+++ b/src/components/Organisms/TokenBalances/TokenTransfersListView/TokenTransfersListView.tsx
@@ -26,14 +26,14 @@ import {
 } from "@/components/ui/table";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Skeleton } from "@/components/ui/skeleton";
-import { TokenAvatarView } from "../../../Atoms/TokenAvatar/TokenAvatarView";
+import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
 import {
     timestampParser,
     truncate,
     calculateTimeSeriesGroup,
 } from "@/utils/functions";
 import { Badge } from "@/components/ui/badge";
-import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCardView";
+import { AccountCardView } from "@/components/Molecules/AccountCardView/AccountCard";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { Button } from "@/components/ui/button";
 import {
@@ -44,7 +44,7 @@ import {
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { AddressAvatarView } from "@/components/Atoms/AddressAvatar/AddressAvatarView";
+import { AddressAvatar } from "@/components/Atoms/AddressAvatar/AddressAvatar";
 import { IconWrapper } from "@/components/Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 import {
@@ -99,7 +99,7 @@ const columns: ColumnDef<BlockTransactionWithContractTransfers>[] = [
         cell: ({ row }) => {
             return (
                 <div className="flex items-center gap-x-1">
-                    <AddressAvatarView
+                    <AddressAvatar
                         size={GRK_SIZES.EXTRA_SMALL}
                         type="fingerprint"
                         address={row.getValue("from_address")}
@@ -115,7 +115,7 @@ const columns: ColumnDef<BlockTransactionWithContractTransfers>[] = [
         cell: ({ row }) => {
             return (
                 <div className="flex items-center gap-x-1">
-                    <AddressAvatarView
+                    <AddressAvatar
                         size={GRK_SIZES.EXTRA_SMALL}
                         type="fingerprint"
                         address={row.getValue("to_address")}
@@ -480,7 +480,7 @@ export const TokenTransfersListView: React.FC<TokenTransfersListViewProps> = ({
                                             ) ?? null;
                                         return (
                                             <>
-                                                <TokenAvatarView
+                                                <TokenAvatar
                                                     is_chain_logo
                                                     token_url={chain?.logo_url}
                                                     size={
@@ -510,7 +510,7 @@ export const TokenTransfersListView: React.FC<TokenTransfersListViewProps> = ({
                                     Some: (result) => {
                                         return (
                                             <>
-                                                <TokenAvatarView
+                                                <TokenAvatar
                                                     token_url={result.logo_url}
                                                     size={
                                                         GRK_SIZES.EXTRA_EXTRA_SMALL
diff --git a/src/utils/types/molecules.types.ts b/src/utils/types/molecules.types.ts
index 9f6d99f0..22c16c14 100644
--- a/src/utils/types/molecules.types.ts
+++ b/src/utils/types/molecules.types.ts
@@ -1,24 +1,24 @@
 import { type Chain } from "@covalenthq/client-sdk";
 
-export interface AccountCardViewProps {
+export interface AccountCardProps {
     name?: string;
     address: string;
     type?: "fingerprint" | "effigy" | "wallet";
 }
 
-export interface NFTFloorPriceViewProps {
+export interface NFTFloorPriceProps {
     chain_name: Chain;
     collection_address: string;
     token_id?: string;
 }
 
-export interface NFTSalesCountViewProps {
+export interface NFTSalesCountProps {
     chain_name: Chain;
     collection_address: string;
     token_id?: string;
 }
 
-export interface NFTVolumeViewProps {
+export interface NFTVolumeProps {
     chain_name: Chain;
     collection_address: string;
     token_id?: string;