diff --git a/src/pages/address/page.tsx b/src/pages/address/page.tsx
index 412071c..7061d24 100644
--- a/src/pages/address/page.tsx
+++ b/src/pages/address/page.tsx
@@ -35,27 +35,27 @@ export default function AddressPage() {
       >
         <AddressSummary />
 
-        <Card style={{ marginTop: 16 }} title={t("addressDetails")}>
+        <Card style={{ marginTop: 16 }} title={t("address.addressDetails")}>
           <div className={styles.services}>
             <Button className={styles.serviceButton} icon={<ApartmentIcon />}>
               <ProText
                 style={{ fontWeight: "bold", color: "rgba(95, 108, 123, 1)" }}
               >
-                {t("apartment")}
+                {t("address.apartment")}
               </ProText>
             </Button>
             <Button className={styles.serviceButton} icon={<HouseIcon />}>
               <ProText
                 style={{ fontWeight: "bold", color: "rgba(95, 108, 123, 1)" }}
               >
-                {t("house")}
+                {t("address.house")}
               </ProText>
             </Button>
             <Button className={styles.serviceButton} icon={<OfficeIcon />}>
               <ProText
                 style={{ fontWeight: "bold", color: "rgba(95, 108, 123, 1)" }}
               >
-                {t("office")}
+                {t("address.office")}
               </ProText>
             </Button>
           </div>
@@ -75,7 +75,7 @@ export default function AddressPage() {
                 rules={[{ required: true, message: "" }]}
               >
                 <Input
-                  placeholder={t("floor")}
+                  placeholder={t("address.floor")}
                   style={{
                     fontSize: 14,
                   }}
@@ -83,12 +83,12 @@ export default function AddressPage() {
                 />
               </Form.Item>{" "}
               <Form.Item
-                label={t("aptNumber")}
+                label={t("address.aptNumber")}
                 name="apt"
                 rules={[{ required: true, message: "" }]}
               >
                 <Input
-                  placeholder={t("aptNumber")}
+                  placeholder={t("address.aptNumber")}
                   style={{
                     fontSize: 14,
                   }}
@@ -97,12 +97,12 @@ export default function AddressPage() {
               </Form.Item>
             </div>
             <Form.Item
-              label={t("street")}
+              label={t("address.street")}
               name="street"
               rules={[{ required: true, message: "" }]}
             >
               <Input
-                placeholder={t("street")}
+                placeholder={t("address.street")}
                 style={{
                   fontSize: 14,
                 }}
@@ -110,12 +110,12 @@ export default function AddressPage() {
               />
             </Form.Item>
             <Form.Item
-              label={t("additionalDirection")}
+              label={t("address.additionalDirection")}
               name="additional"
               rules={[{ required: true, message: "" }]}
             >
               <Input
-                placeholder={t("additionalDirection")}
+                placeholder={t("address.additionalDirection")}
                 style={{
                   fontSize: 14,
                 }}
@@ -124,12 +124,12 @@ export default function AddressPage() {
             </Form.Item>
 
             <Form.Item
-              label={t("mobileNumber")}
+              label={t("address.mobileNumber")}
               name="phone"
               rules={[{ required: true, message: "" }]}
             >
               <Input
-                placeholder={t("mobileNumber")}
+                placeholder={t("address.mobileNumber")}
                 style={{
                   fontSize: 14,
                 }}
@@ -138,12 +138,12 @@ export default function AddressPage() {
             </Form.Item>
 
             <Form.Item
-              label={t("addressLabel")}
+              label={t("address.addressLabel")}
               name="addressLabel"
               rules={[{ required: true, message: "" }]}
             >
               <Input
-                placeholder={t("addressLabel")}
+                placeholder={t("address.addressLabel")}
                 style={{
                   fontSize: 14,
                 }}
@@ -187,7 +187,7 @@ export default function AddressPage() {
             }}
             disabled={false}
           >
-            {t("saveAddress")}
+            {t("address.saveAddress")}
           </Button>
         </Link>
       </Row>
diff --git a/src/pages/checkout/components/AddressSummary.tsx b/src/pages/checkout/components/AddressSummary.tsx
index 3b8f19a..d7b45f5 100644
--- a/src/pages/checkout/components/AddressSummary.tsx
+++ b/src/pages/checkout/components/AddressSummary.tsx
@@ -31,7 +31,7 @@ export const AddressSummary = () => {
         console.error("Failed to parse location data:", error);
       }
     },
-    [dispatch]
+    [dispatch],
   );
 
   const handleMapBottomSheetOpen = useCallback(() => {
@@ -44,7 +44,7 @@ export const AddressSummary = () => {
 
   const initialValue = useMemo(
     () => (location ? JSON.stringify(location) : ""),
-    [location]
+    [location],
   );
 
   const shouldRender = useMemo(() => orderType === "delivery", [orderType]);
@@ -56,24 +56,28 @@ export const AddressSummary = () => {
   return (
     <>
       <Card
-        title={t("locationDetails")}
+        title={t("address.locationDetails")}
         extra={
           <Button
             type="primary"
             size="small"
             onClick={handleMapBottomSheetOpen}
           >
-            {location ? t("changeLocation") : t("selectLocation")}
+            {location
+              ? t("address.changeLocation")
+              : t("address.selectLocation")}
           </Button>
         }
         className={styles.addressCard}
       >
         {!location ? (
           <div className={styles.noLocationContainer}>
-            <ProText type="secondary">{t("noLocationSelected")}</ProText>
+            <ProText type="secondary">
+              {t("address.noLocationSelected")}
+            </ProText>
             <br />
             <ProText type="secondary" className={styles.smallTextStyle}>
-              {t("clickEditToSelect")}
+              {t("address.clickEditToSelect")}
             </ProText>
           </div>
         ) : (