diff --git a/.changeset/many-wolves-end.md b/.changeset/many-wolves-end.md
new file mode 100644
index 000000000..7bc622e8e
--- /dev/null
+++ b/.changeset/many-wolves-end.md
@@ -0,0 +1,7 @@
+---
+'@sphinx-labs/contracts': patch
+'@sphinx-labs/plugins': patch
+'@sphinx-labs/core': patch
+---
+
+Use artifact inference in Foundry plugin
diff --git a/docs/troubleshooting-guide.md b/docs/troubleshooting-guide.md
index c9fd37119..849e4018b 100644
--- a/docs/troubleshooting-guide.md
+++ b/docs/troubleshooting-guide.md
@@ -4,38 +4,11 @@ This guide covers some common issues you might encounter using Sphinx. If your q
 
 ## Table of Contents
 
-- [Labeling contracts](#labeling-contracts)
 - [Slow compilation speed](#slow-compilation-speed)
 - [Errors](#errors)
   - [`Ineffective mark-compacts near heap limit allocation failed`](#ineffective-mark-compacts-near-heap-limit-allocation-failed)
   - [`EvmError: MemoryLimitOOG`](#evmerror-memorylimitoog)
 
-## Labeling contracts
-
-When Sphinx can't infer the contract corresponding to an address, an error will be thrown asking you to label it yourself. This makes it possible for Sphinx to verify the contract on Etherscan and create a deployment artifact for it.
-
-You can label a contract in your deployment script with the `sphinxLabel` function, which is inherited from `Sphinx.sol`. For example:
-
-```sol
-MyToken token = new MyToken{ salt: bytes32(0) }();
-sphinxLabel(address(token), "src/tokens/MyToken.sol:MyToken");
-```
-
-You must use the **fully qualified name** of the contract, which is in the format `full/path/to/SourceFile.sol:ContractName`, as shown in the example above.
-
-If you're having trouble finding the contract corresponding to an address, we recommend using `console.log`. You can import it into your script using:
-
-```
-import "forge-std/console.sol";
-```
-
-Then, you can log the addresses of your contracts:
-
-```
-MyToken token = new MyToken{ salt: bytes32(0) }();
-console.log('MyToken', address(token));
-```
-
 ## Slow compilation speed
 
 Sphinx may slow down the compilation speed of your script because the `Sphinx.sol` contract is large. You can speed up compilation during development by disabling the Solidity compiler optimizer. One approach is to create a new profile in your `foundry.toml` file. For example:
diff --git a/packages/contracts/contracts/foundry/SphinxPluginTypes.sol b/packages/contracts/contracts/foundry/SphinxPluginTypes.sol
index f7853a6c7..b940e859b 100644
--- a/packages/contracts/contracts/foundry/SphinxPluginTypes.sol
+++ b/packages/contracts/contracts/foundry/SphinxPluginTypes.sol
@@ -86,7 +86,6 @@ struct DeploymentInfo {
     SphinxConfig newConfig;
     ExecutionMode executionMode;
     InitialChainState initialState;
-    Label[] labels;
     bool arbitraryChain;
 }
 
@@ -124,11 +123,6 @@ struct SphinxConfig {
     uint256 saltNonce;
 }
 
-struct Label {
-    address addr;
-    string fullyQualifiedName;
-}
-
 struct DeployOptions {
     bytes32 salt;
     string referenceName;
diff --git a/packages/contracts/contracts/foundry/SphinxUtils.sol b/packages/contracts/contracts/foundry/SphinxUtils.sol
index e9e710b11..d9938fd9b 100644
--- a/packages/contracts/contracts/foundry/SphinxUtils.sol
+++ b/packages/contracts/contracts/foundry/SphinxUtils.sol
@@ -23,7 +23,6 @@ import {
     InitialChainState,
     OptionalAddress,
     Wallet,
-    Label,
     ExecutionMode,
     SystemContractInfo
 } from "./SphinxPluginTypes.sol";
diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
index 3e33be05f..c54566e15 100644
--- a/packages/core/src/config/types.ts
+++ b/packages/core/src/config/types.ts
@@ -99,7 +99,6 @@ export type DeploymentInfo = {
   newConfig: SphinxConfig
   executionMode: ExecutionMode
   initialState: InitialChainState
-  labels: Array<Label>
   arbitraryChain: boolean
 }
 
@@ -124,11 +123,6 @@ export type UserAddressOverrides = {
   address: string
 }
 
-export type Label = {
-  addr: string
-  fullyQualifiedName: string
-}
-
 export type SphinxConfigWithAddresses = SphinxConfig & {
   safeAddress: string
   moduleAddress: string
diff --git a/packages/core/src/preview.ts b/packages/core/src/preview.ts
index 169b48b20..87b5c5154 100644
--- a/packages/core/src/preview.ts
+++ b/packages/core/src/preview.ts
@@ -1,4 +1,4 @@
-import { yellow, green, blue, bold } from 'chalk'
+import { yellow, green, bold } from 'chalk'
 
 import { DecodedAction, ParsedConfig } from './config/types'
 import {
@@ -127,20 +127,17 @@ export const getPreviewString = (
 
   // Warn about unlabeled addresses
   if (preview.unlabeledAddresses.size > 0) {
-    const troubleshootingGuideLink = blue.underline(
-      `https://github.com/sphinx-labs/sphinx/blob/main/docs/troubleshooting-guide.md#labeling-contracts\n\n`
-    )
     previewString += `${yellow.bold(
-      `Warning: Sphinx can't infer the contracts that correspond to the following addresses:\n`
+      `Warning: Sphinx couldn't find a contract artifact for the following addresses:\n`
     )}`
     previewString += `${Array.from(preview.unlabeledAddresses)
       .map((e) => yellow(`- ${e}`))
       .join('\n')}\n`
-    previewString +=
-      yellow(
-        `If you'd like Sphinx to verify any of these contracts on Etherscan or create their deployment artifacts,\n` +
-          `please label them in your script. See the troubleshooting guide for more information:\n`
-      ) + troubleshootingGuideLink
+    previewString += yellow(
+      `This typically happens when deploying contracts using hardcoded bytecode and no \n` +
+        `associated source file. Sphinx will not create a deployment artifact or attempt \n` +
+        `Etherscan verification for any address in the list above.\n\n`
+    )
   }
 
   if (includeConfirmQuestion) {
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 3cc6af92b..a87b22174 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -40,7 +40,6 @@ import {
   ActionInput,
   RawCreate2ActionInput,
   RawActionInput,
-  Label,
   ParsedConfig,
   Create2ActionInput,
   FunctionCallActionInput,
@@ -928,17 +927,6 @@ export const isString = (str: string | null | undefined): str is string => {
   return typeof str === 'string'
 }
 
-export const isLabel = (l: Label | undefined): l is Label => {
-  if (l === undefined) {
-    return false
-  }
-
-  return (
-    typeof (l as Label).addr === 'string' &&
-    typeof (l as Label).fullyQualifiedName === 'string'
-  )
-}
-
 export const toSphinxTransaction = (
   actionInput: RawActionInput
 ): SphinxTransaction => {
diff --git a/packages/plugins/contracts/foundry/Sphinx.sol b/packages/plugins/contracts/foundry/Sphinx.sol
index f107ab7b6..8d2ef3c04 100644
--- a/packages/plugins/contracts/foundry/Sphinx.sol
+++ b/packages/plugins/contracts/foundry/Sphinx.sol
@@ -16,7 +16,6 @@ import {
     DeploymentInfo,
     NetworkInfo,
     Wallet,
-    Label,
     SphinxTransaction,
     ExecutionMode,
     SystemContractInfo
@@ -65,8 +64,6 @@ abstract contract Sphinx {
      */
     SphinxConfig public sphinxConfig;
 
-    Label[] private labels;
-
     SphinxConstants private constants;
 
     SphinxUtils private sphinxUtils;
@@ -173,18 +170,6 @@ abstract contract Sphinx {
         // the delegatecall in our error message.
         require(success, "Sphinx: Deployment script failed.");
 
-        // Set the labels. We do this after running the user's script because the user may assign
-        // labels in their deployment. We use a for-loop instead of directly assigning the labels to
-        // prevent an error when compiling with `viaIR` and the solc optimizer enabled (runs =
-        // 200) using solc v0.8.5.
-        deploymentInfo.labels = new Label[](labels.length);
-        for (uint i = 0; i < labels.length; i++) {
-            deploymentInfo.labels[i] = Label({
-                addr: labels[i].addr,
-                fullyQualifiedName: labels[i].fullyQualifiedName
-            });
-        }
-
         return deploymentInfo;
     }
 
@@ -293,32 +278,6 @@ abstract contract Sphinx {
         );
     }
 
-    function sphinxLabel(address _addr, string memory _fullyQualifiedName) internal {
-        for (uint256 i = 0; i < labels.length; i++) {
-            Label memory label = labels[i];
-            if (label.addr == _addr) {
-                require(
-                    keccak256(abi.encodePacked(_fullyQualifiedName)) ==
-                        keccak256(abi.encodePacked(label.fullyQualifiedName)),
-                    string(
-                        abi.encodePacked(
-                            "Sphinx: The address ",
-                            vm.toString(_addr),
-                            " was labeled with two names:\n",
-                            label.fullyQualifiedName,
-                            "\n",
-                            _fullyQualifiedName,
-                            "\nPlease choose one label."
-                        )
-                    )
-                );
-                return;
-            }
-        }
-
-        labels.push(Label(_addr, _fullyQualifiedName));
-    }
-
     /**
      * @notice Return the user's config ABI encoded. This is useful for retrieving the config
      *         off-chain. We ABI encode the config because it's difficult to decode complex
diff --git a/packages/plugins/contracts/test/conflictingNameContracts/First.sol b/packages/plugins/contracts/test/conflictingNameContracts/First.sol
deleted file mode 100644
index 424c05b19..000000000
--- a/packages/plugins/contracts/test/conflictingNameContracts/First.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract ConflictingNameContract {
-    uint256 public number;
-
-    constructor(uint256 _number) {
-        number = _number;
-    }
-
-    function set(uint256 _number) public {
-        number = _number;
-    }
-}
diff --git a/packages/plugins/contracts/test/conflictingNameContracts/Second.sol b/packages/plugins/contracts/test/conflictingNameContracts/Second.sol
deleted file mode 100644
index ff6fd99e3..000000000
--- a/packages/plugins/contracts/test/conflictingNameContracts/Second.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract ConflictingNameContract {
-    address public addr;
-
-    constructor(address _addr) {
-        addr = _addr;
-    }
-}
diff --git a/packages/plugins/contracts/test/script/Cases.s.sol b/packages/plugins/contracts/test/script/Cases.s.sol
index 4f16dde7c..95e14d72f 100644
--- a/packages/plugins/contracts/test/script/Cases.s.sol
+++ b/packages/plugins/contracts/test/script/Cases.s.sol
@@ -7,9 +7,6 @@ import { Sphinx } from "../../foundry/Sphinx.sol";
 import { CREATE3 } from "solady/utils/CREATE3.sol";
 import { ConstructorDeploysContract } from "../../../contracts/test/ConstructorDeploysContract.sol";
 import { Fallback } from "../../../contracts/test/Fallback.sol";
-import {
-    ConflictingNameContract
-} from "../../../contracts/test/conflictingNameContracts/First.sol";
 
 contract Simple is Script, Sphinx {
     constructor() {
@@ -39,63 +36,16 @@ contract Simple is Script, Sphinx {
         Fallback fallbackContract = Fallback(CREATE3.deploy(bytes32(0), fallbackInitCode, 0));
         fallbackContract.set(1);
 
-        // Deploys contract that deploys another contract in its constructor using create2
-        // The contract deployed is labeled
-        ConstructorDeploysContract constructorDeploysContract = new ConstructorDeploysContract{
-            salt: bytes32(uint(1))
-        }(1);
-        sphinxLabel(
-            address(constructorDeploysContract.myContract()),
-            "contracts/test/ConstructorDeploysContract.sol:DeployedInConstructor"
-        );
+        // Deploys contract that deploys another contract in its constructor using create2.
+        // The deployed contract is automatically labeled because it has a source file.
+        new ConstructorDeploysContract{ salt: bytes32(uint(1)) }(1);
 
-        // Deploys contract that deploys another contract in its constructor using create3
-        // Both the parent and child are labeled
+        // Deploys contract that deploys another contract in its constructor using create3.
+        // Both the parent and child are labeled because they both have source files.
         bytes memory constructorDeploysContractInitCode = abi.encodePacked(
             type(ConstructorDeploysContract).creationCode,
             abi.encode(2)
         );
-        ConstructorDeploysContract constructorDeploysContractCreate3 = ConstructorDeploysContract(
-            CREATE3.deploy(bytes32(uint(1)), constructorDeploysContractInitCode, 0)
-        );
-        sphinxLabel(
-            address(constructorDeploysContractCreate3),
-            "contracts/test/ConstructorDeploysContract.sol:ConstructorDeploysContract"
-        );
-        sphinxLabel(
-            address(constructorDeploysContractCreate3.myContract()),
-            "contracts/test/ConstructorDeploysContract.sol:DeployedInConstructor"
-        );
-
-        // Deploys contract that deploys another contract in its constructor using create2
-        // The contract is not labeled
-        new ConstructorDeploysContract{ salt: bytes32(uint(2)) }(3);
-
-        // Deploys contract that deploys another contract in its constructor using create3
-        // Neither contract is labeled
-        bytes memory constructorDeploysContractUnlabeledInitCode = abi.encodePacked(
-            type(ConstructorDeploysContract).creationCode,
-            abi.encode(4)
-        );
-        CREATE3.deploy(bytes32(uint(2)), constructorDeploysContractUnlabeledInitCode, 0);
-
-        // Deploy a contract whose name is not unique in the source directory
-        // The contract is labeled
-        ConflictingNameContract conflictingNameContract = new ConflictingNameContract{ salt: 0 }(1);
-        sphinxLabel(
-            address(conflictingNameContract),
-            "contracts/test/conflictingNameContracts/First.sol:ConflictingNameContract"
-        );
-
-        // Deploy a contract whose name is not unique in the source directory
-        // The contract is not labeled
-        new ConflictingNameContract{ salt: bytes32(uint(1)) }(2);
-
-        // Deploy a contract whose name is not unique in the source directory
-        // We interact with the contract, so it does not require a label
-        ConflictingNameContract conflictingNameContractInteract = new ConflictingNameContract{
-            salt: bytes32(uint(2))
-        }(3);
-        conflictingNameContractInteract.set(5);
+        CREATE3.deploy(bytes32(uint(1)), constructorDeploysContractInitCode, 0);
     }
 }
diff --git a/packages/plugins/script/Sample.s.sol b/packages/plugins/script/Sample.s.sol
index 52ec5426a..2f379b93b 100644
--- a/packages/plugins/script/Sample.s.sol
+++ b/packages/plugins/script/Sample.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {Script, console} from "sphinx-forge-std/Script.sol";
 import {Sphinx} from "../contracts/foundry/Sphinx.sol";
-import {Network, Label} from "@sphinx-labs/contracts/contracts/foundry/SphinxPluginTypes.sol";
+import {Network} from "@sphinx-labs/contracts/contracts/foundry/SphinxPluginTypes.sol";
 import {MyContract1} from "../contracts/test/MyContracts.sol";
 import {CREATE3} from "solady/utils/CREATE3.sol";
 
@@ -42,7 +42,6 @@ contract Sample is Sphinx {
 
         bytes memory initCode =
             abi.encodePacked(type(MyContract1).creationCode, abi.encode(1, 2, address(1), address(2)));
-        address deployed = CREATE3.deploy(bytes32(0), initCode, 0);
-        sphinxLabel(deployed, "contracts/test/MyContracts.sol:MyContract1");
+        CREATE3.deploy(bytes32(0), initCode, 0);
     }
 }
diff --git a/packages/plugins/src/foundry/decode.ts b/packages/plugins/src/foundry/decode.ts
index d1265f013..87482347a 100644
--- a/packages/plugins/src/foundry/decode.ts
+++ b/packages/plugins/src/foundry/decode.ts
@@ -1,5 +1,4 @@
 import {
-  isLabel,
   isRawCreate2ActionInput,
   isRawFunctionCallActionInput,
   isString,
@@ -7,7 +6,6 @@ import {
   ConfigArtifacts,
   DeploymentInfo,
   FunctionCallActionInput,
-  Label,
   ParsedConfig,
   RawActionInput,
   RawCreate2ActionInput,
@@ -20,7 +18,6 @@ import {
 } from '@sphinx-labs/core'
 import { AbiCoder, ethers } from 'ethers'
 import {
-  CREATE3_PROXY_INITCODE,
   DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
   Operation,
   recursivelyConvertResult,
@@ -29,8 +26,8 @@ import {
 import { FoundrySingleChainDryRun } from './types'
 import {
   convertLibraryFormat,
+  findFullyQualifiedName,
   findFunctionFragment,
-  getConfigArtifactForContractName,
 } from './utils'
 
 export const decodeDeploymentInfo = (
@@ -62,14 +59,12 @@ export const decodeDeploymentInfo = (
     initialState,
     executionMode,
     newConfig,
-    labels,
     requireSuccess,
     safeInitData,
     arbitraryChain,
   } = deploymentInfoBigInt
 
   const deploymentInfo: DeploymentInfo = {
-    labels,
     safeAddress,
     moduleAddress,
     safeInitData,
@@ -253,7 +248,6 @@ export const makeParsedConfig = (
     newConfig,
     executionMode,
     initialState,
-    labels,
     safeInitData,
     arbitraryChain,
   } = deploymentInfo
@@ -280,98 +274,27 @@ export const makeParsedConfig = (
     }
 
     const { parsedContracts, unlabeledAdditionalContracts } =
-      parseAdditionalContracts(input, rawInputs, labels, configArtifacts)
+      parseAdditionalContracts(input, configArtifacts)
     unlabeledAddresses.push(...unlabeledAdditionalContracts)
 
     if (isRawCreate2ActionInput(input)) {
-      // Get the creation code of the CREATE2 deployment by removing the salt,
-      // which is the first 32 bytes of the data.
-      const initCodeWithArgs = ethers.dataSlice(input.txData, 32)
-
-      // Check if the contract is a CREATE3 proxy. If it is, we won't attempt to verify it because
-      // it doesn't have its own source file in any commonly used CREATE3 library.
-      if (initCodeWithArgs !== CREATE3_PROXY_INITCODE) {
-        // Check if the `contractName` is a fully qualified name.
-        if (input.contractName && input.contractName.includes(':')) {
-          // It's a fully qualified name.
-
-          const fullyQualifiedName = input.contractName
-
-          parsedContracts.push({
-            address: input.create2Address,
-            fullyQualifiedName,
-            initCodeWithArgs,
-          })
-        } else if (
-          // Check if the `contractName` is a standard contract name (not a fully qualified name).
-          input.contractName
-        ) {
-          const { fullyQualifiedName } = getConfigArtifactForContractName(
-            input.contractName,
-            configArtifacts
-          )
+      const fullyQualifiedName = findFullyQualifiedName(
+        input.initCodeWithArgs,
+        configArtifacts
+      )
 
-          parsedContracts.push({
-            address: input.create2Address,
-            fullyQualifiedName,
-            initCodeWithArgs,
-          })
-        } else {
-          // There's no contract name in this CREATE2 transaction.
-          const label = labels.find((l) => l.addr === input.create2Address)
-          if (isLabel(label)) {
-            parsedContracts.push({
-              address: input.create2Address,
-              fullyQualifiedName: label.fullyQualifiedName,
-              initCodeWithArgs,
-            })
-
-            const contractName = label.fullyQualifiedName.split(':')[1]
-            input.decodedAction = {
-              referenceName: contractName,
-              functionName: 'deploy',
-              variables: {
-                initCode: initCodeWithArgs,
-              },
-              address: '',
-            }
-          } else {
-            // Attempt to infer the name of the contract deployed using CREATE2. We may need to do this
-            // if the contract name isn't unique in the repo. This is likely a bug in Foundry.
-            const contractName = rawInputs
-              .filter(isRawFunctionCallActionInput)
-              .filter((e) => e.to === input.create2Address)
-              .map((e) => e.contractName)
-              .find(isString)
-            if (contractName) {
-              const fullyQualifiedName = contractName.includes(':')
-                ? contractName
-                : getConfigArtifactForContractName(
-                    contractName,
-                    configArtifacts
-                  ).fullyQualifiedName
-
-              parsedContracts.push({
-                address: input.create2Address,
-                fullyQualifiedName,
-                initCodeWithArgs,
-              })
-
-              input.decodedAction = {
-                referenceName: fullyQualifiedName.split(':')[1],
-                functionName: 'deploy',
-                variables: [
-                  {
-                    initCode: initCodeWithArgs,
-                  },
-                ],
-                address: '',
-              }
-            } else {
-              unlabeledAddresses.push(input.create2Address)
-            }
-          }
-        }
+      // If the fully qualified name exists, add the contract deployed via `CREATE2` to the list of
+      // parsed contracts.
+      if (fullyQualifiedName) {
+        parsedContracts.push({
+          address: input.create2Address,
+          fullyQualifiedName,
+          initCodeWithArgs: input.initCodeWithArgs,
+        })
+      } else {
+        // We couldn't find the fully qualified name, so the contract must not belong to a source
+        // file. We mark it as unlabeled.
+        unlabeledAddresses.push(input.create2Address)
       }
 
       parsedActionInputs.push({
@@ -417,10 +340,13 @@ export const makeParsedConfig = (
   return parsedConfig
 }
 
+/**
+ * Parse the `additionalContracts` array of the Foundry broadcast, which contains all nested
+ * contract deployments for the given action. For example, if a contract deploys another contract in
+ * its constructor, the child contract's deployment info would exist in this array.
+ */
 const parseAdditionalContracts = (
   currentInput: RawActionInput,
-  allInputs: Array<RawActionInput>,
-  labels: Array<Label>,
   configArtifacts: ConfigArtifacts
 ): {
   parsedContracts: Array<ParsedContractDeployment>
@@ -431,43 +357,16 @@ const parseAdditionalContracts = (
   for (const additionalContract of currentInput.additionalContracts) {
     const address = ethers.getAddress(additionalContract.address)
 
-    const label = labels.find((l) => l.addr === address)
-    if (isLabel(label)) {
-      if (label.fullyQualifiedName !== '') {
-        parsedContracts.push({
-          address,
-          fullyQualifiedName: label.fullyQualifiedName,
-          initCodeWithArgs: additionalContract.initCode,
-        })
-      }
-    } else if (
-      // Check if the current transaction is a call to deploy a contract using CREATE3. CREATE3
-      // transactions are 'CALL' types where the 'data' field of the transaction is equal to the
-      // contract's creation code. This transaction happens when calling the minimal CREATE3 proxy.
-      isRawFunctionCallActionInput(currentInput) &&
-      currentInput.txData === additionalContract.initCode
-    ) {
-      // We'll attempt to infer the name of the contract that was deployed using CREATE3.
-      const contractName = allInputs
-        .filter(isRawFunctionCallActionInput)
-        .filter((e) => e.to === address)
-        .map((e) => e.contractName)
-        .find(isString)
-
-      if (contractName) {
-        const fullyQualifiedName = contractName.includes(':')
-          ? contractName
-          : getConfigArtifactForContractName(contractName, configArtifacts)
-              .fullyQualifiedName
-
-        parsedContracts.push({
-          address,
-          fullyQualifiedName,
-          initCodeWithArgs: additionalContract.initCode,
-        })
-      } else {
-        unlabeled.push(address)
-      }
+    const fullyQualifiedName = findFullyQualifiedName(
+      additionalContract.initCode,
+      configArtifacts
+    )
+    if (fullyQualifiedName) {
+      parsedContracts.push({
+        address,
+        fullyQualifiedName,
+        initCodeWithArgs: additionalContract.initCode,
+      })
     } else {
       unlabeled.push(address)
     }
diff --git a/packages/plugins/src/foundry/utils/index.ts b/packages/plugins/src/foundry/utils/index.ts
index 96c635421..009c34ef1 100644
--- a/packages/plugins/src/foundry/utils/index.ts
+++ b/packages/plugins/src/foundry/utils/index.ts
@@ -14,7 +14,6 @@ import {
 import { spawnSync } from 'child_process'
 
 import {
-  BuildInfo,
   CompilerOutputContracts,
   SphinxTransactionReceipt,
 } from '@sphinx-labs/core/dist/languages/solidity/types'
@@ -502,31 +501,6 @@ export const inferSolcVersion = async (): Promise<string> => {
   }
 }
 
-export const getConfigArtifactForContractName = (
-  targetContractName: string,
-  configArtifacts: ConfigArtifacts
-): {
-  fullyQualifiedName: string
-  buildInfo: BuildInfo
-  artifact: ContractArtifact
-} => {
-  for (const [fullyQualifiedName, { buildInfo, artifact }] of Object.entries(
-    configArtifacts
-  )) {
-    const contractName = fullyQualifiedName.split(':')[1]
-    if (contractName === targetContractName) {
-      return {
-        fullyQualifiedName,
-        buildInfo,
-        artifact,
-      }
-    }
-  }
-  throw new Error(
-    `Could not find artifact for ${targetContractName}. Should never happen.`
-  )
-}
-
 /**
  * Returns `true` if the given contract init code with constructor args belongs to the given
  * contract artifact, and returns `false` otherwise. There may be a couple differences between this
@@ -1162,3 +1136,35 @@ export const replaceEnvVariables = (input: ParsedVariable): any => {
     return input
   }
 }
+
+/**
+ * Searches the `configArtifacts` to find the fully qualified name for the given `initCodeWithArgs`.
+ * Returns `undefined` if the `initCodeWithArgs` does not exist in the `configArtifacts`, which
+ * means that it does not belong to a source file.
+ */
+export const findFullyQualifiedName = (
+  initCodeWithArgs: string,
+  configArtifacts: ConfigArtifacts
+): string | undefined => {
+  for (const fullyQualifiedName of Object.keys(configArtifacts)) {
+    const { artifact } = configArtifacts[fullyQualifiedName]
+    const { bytecode, linkReferences, abi } = artifact
+
+    const iface = new ethers.Interface(abi)
+    const constructorFragment = iface.fragments.find(
+      ConstructorFragment.isFragment
+    )
+
+    if (
+      isInitCodeMatch(initCodeWithArgs, {
+        bytecode,
+        linkReferences,
+        constructorFragment,
+      })
+    ) {
+      return fullyQualifiedName
+    }
+  }
+  // If we make it to this point, we couldn't find a fully qualified name for this init code.
+  return undefined
+}
diff --git a/packages/plugins/test/mocha/cli/deploy.spec.ts b/packages/plugins/test/mocha/cli/deploy.spec.ts
index df8606882..52bfb26e5 100644
--- a/packages/plugins/test/mocha/cli/deploy.spec.ts
+++ b/packages/plugins/test/mocha/cli/deploy.spec.ts
@@ -20,6 +20,7 @@ import {
 } from '@sphinx-labs/core'
 import { ethers } from 'ethers'
 import {
+  CREATE3_PROXY_INITCODE,
   DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
   SphinxMerkleTree,
 } from '@sphinx-labs/contracts'
@@ -28,7 +29,6 @@ import { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/
 import * as MyContract2Artifact from '../../../out/artifacts/MyContracts.sol/MyContract2.json'
 import * as FallbackArtifact from '../../../out/artifacts/Fallback.sol/Fallback.json'
 import * as RevertDuringSimulation from '../../../out/artifacts/RevertDuringSimulation.s.sol/RevertDuringSimulation.json'
-import * as ConflictingNameContractArtifact from '../../../out/artifacts/First.sol/ConflictingNameContract.json'
 import * as ConstructorDeploysContractParentArtifact from '../../../out/artifacts/ConstructorDeploysContract.sol/ConstructorDeploysContract.json'
 import * as ConstructorDeploysContractChildArtifact from '../../../out/artifacts/ConstructorDeploysContract.sol/DeployedInConstructor.json'
 import { deploy } from '../../../src/cli/deploy'
@@ -78,61 +78,6 @@ const constructorDeploysContractChildAddressCreate3 = ethers.getCreateAddress({
   from: constructorDeploysContractAddressCreate3,
   nonce: 1,
 })
-const unlabeledConstructorDeploysContractAddress = ethers.getCreate2Address(
-  DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
-  '0x' + '00'.repeat(31) + '02',
-  ethers.keccak256(
-    ethers.concat([
-      ConstructorDeploysContractParentArtifact.bytecode.object,
-      coder.encode(['uint'], [3]),
-    ])
-  )
-)
-const unlabeledConstructorDeploysContractChildAddress = ethers.getCreateAddress(
-  {
-    from: unlabeledConstructorDeploysContractAddress,
-    nonce: 1,
-  }
-)
-const unlabeledConstructorDeploysContractCreate3Address = getCreate3Address(
-  DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
-  '0x' + '00'.repeat(31) + '02'
-)
-const unlabeledConstructorDeploysContractChildCreate3Address =
-  ethers.getCreateAddress({
-    from: unlabeledConstructorDeploysContractCreate3Address,
-    nonce: 1,
-  })
-const conflictingNameContractAddress = ethers.getCreate2Address(
-  DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
-  ethers.ZeroHash,
-  ethers.keccak256(
-    ethers.concat([
-      ConflictingNameContractArtifact.bytecode.object,
-      coder.encode(['uint'], [1]),
-    ])
-  )
-)
-const unlabeledConflictingNameContract = ethers.getCreate2Address(
-  DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
-  '0x' + '00'.repeat(31) + '01',
-  ethers.keccak256(
-    ethers.concat([
-      ConflictingNameContractArtifact.bytecode.object,
-      coder.encode(['uint'], [2]),
-    ])
-  )
-)
-const conflictingNameContractWithInteractionAddress = ethers.getCreate2Address(
-  DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
-  '0x' + '00'.repeat(31) + '02',
-  ethers.keccak256(
-    ethers.concat([
-      ConflictingNameContractArtifact.bytecode.object,
-      coder.encode(['uint'], [3]),
-    ])
-  )
-)
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -423,15 +368,7 @@ describe('Deployment Cases', () => {
   }
 
   const checkNotLabeled = (address: string) => {
-    let fullyQualifiedName: string | undefined
-    for (const actionInput of compilerConfig!.actionInputs) {
-      for (const contract of actionInput.contracts) {
-        if (contract.address === address) {
-          fullyQualifiedName = contract.fullyQualifiedName
-        }
-      }
-    }
-    expect(fullyQualifiedName).to.be.undefined
+    expect(compilerConfig!.unlabeledAddresses.includes(address)).to.eq(true)
   }
 
   before(async () => {
@@ -453,7 +390,6 @@ describe('Deployment Cases', () => {
           'contracts/test/ConstructorDeploysContract.sol:ConstructorDeploysContract',
           'contracts/test/ConstructorDeploysContract.sol:DeployedInConstructor',
           'contracts/test/Fallback.sol:Fallback',
-          'contracts/test/conflictingNameContracts/First.sol:ConflictingNameContract',
         ]).context,
         verify: false,
       }))
@@ -476,10 +412,18 @@ describe('Deployment Cases', () => {
     expect(await contract.myString()).to.equal('did fallback')
   })
 
-  it('Can deploy with Create3 and label via interaction', async () => {
+  it('Can deploy with Create3 and infer artifact', async () => {
     expect(await provider.getCode(fallbackCreate3Address)).to.not.eq('0x')
 
     checkLabeled(fallbackCreate3Address, 'contracts/test/Fallback.sol:Fallback')
+
+    // Check that the `CREATE3` proxy is not labeled.
+    const create3ProxyAddress = ethers.getCreate2Address(
+      DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
+      ethers.ZeroHash,
+      ethers.keccak256(CREATE3_PROXY_INITCODE)
+    )
+    checkNotLabeled(create3ProxyAddress)
   })
 
   describe('Can deploy contract that deploys contract in constructor', async () => {
@@ -553,147 +497,14 @@ describe('Deployment Cases', () => {
           constructorDeploysContractChildAddressCreate3,
           'contracts/test/ConstructorDeploysContract.sol:DeployedInConstructor'
         )
-      })
-    })
-
-    describe('Without label', async () => {
-      it('Create2', async () => {
-        // expect both deployed
-        expect(
-          await provider.getCode(unlabeledConstructorDeploysContractAddress)
-        ).to.not.eq('0x')
-        expect(
-          await provider.getCode(
-            unlabeledConstructorDeploysContractChildAddress
-          )
-        ).to.not.eq('0x')
 
-        // expect child is stored in parent
-        const parentContract = getContract(
-          unlabeledConstructorDeploysContractAddress,
-          ConstructorDeploysContractParentArtifact
-        )
-        expect(await parentContract.myContract()).to.equal(
-          unlabeledConstructorDeploysContractChildAddress
-        )
-
-        // expect can interact with child
-        const childContract = getContract(
-          unlabeledConstructorDeploysContractChildAddress,
-          ConstructorDeploysContractChildArtifact
-        )
-        expect(await childContract.x()).to.eq(BigInt(3))
-
-        // expect child is not labeled
-        checkNotLabeled(unlabeledConstructorDeploysContractChildAddress)
-        expect(
-          compilerConfig?.unlabeledAddresses.includes(
-            unlabeledConstructorDeploysContractChildAddress
-          )
-        ).to.eq(true)
-      })
-
-      it('Create3', async () => {
-        // expect both deployed
-        expect(
-          await provider.getCode(
-            unlabeledConstructorDeploysContractCreate3Address
-          )
-        ).to.not.eq('0x')
-        expect(
-          await provider.getCode(
-            unlabeledConstructorDeploysContractChildCreate3Address
-          )
-        ).to.not.eq('0x')
-
-        // expect child is stored in parent
-        const parentContract = getContract(
-          unlabeledConstructorDeploysContractCreate3Address,
-          ConstructorDeploysContractParentArtifact
-        )
-        expect(await parentContract.myContract()).to.equal(
-          unlabeledConstructorDeploysContractChildCreate3Address
-        )
-
-        // expect can interact with child
-        const childContract = getContract(
-          unlabeledConstructorDeploysContractChildCreate3Address,
-          ConstructorDeploysContractChildArtifact
-        )
-        expect(await childContract.x()).to.eq(BigInt(4))
-
-        // expect both are not labeled
-        checkNotLabeled(unlabeledConstructorDeploysContractCreate3Address)
-        checkNotLabeled(unlabeledConstructorDeploysContractChildCreate3Address)
-        expect(
-          compilerConfig?.unlabeledAddresses.includes(
-            unlabeledConstructorDeploysContractCreate3Address
-          )
-        ).to.eq(true)
-        expect(
-          compilerConfig?.unlabeledAddresses.includes(
-            unlabeledConstructorDeploysContractChildCreate3Address
-          )
-        ).to.eq(true)
-      })
-    })
-
-    describe('Can deploy ambiguously named contract', async () => {
-      it('With label', async () => {
-        // expect contract to be deployed
-        expect(
-          await provider.getCode(conflictingNameContractAddress)
-        ).to.not.eq('0x')
-
-        // check can interact with the contract
-        const contract = getContract(
-          conflictingNameContractAddress,
-          ConflictingNameContractArtifact
-        )
-        expect(await contract.number()).to.eq(BigInt(1))
-
-        // expect contract is labeled
-        checkLabeled(
-          conflictingNameContractAddress,
-          'contracts/test/conflictingNameContracts/First.sol:ConflictingNameContract'
-        )
-      })
-
-      it('Without label', async () => {
-        // expect contract to be deployed
-        expect(
-          await provider.getCode(unlabeledConflictingNameContract)
-        ).to.not.eq('0x')
-
-        // check can interact with the contract
-        const contract = getContract(
-          unlabeledConflictingNameContract,
-          ConflictingNameContractArtifact
-        )
-        expect(await contract.number()).to.eq(BigInt(2))
-
-        // expect contract is labeled
-        checkNotLabeled(unlabeledConflictingNameContract)
-      })
-
-      it('With interaction', async () => {
-        // expect contract to be deployed
-        expect(
-          await provider.getCode(conflictingNameContractWithInteractionAddress)
-        ).to.not.eq('0x')
-
-        // check can interact with the contract
-        const contract = getContract(
-          conflictingNameContractWithInteractionAddress,
-          ConflictingNameContractArtifact
-        )
-        expect(await contract.number()).to.eq(BigInt(5))
-
-        // expect contract is labeled
-        checkLabeled(
-          conflictingNameContractWithInteractionAddress,
-          'contracts/test/conflictingNameContracts/First.sol:ConflictingNameContract'
+        // Check that the `CREATE3` proxy is not labeled.
+        const create3ProxyAddress = ethers.getCreate2Address(
+          DETERMINISTIC_DEPLOYMENT_PROXY_ADDRESS,
+          ethers.zeroPadValue('0x01', 32), // Salt is `bytes32(uint(1))`
+          ethers.keccak256(CREATE3_PROXY_INITCODE)
         )
+        checkNotLabeled(create3ProxyAddress)
       })
     })
   })
@@ -730,9 +541,6 @@ describe('Deployment Cases', () => {
         'ConstructorDeploysContract.json',
         'ConstructorDeploysContract_1.json',
         'DeployedInConstructor_1.json',
-        'ConstructorDeploysContract_2.json',
-        'ConflictingNameContract.json',
-        'ConflictingNameContract_1.json',
       ]
     )
   })
diff --git a/packages/plugins/test/mocha/common.ts b/packages/plugins/test/mocha/common.ts
index 4c23b200d..e34feb903 100644
--- a/packages/plugins/test/mocha/common.ts
+++ b/packages/plugins/test/mocha/common.ts
@@ -355,7 +355,6 @@ export const makeDeployment = async (
     await ensureSphinxAndGnosisSafeDeployed(provider, wallet, executionMode)
 
     const deploymentInfo: DeploymentInfo = {
-      labels: [],
       safeAddress,
       moduleAddress,
       safeInitData: getGnosisSafeInitializerData(ownerAddresses, threshold),