diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.input.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.input.js
deleted file mode 100644
index 7c0b94efd3..0000000000
--- a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.input.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// @flow strict
-import React from 'react';
-import { Callout } from 'gestalt';
-
-export default function TestBox() {
-  return (
-    <Callout
-      message="Insert a clever info callout message here"
-      iconAccessibilityLabel="info"
-      primaryLink={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
-      secondaryLink={{ href: 'pinterest.com/help', label: 'Learn more' }}
-      type="info"
-      title="A Title"
-    />
-  );
-}
diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.output.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.output.js
deleted file mode 100644
index 69179b519f..0000000000
--- a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-primary-secondary-action-replace-primary-secondary-link.output.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// @flow strict
-import React from 'react';
-import { Callout } from 'gestalt';
-
-export default function TestBox() {
-  return (
-    <Callout
-      message="Insert a clever info callout message here"
-      iconAccessibilityLabel="info"
-      primaryAction={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
-      secondaryAction={{ href: 'pinterest.com/help', label: 'Learn more' }}
-      type="info"
-      title="A Title"
-    />
-  );
-}
diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.input.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.input.js
new file mode 100644
index 0000000000..e00d059d52
--- /dev/null
+++ b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.input.js
@@ -0,0 +1,24 @@
+// @flow strict
+import React from 'react';
+import { Box, Callout, Upsell } from 'gestalt';
+
+export default function TestBox() {
+  return (
+    <Box>
+      <Callout
+        message="Insert a clever info callout message here"
+        iconAccessibilityLabel="info"
+        primaryLink={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
+        secondaryLink={{ href: 'pinterest.com/help', label: 'Learn more' }}
+        type="info"
+        title="A Title"
+      />
+      <Upsell
+        message="Insert a clever upsell message here"
+        primaryLink={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
+        secondaryLink={{ href: 'pinterest.com/help', label: 'Learn more' }}
+        title="A Title"
+      />
+    </Box>
+  );
+}
diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.output.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.output.js
new file mode 100644
index 0000000000..7dd130e5a8
--- /dev/null
+++ b/packages/gestalt-codemods/16.0.0/__testfixtures__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.output.js
@@ -0,0 +1,24 @@
+// @flow strict
+import React from 'react';
+import { Box, Callout, Upsell } from 'gestalt';
+
+export default function TestBox() {
+  return (
+    <Box>
+      <Callout
+        message="Insert a clever info callout message here"
+        iconAccessibilityLabel="info"
+        primaryAction={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
+        secondaryAction={{ href: 'pinterest.com/help', label: 'Learn more' }}
+        type="info"
+        title="A Title"
+      />
+      <Upsell
+        message="Insert a clever upsell message here"
+        primaryAction={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
+        secondaryAction={{ href: 'pinterest.com/help', label: 'Learn more' }}
+        title="A Title"
+      />
+    </Box>
+  );
+}
diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.input.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.input.js
deleted file mode 100644
index ebaf577756..0000000000
--- a/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// @flow strict
-import React from 'react';
-import { Upsell } from 'gestalt';
-
-export default function TestBox() {
-  return (
-    <Upsell
-        message="Insert a clever upsell message here"
-        primaryLink={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
-        secondaryLink={{ href: 'pinterest.com/help', label: 'Learn more' }}
-        title="A Title"
-      />
-  );
-}
diff --git a/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.output.js b/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.output.js
deleted file mode 100644
index c6fb8cb85c..0000000000
--- a/packages/gestalt-codemods/16.0.0/__testfixtures__/upsell-primary-secondary-action-replace-primary-secondary-link.output.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// @flow strict
-import React from 'react';
-import { Upsell } from 'gestalt';
-
-export default function TestBox() {
-  return (
-    <Upsell
-        message="Insert a clever upsell message here"
-        primaryAction={{ href: 'pinterest.com', label: 'Visit Pinterest' }}
-        secondaryAction={{ href: 'pinterest.com/help', label: 'Learn more' }}
-        title="A Title"
-      />
-  );
-}
diff --git a/packages/gestalt-codemods/16.0.0/__tests__/callout-primary-secondary-action-replace-primary-secondary-link.test.js b/packages/gestalt-codemods/16.0.0/__tests__/callout-primary-secondary-action-replace-primary-secondary-link.test.js
deleted file mode 100644
index 5c61164e5f..0000000000
--- a/packages/gestalt-codemods/16.0.0/__tests__/callout-primary-secondary-action-replace-primary-secondary-link.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { defineTest } from 'jscodeshift/dist/testUtils.js';
-
-jest.mock(
-  '../callout-primary-secondary-action-replace-primary-secondary-link',
-  () => {
-    return Object.assign(
-      jest.requireActual(
-        '../callout-primary-secondary-action-replace-primary-secondary-link'
-      ),
-      {
-        parser: 'flow',
-      }
-    );
-  }
-);
-
-describe('callout-primary-secondary-action-replace-primary-secondary-link', () => {
-  ['callout-primary-secondary-action-replace-primary-secondary-link'].forEach(
-    (test) => {
-      defineTest(
-        __dirname,
-        'callout-primary-secondary-action-replace-primary-secondary-link',
-        { quote: 'single' },
-        test
-      );
-    }
-  );
-});
diff --git a/packages/gestalt-codemods/16.0.0/__tests__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.test.js b/packages/gestalt-codemods/16.0.0/__tests__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.test.js
new file mode 100644
index 0000000000..59ba41950b
--- /dev/null
+++ b/packages/gestalt-codemods/16.0.0/__tests__/callout-upsell-primary-secondary-action-replace-primary-secondary-link.test.js
@@ -0,0 +1,28 @@
+import { defineTest } from 'jscodeshift/dist/testUtils.js';
+
+jest.mock(
+  '../callout-upsell-primary-secondary-action-replace-primary-secondary-link',
+  () => {
+    return Object.assign(
+      jest.requireActual(
+        '../callout-upsell-primary-secondary-action-replace-primary-secondary-link'
+      ),
+      {
+        parser: 'flow',
+      }
+    );
+  }
+);
+
+describe('callout-upsell-primary-secondary-action-replace-primary-secondary-link', () => {
+  [
+    'callout-upsell-primary-secondary-action-replace-primary-secondary-link',
+  ].forEach((test) => {
+    defineTest(
+      __dirname,
+      'callout-upsell-primary-secondary-action-replace-primary-secondary-link',
+      { quote: 'single' },
+      test
+    );
+  });
+});
diff --git a/packages/gestalt-codemods/16.0.0/__tests__/upsell-primary-secondary-action-replace-primary-secondary-link.test.js b/packages/gestalt-codemods/16.0.0/__tests__/upsell-primary-secondary-action-replace-primary-secondary-link.test.js
deleted file mode 100644
index 956ce2adf1..0000000000
--- a/packages/gestalt-codemods/16.0.0/__tests__/upsell-primary-secondary-action-replace-primary-secondary-link.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { defineTest } from 'jscodeshift/dist/testUtils.js';
-
-jest.mock(
-  '../upsell-primary-secondary-action-replace-primary-secondary-link',
-  () => {
-    return Object.assign(
-      jest.requireActual(
-        '../upsell-primary-secondary-action-replace-primary-secondary-link'
-      ),
-      {
-        parser: 'flow',
-      }
-    );
-  }
-);
-
-describe('upsell-primary-secondary-action-replace-primary-secondary-link', () => {
-  ['upsell-primary-secondary-action-replace-primary-secondary-link'].forEach(
-    (test) => {
-      defineTest(
-        __dirname,
-        'upsell-primary-secondary-action-replace-primary-secondary-link',
-        { quote: 'single' },
-        test
-      );
-    }
-  );
-});
diff --git a/packages/gestalt-codemods/16.0.0/callout-primary-secondary-action-replace-primary-secondary-link.js b/packages/gestalt-codemods/16.0.0/callout-upsell-primary-secondary-action-replace-primary-secondary-link.js
similarity index 89%
rename from packages/gestalt-codemods/16.0.0/callout-primary-secondary-action-replace-primary-secondary-link.js
rename to packages/gestalt-codemods/16.0.0/callout-upsell-primary-secondary-action-replace-primary-secondary-link.js
index 94671066e8..0aabeab483 100644
--- a/packages/gestalt-codemods/16.0.0/callout-primary-secondary-action-replace-primary-secondary-link.js
+++ b/packages/gestalt-codemods/16.0.0/callout-upsell-primary-secondary-action-replace-primary-secondary-link.js
@@ -1,6 +1,7 @@
 /*
  * Converts
  *  <Callout primaryLink={...} secondaryLink={...} /> to <Callout primaryAction={...} secondaryAction={...} />
+ *  <Upsell primaryLink={...} secondaryLink={...} /> to <Upsell primaryAction={...} secondaryAction={...} />
  */
 
 export default function transformer(file, api) {
@@ -16,7 +17,7 @@ export default function transformer(file, api) {
     }
 
     localIdentifierName = decl.specifiers
-      .filter((node) => node.imported.name === 'Callout')
+      .filter((node) => ['Upsell', 'Callout'].includes(node.imported.name))
       .map((node) => node.local.name);
     return null;
   });
diff --git a/packages/gestalt-codemods/16.0.0/upsell-primary-secondary-action-replace-primary-secondary-link.js b/packages/gestalt-codemods/16.0.0/upsell-primary-secondary-action-replace-primary-secondary-link.js
deleted file mode 100644
index 4a4255de88..0000000000
--- a/packages/gestalt-codemods/16.0.0/upsell-primary-secondary-action-replace-primary-secondary-link.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Converts
- *  <Upsell primaryLink={...} secondaryLink={...} /> to <Upsell primaryAction={...} secondaryAction={...} />
- */
-
-export default function transformer(file, api) {
-  const j = api.jscodeshift;
-  const src = j(file.source);
-  let localIdentifierName;
-  let fileHasModifications = false;
-
-  src.find(j.ImportDeclaration).forEach((path) => {
-    const decl = path.node;
-    if (decl.source.value !== 'gestalt') {
-      return null;
-    }
-
-    localIdentifierName = decl.specifiers
-      .filter((node) => node.imported.name === 'Upsell')
-      .map((node) => node.local.name);
-    return null;
-  });
-
-  if (!localIdentifierName) {
-    return null;
-  }
-
-  const transform = src
-    .find(j.JSXElement)
-    .forEach((jsxElement) => {
-      const { node } = jsxElement;
-
-      if (!localIdentifierName.includes(node.openingElement.name.name)) {
-        return null;
-      }
-
-      const attrs = node.openingElement.attributes;
-
-      const newAppendAttr = [];
-      const newAttrs = attrs
-        .map((attr) => {
-          if (attr?.name?.name && attr.name.name === 'primaryLink') {
-            const renamedAttr = { ...attr };
-            renamedAttr.name.name = 'primaryAction';
-            return renamedAttr;
-          }
-          if (attr?.name?.name && attr.name.name === 'secondaryLink') {
-            const renamedAttr = { ...attr };
-            renamedAttr.name.name = 'secondaryAction';
-            return renamedAttr;
-          }
-          return attr;
-        })
-        .filter(Boolean);
-
-      fileHasModifications = true;
-      node.openingElement.attributes = [...newAppendAttr, ...newAttrs];
-      return null;
-    })
-    .toSource();
-
-  return fileHasModifications ? transform : null;
-}