diff --git a/lib/Echidna/Exec.hs b/lib/Echidna/Exec.hs
index 7c9bdb240..c7495f904 100644
--- a/lib/Echidna/Exec.hs
+++ b/lib/Echidna/Exec.hs
@@ -31,12 +31,12 @@ import EVM.Types hiding (Env)
 
 import Echidna.Events (emptyEvents)
 import Echidna.RPC (safeFetchContractFrom, safeFetchSlotFrom)
+import Echidna.SourceMapping (lookupUsingCodehashOrInsert)
 import Echidna.Symbolic (forceBuf)
 import Echidna.Transaction
 import Echidna.Types (ExecException(..), Gas, fromEVM, emptyAccount)
 import Echidna.Types.Config (Env(..), EConfig(..), UIConf(..), OperationMode(..), OutputFormat(Text))
 import Echidna.Types.Coverage (CoverageInfo)
-import Echidna.Types.CodehashMap (lookupUsingCodehashOrInsert)
 import Echidna.Types.Solidity (SolConf(..))
 import Echidna.Types.Tx (TxCall(..), Tx, TxResult(..), call, dst, initialTimestamp, initialBlockNumber, getResult)
 import Echidna.Utility (getTimestamp, timePrefix)
diff --git a/lib/Echidna/Types/CodehashMap.hs b/lib/Echidna/SourceMapping.hs
similarity index 99%
rename from lib/Echidna/Types/CodehashMap.hs
rename to lib/Echidna/SourceMapping.hs
index 50c02a314..e0c476d85 100644
--- a/lib/Echidna/Types/CodehashMap.hs
+++ b/lib/Echidna/SourceMapping.hs
@@ -1,4 +1,4 @@
-module Echidna.Types.CodehashMap where
+module Echidna.SourceMapping where
 
 import Control.Applicative ((<|>))
 import Data.ByteString (ByteString)
diff --git a/lib/Echidna/Transaction.hs b/lib/Echidna/Transaction.hs
index 7b8d0b347..3a5dc528e 100644
--- a/lib/Echidna/Transaction.hs
+++ b/lib/Echidna/Transaction.hs
@@ -24,9 +24,9 @@ import EVM.Types hiding (Env, VMOpts(timestamp, gasprice))
 
 import Echidna.ABI
 import Echidna.Orphans.JSON ()
+import Echidna.SourceMapping (lookupUsingCodehash)
 import Echidna.Symbolic (forceWord, forceAddr)
 import Echidna.Types (fromEVM)
-import Echidna.Types.CodehashMap (lookupUsingCodehash)
 import Echidna.Types.Config (Env(..), EConfig(..))
 import Echidna.Types.Random
 import Echidna.Types.Signature
diff --git a/lib/Echidna/Types/Config.hs b/lib/Echidna/Types/Config.hs
index b85d4f4a0..0f2dc39d5 100644
--- a/lib/Echidna/Types/Config.hs
+++ b/lib/Echidna/Types/Config.hs
@@ -12,8 +12,8 @@ import Data.Word (Word64)
 import EVM.Dapp (DappInfo)
 import EVM.Types (Addr, Contract, W256)
 
+import Echidna.SourceMapping (CodehashMap)
 import Echidna.Types.Campaign (CampaignConf, CampaignEvent)
-import Echidna.Types.CodehashMap (CodehashMap)
 import Echidna.Types.Corpus (Corpus)
 import Echidna.Types.Coverage (CoverageMap)
 import Echidna.Types.Solidity (SolConf)