diff --git a/packages/blade/codemods/brand-refresh/transformers/index.ts b/packages/blade/codemods/brand-refresh/transformers/index.ts
index b31a2a92ada..72de851a935 100644
--- a/packages/blade/codemods/brand-refresh/transformers/index.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/index.ts
@@ -92,14 +92,22 @@ const transformer: Transform = (file, api, options) => {
   // Update the themeTokens prop in BladeProvider
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => path.value.openingElement.name.name === 'BladeProvider')
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'themeTokens')
-      .replaceWith((path) => {
-        path.node.value.expression.name = 'bladeTheme';
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'BladeProvider',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'themeTokens',
+        },
+      })
+      .replaceWith(({ node }) => {
+        node.value.expression.name = 'bladeTheme';
 
-        return path.node;
+        return node;
       });
   } catch (error) {
     console.error(
@@ -113,13 +121,19 @@ const transformer: Transform = (file, api, options) => {
   // Update color token value based on the context
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        /(Text|Title|Code|Display|Heading|Box|Icon)/i.test(path.value.openingElement.name.name),
-      )
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) => /(Text|Title|Code|Display|Heading|Box|Icon)/i.test(name),
+          },
+        },
+      })
       // Find all color props
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name.toLowerCase().includes('color'))
+      .find(j.JSXAttribute, {
+        name: {
+          name: (name) => name.toLowerCase().includes('color'),
+        },
+      })
       .replaceWith((path) => {
         const { node, parent } = path;
 
@@ -180,10 +194,16 @@ const transformer: Transform = (file, api, options) => {
   // Update ImportSpecifier from "paymentTheme"/"bankingTheme" to "bladeTheme"
   try {
     root
-      .find(j.ImportDeclaration)
-      .filter((path) => /@razorpay\/blade\/tokens/i.test(path.value.source.value as string))
-      .find(j.ImportSpecifier)
-      .filter((path) => ['paymentTheme', 'bankingTheme'].includes(path.value.imported.name))
+      .find(j.ImportDeclaration, {
+        source: {
+          value: '@razorpay/blade/tokens',
+        },
+      })
+      .find(j.ImportSpecifier, {
+        imported: {
+          name: (name) => ['paymentTheme', 'bankingTheme'].includes(name),
+        },
+      })
       .replaceWith((path) => {
         path.value.imported.name = 'bladeTheme';
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-actionlist.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-actionlist.ts
index 4419dd30e10..3b801e2d509 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-actionlist.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-actionlist.ts
@@ -6,10 +6,18 @@ function migrateActionListComponent({ root, j, file }): void {
   // <Table surfaceLevel={2}> -> <Table >
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => path.value.openingElement.name.name === 'ActionList')
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'surfaceLevel')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'ActionList',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'surfaceLevel',
+        },
+      })
       .remove();
   } catch (error) {
     console.error(
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-amount.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-amount.ts
index d7b0800ee51..d2193c41284 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-amount.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-amount.ts
@@ -4,10 +4,13 @@ import { red, isExpression } from './utils';
 function migrateAmountComponent({ root, j, file }): void {
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        ['Amount', 'CardHeaderAmount'].includes(path.value.openingElement.name.name),
-      )
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) => ['Amount', 'CardHeaderAmount'].includes(name),
+          },
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-badge.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-badge.ts
index 847fd30fa06..6820da24da5 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-badge.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-badge.ts
@@ -4,14 +4,18 @@ import { red } from './utils';
 function migrateBadgeComponent({ root, j, file }): void {
   try {
     root
-      .find(j.JSXElement)
-      .filter(
-        (path) =>
-          path.value.openingElement.name.name === 'Badge' ||
-          path.value.openingElement.name.name === 'CardHeaderBadge',
-      )
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'fontWeight')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) => ['Badge', 'CardHeaderBadge'].includes(name),
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'fontWeight',
+        },
+      })
       .remove();
   } catch (error) {
     console.error(
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-card-and-table.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-card-and-table.ts
index dd9b7c5f562..3f5fa771b35 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-card-and-table.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-card-and-table.ts
@@ -6,10 +6,18 @@ import { red } from './utils';
 function migrateCardAndTable({ root, j, file }): void {
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => ['Card', 'Table'].includes(path.value.openingElement.name.name))
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'surfaceLevel')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) => ['Card', 'Table'].includes(name),
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'surfaceLevel',
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-contrast-intent-color-props.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-contrast-intent-color-props.ts
index 16f460141f1..f08e0b5f36e 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-contrast-intent-color-props.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-contrast-intent-color-props.ts
@@ -4,13 +4,17 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // Break `contrast="high"` prop from Typography & ProgressBar Components
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        ['Text', 'Title', 'Display', 'Heading', 'ProgressBar', 'CardHeaderText'].includes(
-          path.value.openingElement.name.name,
-        ),
-      )
-      .find(j.JSXAttribute) // Find all props
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) =>
+              ['Text', 'Title', 'Display', 'Heading', 'ProgressBar', 'CardHeaderText'].includes(
+                name,
+              ),
+          },
+        },
+      })
+      .find(j.JSXAttribute)
       .filter(
         (path, index, self) =>
           ['Text', 'Title', 'Display', 'Heading', 'ProgressBar', 'CardHeaderText'].includes(
@@ -36,19 +40,26 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // Bade/Counter/IconButton/Alert Components: Change `contrast` prop to `emphasis`
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        [
-          'Badge',
-          'Counter',
-          'IconButton',
-          'Alert',
-          'CardHeaderBadge',
-          'CardHeaderCounter',
-        ].includes(path.value.openingElement.name.name),
-      )
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'contrast')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) =>
+              [
+                'Badge',
+                'Counter',
+                'IconButton',
+                'Alert',
+                'CardHeaderBadge',
+                'CardHeaderCounter',
+              ].includes(name),
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'contrast',
+        },
+      })
       .replaceWith((path) => {
         path.node.name.name = 'emphasis';
 
@@ -89,10 +100,18 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // <Spinner contrast="low|high" /> -> <Spinner color="primary|white" />
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => path.value.openingElement.name.name === 'Spinner')
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'contrast')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'Spinner',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'contrast',
+        },
+      })
       .replaceWith((path) => {
         path.node.name.name = 'color';
 
@@ -117,10 +136,18 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // Remove 'contrast' prop from the Skeleton Component
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => path.value.openingElement.name.name === 'Skeleton')
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'contrast')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'Skeleton',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'contrast',
+        },
+      })
       .remove();
   } catch (error) {
     console.error(
@@ -134,22 +161,26 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // Remove deprecated 'intent'/'variant' props in favor of color
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        [
-          'Alert',
-          'Badge',
-          'Counter',
-          'Chip',
-          'ChipGroup',
-          'Indicator',
-          'ProgressBar',
-          'Amount',
-          'CardHeaderBadge',
-          'CardHeaderCounter',
-          'CardHeaderAmount',
-        ].includes(path.value.openingElement.name.name),
-      )
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) =>
+              [
+                'Alert',
+                'Badge',
+                'Counter',
+                'Chip',
+                'ChipGroup',
+                'Indicator',
+                'ProgressBar',
+                'Amount',
+                'CardHeaderBadge',
+                'CardHeaderCounter',
+                'CardHeaderAmount',
+              ].includes(name),
+          },
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
@@ -194,11 +225,14 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
 
         return node;
       })
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'intent' || path.node.name.name === 'variant')
+      .find(j.JSXAttribute, {
+        name: {
+          name: (name) => name === 'intent' || name === 'variant',
+        },
+      })
+      // Remove duplicate intent/variant props
       .filter(
         (path, index, self) =>
-          (path.node.name.name === 'intent' || path.node.name.name === 'variant') &&
           index === self.findIndex((obj) => path.node.start === obj.node.start),
       )
       .replaceWith((path) => {
@@ -222,24 +256,34 @@ function migrateContrastIntentAndColorProps({ root, j, file }): void {
   // <Button variant="secondary" color="default"> -> <Button variant="secondary" color="primary">
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        [
-          'Button',
-          'Link',
-          'Badge',
-          'Counter',
-          'Chip',
-          'ChipGroup',
-          'CardHeaderBadge',
-          'CardHeaderCounter',
-          'CardHeaderIconButton',
-          'CardHeaderLink',
-          'Spinner',
-        ].includes(path.value.openingElement.name.name),
-      )
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'color' && path.node.value.value === 'default')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) =>
+              [
+                'Button',
+                'Link',
+                'Badge',
+                'Counter',
+                'Chip',
+                'ChipGroup',
+                'CardHeaderBadge',
+                'CardHeaderCounter',
+                'CardHeaderIconButton',
+                'CardHeaderLink',
+                'Spinner',
+              ].includes(name),
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'color',
+        },
+        value: {
+          value: 'default',
+        },
+      })
       .replaceWith((path) => {
         path.node.value.value = 'primary';
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-divider.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-divider.ts
index 77e21e23af8..847d8408af0 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-divider.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-divider.ts
@@ -1,13 +1,25 @@
 import { red } from './utils';
 
-// Divider component <Divider variant=”normal”> -> <Divider variant=”muted”>
+// Divider component migration: Change the variant prop value from “normal” to “muted”
+// <Divider variant=”normal”> -> <Divider variant=”muted”>
 function migrateDividerComponent({ root, j, file }): void {
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => ['Divider'].includes(path.value.openingElement.name.name))
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'variant' && path.node.value.value === 'normal')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'Divider',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'variant',
+        },
+        value: {
+          value: 'normal',
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-dropdown.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-dropdown.ts
index 0911208d964..f166ac8033c 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-dropdown.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-dropdown.ts
@@ -11,10 +11,18 @@ function migrateDropdownComponent({ root, j, file }): void {
   // >
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) => path.value.openingElement.name.name === 'Dropdown')
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'onDismiss')
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: 'Dropdown',
+          },
+        },
+      })
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'onDismiss',
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
diff --git a/packages/blade/codemods/brand-refresh/transformers/migrate-typography.ts b/packages/blade/codemods/brand-refresh/transformers/migrate-typography.ts
index 6e120447b85..93d4ab6f5aa 100644
--- a/packages/blade/codemods/brand-refresh/transformers/migrate-typography.ts
+++ b/packages/blade/codemods/brand-refresh/transformers/migrate-typography.ts
@@ -4,13 +4,14 @@ import colorTokensMapping from './colorTokensMapping.json';
 
 function migrateTypographyComponents({ root, j, file }): void {
   // Select Typography elements based on their names
-  const typographyJSXElements = root
-    .find(j.JSXElement)
-    .filter((path) =>
-      ['Text', 'Title', 'Code', 'Display', 'Heading', 'CardHeaderText'].includes(
-        path.value.openingElement.name.name,
-      ),
-    );
+  const typographyJSXElements = root.find(j.JSXElement, {
+    openingElement: {
+      name: {
+        name: (name) =>
+          ['Text', 'Title', 'Code', 'Display', 'Heading', 'CardHeaderText'].includes(name),
+      },
+    },
+  });
 
   // Update <Text variant="caption" size="medium" > to <Text variant="caption" size="small" >
   try {
@@ -23,8 +24,14 @@ function migrateTypographyComponents({ root, j, file }): void {
               attribute.name?.name === 'variant' && attribute.value?.value === 'caption',
           ),
       )
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'size' && path.node.value.value === 'medium')
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'size',
+        },
+        value: {
+          value: 'medium',
+        },
+      })
       .replaceWith((path) => {
         path.node.value.value = 'small';
         return path.node;
@@ -184,10 +191,16 @@ function migrateTypographyComponents({ root, j, file }): void {
   // Remove/Update the Title import from "@razorpay/blade/components"
   try {
     root
-      .find(j.ImportDeclaration)
-      .filter((path) => path.value.source.value === '@razorpay/blade/components')
-      .find(j.ImportSpecifier)
-      .filter((path) => ['Title'].includes(path.value.imported.name))
+      .find(j.ImportDeclaration, {
+        source: {
+          value: '@razorpay/blade/components',
+        },
+      })
+      .find(j.ImportSpecifier, {
+        imported: {
+          name: 'Title',
+        },
+      })
       .replaceWith((path) => {
         // Check if Heading import is already present
         const isHeadingImportPresent = path.parent.value.specifiers.some(
@@ -216,10 +229,16 @@ function migrateTypographyComponents({ root, j, file }): void {
   // Remove `type` and contrast="low" prop from Typography & ProgressBar Components
   try {
     root
-      .find(j.JSXElement)
-      .filter((path) =>
-        /(Text|Title|Display|Heading|ProgressBar)/i.test(path.value.openingElement.name.name),
-      )
+      .find(j.JSXElement, {
+        openingElement: {
+          name: {
+            name: (name) =>
+              ['Text', 'Title', 'Display', 'Heading', 'ProgressBar', 'CardHeaderText'].includes(
+                name,
+              ),
+          },
+        },
+      })
       .replaceWith((path) => {
         const { node } = path;
 
@@ -267,13 +286,18 @@ function migrateTypographyComponents({ root, j, file }): void {
 
         return node;
       })
-      .find(j.JSXAttribute) // Find all Heading props
+      .find(j.JSXAttribute, {
+        name: {
+          name: (name) => name === 'type' || name === 'contrast',
+        },
+        value: {
+          value: (value) => value !== 'high',
+        },
+      })
       .filter(
         (path, index, self) =>
-          (path.node.name.name === 'type' ||
-            (path.node.name.name === 'contrast' && path.node.value.value === 'low')) &&
           index === self.findIndex((obj) => path.node.start === obj.node.start),
-      ) // Filter by name `type` and remove any duplicates
+      ) // remove any duplicates
       .remove();
   } catch (error) {
     console.error(
@@ -293,8 +317,14 @@ function migrateTypographyComponents({ root, j, file }): void {
           path.value.openingElement.name.name,
         ),
       )
-      .find(j.JSXAttribute)
-      .filter((path) => path.node.name.name === 'weight' && path.node.value.value === 'bold')
+      .find(j.JSXAttribute, {
+        name: {
+          name: 'weight',
+        },
+        value: {
+          value: 'bold',
+        },
+      })
       .replaceWith((path) => {
         path.node.value.value = 'semibold';
         return path.node;