From 8a0afb04f98a0f65c32ff526b41cc3555c0330a5 Mon Sep 17 00:00:00 2001
From: Scorbajio <indigophi@protonmail.com>
Date: Sun, 8 Sep 2024 11:00:09 -0700
Subject: [PATCH] Rename DefaultStateManager to MerkleStateManager (#3641)

* Rename DefaultStateManager to MerkleStateManager

* Make naming change consistent throughout monorepo

* Rename DefaultSateManagerOpts to MerkleStateManagerOpts

* Rename stateManager.ts to merkleStateManager.ts

* Fix lint issues

* Update packages/statemanager/test/statelessVerkleStateManager.spec.ts

* statemanager: cleanup

---------

Co-authored-by: Gabriel Rocheleau <contact@rockwaterweb.com>
---
 packages/client/src/execution/vmexecution.ts  | 10 +--
 .../client/src/sync/fetcher/accountfetcher.ts |  8 +--
 .../src/sync/fetcher/bytecodefetcher.ts       |  8 +--
 .../client/src/sync/fetcher/storagefetcher.ts |  8 +--
 .../src/sync/fetcher/trienodefetcher.ts       |  8 +--
 packages/client/src/sync/snapsync.ts          |  4 +-
 packages/client/src/types.ts                  |  4 +-
 packages/client/src/util/debug.ts             |  4 +-
 .../integration/fullethereumservice.spec.ts   | 14 ++--
 packages/client/test/miner/miner.spec.ts      |  4 +-
 .../client/test/miner/pendingBlock.spec.ts    |  4 +-
 .../engine/getPayloadBodiesByHashV1.spec.ts   | 26 +++----
 .../engine/getPayloadBodiesByRangeV1.spec.ts  | 10 +--
 .../test/rpc/engine/getPayloadV3.spec.ts      | 14 ++--
 .../test/rpc/eth/sendRawTransaction.spec.ts   | 50 ++++++-------
 packages/client/test/sim/snapsync.spec.ts     |  6 +-
 packages/client/test/sync/txpool.spec.ts      | 10 +--
 packages/evm/examples/browser.html            |  4 +-
 packages/evm/examples/withBlockchain.ts       |  4 +-
 packages/statemanager/examples/basicUsage.ts  |  4 +-
 packages/statemanager/examples/browser.html   |  4 +-
 .../examples/fromProofInstantiation.ts        |  6 +-
 packages/statemanager/src/index.ts            |  2 +-
 ...{stateManager.ts => merkleStateManager.ts} | 22 +++---
 .../src/statelessVerkleStateManager.ts        |  4 +-
 packages/statemanager/src/types.ts            |  2 +-
 .../test/checkpointing.account.spec.ts        |  4 +-
 .../test/checkpointing.code.spec.ts           | 70 +++++++++----------
 .../test/checkpointing.storage.spec.ts        |  4 +-
 .../test/proofStateManager.spec.ts            | 20 +++---
 .../statemanager/test/rpcStateManager.spec.ts | 10 +--
 .../test/stateManager.account.spec.ts         | 14 ++--
 .../test/stateManager.code.spec.ts            | 18 ++---
 .../statemanager/test/stateManager.spec.ts    | 30 ++++----
 .../test/stateManager.storage.spec.ts         | 16 ++---
 .../test/statelessVerkleStateManager.spec.ts  |  2 +
 packages/statemanager/test/vmState.spec.ts    | 10 +--
 packages/vm/benchmarks/util.ts                |  6 +-
 packages/vm/src/constructors.ts               |  4 +-
 packages/vm/test/api/index.spec.ts            |  8 +--
 packages/vm/test/api/runBlock.spec.ts         | 12 ++--
 .../vm/test/api/state/accountExists.spec.ts   |  4 +-
 .../tester/runners/BlockchainTestsRunner.ts   |  4 +-
 .../tester/runners/GeneralStateTestsRunner.ts |  4 +-
 44 files changed, 243 insertions(+), 241 deletions(-)
 rename packages/statemanager/src/{stateManager.ts => merkleStateManager.ts} (98%)

diff --git a/packages/client/src/execution/vmexecution.ts b/packages/client/src/execution/vmexecution.ts
index c601e98700..37c063747a 100644
--- a/packages/client/src/execution/vmexecution.ts
+++ b/packages/client/src/execution/vmexecution.ts
@@ -10,7 +10,7 @@ import { getGenesis } from '@ethereumjs/genesis'
 import {
   CacheType,
   Caches,
-  DefaultStateManager,
+  MerkleStateManager,
   StatelessVerkleStateManager,
 } from '@ethereumjs/statemanager'
 import { createTrie } from '@ethereumjs/trie'
@@ -161,7 +161,7 @@ export class VMExecution extends Execution {
     this.config.logger.info(`Initializing code cache size=${this.config.codeCache}`)
     this.config.logger.info(`Initializing trie cache size=${this.config.trieCache}`)
 
-    const stateManager = new DefaultStateManager({
+    const stateManager = new MerkleStateManager({
       trie,
       prefixStorageTrieKeys: this.config.prefixStorageTrieKeys,
       caches: new Caches({
@@ -683,7 +683,7 @@ export class VMExecution extends Execution {
                     (!this.config.execCommon.gteHardfork(Hardfork.Osaka) &&
                       typeof this.vm.stateManager.initVerkleExecutionWitness === 'function') ||
                     (this.config.execCommon.gteHardfork(Hardfork.Osaka) &&
-                      this.vm.stateManager instanceof DefaultStateManager)
+                      this.vm.stateManager instanceof MerkleStateManager)
                   ) {
                     throw Error(
                       `Invalid vm stateManager type=${typeof this.vm.stateManager} for fork=${
@@ -1028,8 +1028,8 @@ export class VMExecution extends Execution {
   }
 
   stats() {
-    if (this._statsVM instanceof DefaultStateManager) {
-      const sm = this._statsVM.stateManager as DefaultStateManager
+    if (this._statsVM instanceof MerkleStateManager) {
+      const sm = this._statsVM.stateManager as MerkleStateManager
       const deactivatedStats = { size: 0, reads: 0, hits: 0, writes: 0 }
       let stats
       stats = sm['_caches']?.account?.stats() ?? deactivatedStats
diff --git a/packages/client/src/sync/fetcher/accountfetcher.ts b/packages/client/src/sync/fetcher/accountfetcher.ts
index 197aae3659..49cea99859 100644
--- a/packages/client/src/sync/fetcher/accountfetcher.ts
+++ b/packages/client/src/sync/fetcher/accountfetcher.ts
@@ -1,4 +1,4 @@
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { verifyTrieRangeProof } from '@ethereumjs/trie'
 import {
   BIGINT_0,
@@ -54,7 +54,7 @@ export interface AccountFetcherOptions extends FetcherOptions {
   /** Destroy fetcher once all tasks are done */
   destroyWhenDone?: boolean
 
-  stateManager?: DefaultStateManager
+  stateManager?: MerkleStateManager
 
   fetcherDoneFlags?: SnapFetcherDoneFlags
 }
@@ -69,7 +69,7 @@ export type JobTask = {
 
 export class AccountFetcher extends Fetcher<JobTask, AccountData[], AccountData> {
   protected debug: Debugger
-  stateManager: DefaultStateManager
+  stateManager: MerkleStateManager
   accountTrie: Trie
 
   root: Uint8Array
@@ -96,7 +96,7 @@ export class AccountFetcher extends Fetcher<JobTask, AccountData[], AccountData>
     this.first = options.first
     this.count = options.count ?? BIGINT_2EXP256 - this.first
 
-    this.stateManager = options.stateManager ?? new DefaultStateManager()
+    this.stateManager = options.stateManager ?? new MerkleStateManager()
     this.accountTrie = this.stateManager['_getAccountTrie']()
 
     this.debug = debugDefault('client:AccountFetcher')
diff --git a/packages/client/src/sync/fetcher/bytecodefetcher.ts b/packages/client/src/sync/fetcher/bytecodefetcher.ts
index a5868d92e9..06507f70cb 100644
--- a/packages/client/src/sync/fetcher/bytecodefetcher.ts
+++ b/packages/client/src/sync/fetcher/bytecodefetcher.ts
@@ -1,4 +1,4 @@
-import { CODEHASH_PREFIX, DefaultStateManager } from '@ethereumjs/statemanager'
+import { CODEHASH_PREFIX, MerkleStateManager } from '@ethereumjs/statemanager'
 import {
   BIGINT_0,
   bytesToHex,
@@ -26,7 +26,7 @@ type ByteCodeDataResponse = Uint8Array[] & { completed?: boolean }
  */
 export interface ByteCodeFetcherOptions extends FetcherOptions {
   hashes: Uint8Array[]
-  stateManager?: DefaultStateManager
+  stateManager?: MerkleStateManager
   fetcherDoneFlags?: SnapFetcherDoneFlags
 
   /** Destroy fetcher once all tasks are done */
@@ -40,7 +40,7 @@ export type JobTask = {
 
 export class ByteCodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array> {
   protected debug: Debugger
-  stateManager: DefaultStateManager
+  stateManager: MerkleStateManager
   fetcherDoneFlags: SnapFetcherDoneFlags
   codeDB: DB
 
@@ -54,7 +54,7 @@ export class ByteCodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
   constructor(options: ByteCodeFetcherOptions) {
     super(options)
     this.hashes = options.hashes ?? []
-    this.stateManager = options.stateManager ?? new DefaultStateManager()
+    this.stateManager = options.stateManager ?? new MerkleStateManager()
     this.fetcherDoneFlags = options.fetcherDoneFlags ?? getInitFetcherDoneFlags()
     this.fetcherDoneFlags.byteCodeFetcher.count = BigInt(this.hashes.length)
     this.codeDB = this.stateManager['_getCodeDB']()
diff --git a/packages/client/src/sync/fetcher/storagefetcher.ts b/packages/client/src/sync/fetcher/storagefetcher.ts
index 2dfb3fda22..ccee112da2 100644
--- a/packages/client/src/sync/fetcher/storagefetcher.ts
+++ b/packages/client/src/sync/fetcher/storagefetcher.ts
@@ -1,4 +1,4 @@
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { verifyTrieRangeProof } from '@ethereumjs/trie'
 import {
   BIGINT_0,
@@ -56,7 +56,7 @@ export interface StorageFetcherOptions extends FetcherOptions {
   /** Destroy fetcher once all tasks are done */
   destroyWhenDone?: boolean
 
-  stateManager: DefaultStateManager
+  stateManager: MerkleStateManager
 
   fetcherDoneFlags: SnapFetcherDoneFlags
 }
@@ -69,7 +69,7 @@ export type JobTask = {
 export class StorageFetcher extends Fetcher<JobTask, StorageData[][], StorageData[]> {
   protected debug: Debugger
   root: Uint8Array
-  stateManager: DefaultStateManager
+  stateManager: MerkleStateManager
   fetcherDoneFlags: SnapFetcherDoneFlags
 
   /** The accounts to fetch storage data for */
@@ -88,7 +88,7 @@ export class StorageFetcher extends Fetcher<JobTask, StorageData[][], StorageDat
     this.fragmentedRequests = []
 
     this.root = options.root
-    this.stateManager = options.stateManager ?? new DefaultStateManager()
+    this.stateManager = options.stateManager ?? new MerkleStateManager()
     this.fetcherDoneFlags = options.fetcherDoneFlags ?? getInitFetcherDoneFlags()
     this.storageRequests = options.storageRequests ?? []
     this.fetcherDoneFlags.storageFetcher.count = BigInt(this.storageRequests.length)
diff --git a/packages/client/src/sync/fetcher/trienodefetcher.ts b/packages/client/src/sync/fetcher/trienodefetcher.ts
index 3de2489112..853ad27646 100644
--- a/packages/client/src/sync/fetcher/trienodefetcher.ts
+++ b/packages/client/src/sync/fetcher/trienodefetcher.ts
@@ -1,4 +1,4 @@
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import {
   BranchNode,
   ExtensionNode,
@@ -38,7 +38,7 @@ type TrieNodesResponse = Uint8Array[] & { completed?: boolean }
 export interface TrieNodeFetcherOptions extends FetcherOptions {
   root: Uint8Array
   accountToStorageTrie?: Map<String, Trie>
-  stateManager?: DefaultStateManager
+  stateManager?: MerkleStateManager
 
   /** Destroy fetcher once all tasks are done */
   destroyWhenDone?: boolean
@@ -69,7 +69,7 @@ export class TrieNodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
   protected debug: Debugger
   root: Uint8Array
 
-  stateManager: DefaultStateManager
+  stateManager: MerkleStateManager
   fetcherDoneFlags: SnapFetcherDoneFlags
   accountTrie: Trie
   codeDB: DB
@@ -105,7 +105,7 @@ export class TrieNodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
     this.requestedNodeToPath = new Map<string, string>()
     this.fetchedAccountNodes = new Map<string, FetchedNodeData>()
 
-    this.stateManager = options.stateManager ?? new DefaultStateManager()
+    this.stateManager = options.stateManager ?? new MerkleStateManager()
     this.accountTrie = this.stateManager['_getAccountTrie']()
     this.codeDB = this.stateManager['_getCodeDB']()
 
diff --git a/packages/client/src/sync/snapsync.ts b/packages/client/src/sync/snapsync.ts
index 529bd59a0a..17ec45aecd 100644
--- a/packages/client/src/sync/snapsync.ts
+++ b/packages/client/src/sync/snapsync.ts
@@ -12,7 +12,7 @@ import type { Peer } from '../net/peer/peer.js'
 import type { Skeleton } from '../service/skeleton.js'
 import type { SnapFetcherDoneFlags } from './fetcher/types.js'
 import type { SynchronizerOptions } from './sync.js'
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 
 interface SnapSynchronizerOptions extends SynchronizerOptions {
   /** Skeleton chain */
@@ -228,7 +228,7 @@ export class SnapSynchronizer extends Synchronizer {
       this.fetcher = new AccountFetcher({
         config: this.config,
         pool: this.pool,
-        stateManager: this.execution.vm.stateManager as DefaultStateManager,
+        stateManager: this.execution.vm.stateManager as MerkleStateManager,
         root: stateRoot,
         // This needs to be determined from the current state of the MPT dump
         first: BigInt(0),
diff --git a/packages/client/src/types.ts b/packages/client/src/types.ts
index 88f57fc494..aa5faab06c 100644
--- a/packages/client/src/types.ts
+++ b/packages/client/src/types.ts
@@ -4,7 +4,7 @@ import type { SyncMode } from './index.js'
 import type { Peer } from './net/peer/index.js'
 import type { Server } from './net/server/index.js'
 import type { Block, BlockHeader } from '@ethereumjs/block'
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 import type { Address } from '@ethereumjs/util'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type * as promClient from 'prom-client'
@@ -41,7 +41,7 @@ export interface EventParams {
   [Event.SYNC_FETCHED_BLOCKS]: [blocks: Block[]]
   [Event.SYNC_FETCHED_HEADERS]: [headers: BlockHeader[]]
   [Event.SYNC_SYNCHRONIZED]: [chainHeight: bigint]
-  [Event.SYNC_SNAPSYNC_COMPLETE]: [stateRoot: Uint8Array, stateManager: DefaultStateManager]
+  [Event.SYNC_SNAPSYNC_COMPLETE]: [stateRoot: Uint8Array, stateManager: MerkleStateManager]
   [Event.SYNC_ERROR]: [syncError: Error]
   [Event.SYNC_FETCHER_ERROR]: [fetchError: Error, task: any, peer: Peer | null | undefined]
   [Event.PEER_CONNECTED]: [connectedPeer: Peer]
diff --git a/packages/client/src/util/debug.ts b/packages/client/src/util/debug.ts
index 43d540c3bc..7c819871a4 100644
--- a/packages/client/src/util/debug.ts
+++ b/packages/client/src/util/debug.ts
@@ -30,7 +30,7 @@ import { Common } from '@ethereumjs/common'
 import { Block } from '@ethereumjs/block'
 import { VM, runBlock, createVM }  from './src'
 import { Trie } from '@ethereumjs/trie'
-import { DefaultStateManager } from './src/state'
+import { MerkleStateManager } from './src/state'
 import { Blockchain } from '@ethereumjs/blockchain'
 
 const main = async () => {
@@ -41,7 +41,7 @@ const main = async () => {
 
   const stateDB = new Level('${execution.config.getDataDirectory(DataDirectory.State)}')
   const trie = new Trie({ db: stateDB, useKeyHashing: true })
-  const stateManager = new DefaultStateManager({ trie, common })
+  const stateManager = new MerkleStateManager({ trie, common })
   // Ensure we run on the right root
   stateManager.setStateRoot(hexToBytes('${bytesToHex(
     await execution.vm.stateManager.getStateRoot(),
diff --git a/packages/client/test/integration/fullethereumservice.spec.ts b/packages/client/test/integration/fullethereumservice.spec.ts
index d72de32016..064a4ef010 100644
--- a/packages/client/test/integration/fullethereumservice.spec.ts
+++ b/packages/client/test/integration/fullethereumservice.spec.ts
@@ -1,7 +1,7 @@
 import { createBlock } from '@ethereumjs/block'
 import { createBlockchain } from '@ethereumjs/blockchain'
 import { Hardfork } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createFeeMarket1559TxFromRLP } from '@ethereumjs/tx'
 import { Account, bytesToHex, equalsBytes, hexToBytes, toBytes } from '@ethereumjs/util'
 import * as td from 'testdouble'
@@ -18,10 +18,10 @@ import { destroy } from './util.js'
 const config = new Config({ accountCache: 10000, storageCache: 1000 })
 
 // Stub out setStateRoot since correct state root doesn't exist in mock state.
-const ogSetStateRoot = DefaultStateManager.prototype.setStateRoot
-DefaultStateManager.prototype.setStateRoot = (): any => {}
-const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-DefaultStateManager.prototype.shallowCopy = function () {
+const ogSetStateRoot = MerkleStateManager.prototype.setStateRoot
+MerkleStateManager.prototype.setStateRoot = (): any => {}
+const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+MerkleStateManager.prototype.shallowCopy = function () {
   return this
 }
 async function setup(): Promise<[MockServer, FullEthereumService]> {
@@ -128,6 +128,6 @@ describe('should handle LES requests', async () => {
   await destroy(server, service)
 
   // unstub setStateRoot
-  DefaultStateManager.prototype.setStateRoot = ogSetStateRoot
-  DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+  MerkleStateManager.prototype.setStateRoot = ogSetStateRoot
+  MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
 }, 30000)
diff --git a/packages/client/test/miner/miner.spec.ts b/packages/client/test/miner/miner.spec.ts
index e1f2dcf256..d4fd649b16 100644
--- a/packages/client/test/miner/miner.spec.ts
+++ b/packages/client/test/miner/miner.spec.ts
@@ -6,7 +6,7 @@ import {
   createCommonFromGethGenesis,
   createCustomCommon,
 } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createFeeMarket1559Tx, createLegacyTx } from '@ethereumjs/tx'
 import { Address, equalsBytes, hexToBytes } from '@ethereumjs/util'
 import { AbstractLevel } from 'abstract-level'
@@ -45,7 +45,7 @@ BlockHeader.prototype['_consensusFormatValidation'] = vi.fn()
 
 // Stub out setStateRoot so txPool.validate checks will pass since correct state root
 // doesn't exist in fakeChain state anyway
-DefaultStateManager.prototype.setStateRoot = vi.fn()
+MerkleStateManager.prototype.setStateRoot = vi.fn()
 
 class FakeChain {
   open() {}
diff --git a/packages/client/test/miner/pendingBlock.spec.ts b/packages/client/test/miner/pendingBlock.spec.ts
index ff23f8dd3b..da6ef97e8e 100644
--- a/packages/client/test/miner/pendingBlock.spec.ts
+++ b/packages/client/test/miner/pendingBlock.spec.ts
@@ -1,7 +1,7 @@
 import { BlockHeader, createBlockHeader } from '@ethereumjs/block'
 import { createBlockchain } from '@ethereumjs/blockchain'
 import { Common, Goerli, Hardfork, Mainnet, createCommonFromGethGenesis } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createBlob4844Tx, createFeeMarket1559Tx, createLegacyTx } from '@ethereumjs/tx'
 import {
   Account,
@@ -97,7 +97,7 @@ describe('[PendingBlock]', async () => {
     }
   })
 
-  DefaultStateManager.prototype.setStateRoot = vi.fn()
+  MerkleStateManager.prototype.setStateRoot = vi.fn()
 
   const createTx = (
     from = A,
diff --git a/packages/client/test/rpc/engine/getPayloadBodiesByHashV1.spec.ts b/packages/client/test/rpc/engine/getPayloadBodiesByHashV1.spec.ts
index a851b99500..94382757db 100644
--- a/packages/client/test/rpc/engine/getPayloadBodiesByHashV1.spec.ts
+++ b/packages/client/test/rpc/engine/getPayloadBodiesByHashV1.spec.ts
@@ -1,6 +1,6 @@
 import { createBlock, createBlockHeader } from '@ethereumjs/block'
 import { Hardfork } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createTxFromTxData } from '@ethereumjs/tx'
 import {
   Account,
@@ -32,10 +32,10 @@ describe(method, () => {
 
   it('call with valid parameters', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.setStateRoot = function (): any {}
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.setStateRoot = function (): any {}
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     const { chain, service, server, common } = await setupChain(genesisJSON, 'post-merge', {
@@ -108,16 +108,16 @@ describe(method, () => {
     assert.equal(res.result.length, 3, 'length of response matches number of block hashes sent')
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
   })
 
   it('call with valid parameters on pre-Shanghai block', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.setStateRoot = function (): any {}
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.setStateRoot = function (): any {}
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     const { chain, service, server, common } = await setupChain(
@@ -192,7 +192,7 @@ describe(method, () => {
     )
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
   })
 })
diff --git a/packages/client/test/rpc/engine/getPayloadBodiesByRangeV1.spec.ts b/packages/client/test/rpc/engine/getPayloadBodiesByRangeV1.spec.ts
index 75e11fbf2e..67b30b6ba0 100644
--- a/packages/client/test/rpc/engine/getPayloadBodiesByRangeV1.spec.ts
+++ b/packages/client/test/rpc/engine/getPayloadBodiesByRangeV1.spec.ts
@@ -1,6 +1,6 @@
 import { createBlock, createBlockHeader } from '@ethereumjs/block'
 import { Hardfork } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createTxFromTxData } from '@ethereumjs/tx'
 import { Account, bytesToHex, createAddressFromPrivateKey, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it, vi } from 'vitest'
@@ -30,8 +30,8 @@ describe(method, () => {
   })
 
   it('call with valid parameters', async () => {
-    DefaultStateManager.prototype.setStateRoot = vi.fn()
-    DefaultStateManager.prototype.shallowCopy = function () {
+    MerkleStateManager.prototype.setStateRoot = vi.fn()
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     const { chain, service, server, common } = await setupChain(genesisJSON, 'post-merge', {
@@ -112,8 +112,8 @@ describe(method, () => {
   })
 
   it('call with valid parameters on pre-Shanghai hardfork', async () => {
-    DefaultStateManager.prototype.setStateRoot = vi.fn()
-    DefaultStateManager.prototype.shallowCopy = function () {
+    MerkleStateManager.prototype.setStateRoot = vi.fn()
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     const { chain, service, server, common } = await setupChain(preShanghaiGenesisJSON, 'london', {
diff --git a/packages/client/test/rpc/engine/getPayloadV3.spec.ts b/packages/client/test/rpc/engine/getPayloadV3.spec.ts
index 28b4b69747..b7b2b1b0d4 100644
--- a/packages/client/test/rpc/engine/getPayloadV3.spec.ts
+++ b/packages/client/test/rpc/engine/getPayloadV3.spec.ts
@@ -1,5 +1,5 @@
 import { Hardfork } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createTxFromTxData } from '@ethereumjs/tx'
 import {
   Account,
@@ -61,10 +61,10 @@ describe(method, () => {
 
   it('call with known payload', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.setStateRoot = function (): any {}
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.setStateRoot = function (): any {}
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
 
@@ -131,7 +131,7 @@ describe(method, () => {
     assert.equal(commitments[0], bytesToHex(txCommitments[0]), 'commitment should match')
     assert.equal(blobs[0], bytesToHex(txBlobs[0]), 'blob should match')
 
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
   })
 })
diff --git a/packages/client/test/rpc/eth/sendRawTransaction.spec.ts b/packages/client/test/rpc/eth/sendRawTransaction.spec.ts
index 9a9247b199..4869d58313 100644
--- a/packages/client/test/rpc/eth/sendRawTransaction.spec.ts
+++ b/packages/client/test/rpc/eth/sendRawTransaction.spec.ts
@@ -1,6 +1,6 @@
 import { BlockHeader } from '@ethereumjs/block'
 import { Common, Hardfork, Mainnet, createCommonFromGethGenesis } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createBlob4844Tx, createFeeMarket1559TxFromRLP, createLegacyTx } from '@ethereumjs/tx'
 import {
   Account,
@@ -24,10 +24,10 @@ const method = 'eth_sendRawTransaction'
 describe(method, () => {
   it('call with valid arguments', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.setStateRoot = function (): any {}
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.setStateRoot = function (): any {}
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     // Unschedule any timestamp since tests are not configured for timestamps
@@ -66,14 +66,14 @@ describe(method, () => {
     )
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
   })
 
   it('send local tx with gasprice lower than minimum', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    DefaultStateManager.prototype.setStateRoot = (): any => {}
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    MerkleStateManager.prototype.setStateRoot = (): any => {}
     const syncTargetHeight = new Common({ chain: Mainnet }).hardforkBlock(Hardfork.London)
     const { rpc } = await baseSetup({ syncTargetHeight, includeVM: true })
 
@@ -94,13 +94,13 @@ describe(method, () => {
     )
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
   })
 
   it('call with invalid arguments: not enough balance', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    DefaultStateManager.prototype.setStateRoot = (): any => {}
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    MerkleStateManager.prototype.setStateRoot = (): any => {}
     const syncTargetHeight = new Common({ chain: Mainnet }).hardforkBlock(Hardfork.London)
     const { rpc } = await baseSetup({ syncTargetHeight, includeVM: true })
 
@@ -113,7 +113,7 @@ describe(method, () => {
     assert.ok(res.error.message.includes('insufficient balance'))
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
   })
 
   it('call with sync target height not set yet', async () => {
@@ -170,10 +170,10 @@ describe(method, () => {
 
   it('call with no peers', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    DefaultStateManager.prototype.setStateRoot = (): any => {}
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    MerkleStateManager.prototype.setStateRoot = (): any => {}
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.London })
@@ -204,16 +204,16 @@ describe(method, () => {
     assert.ok(res.error.message.includes('no peer connection available'))
 
     // Restore setStateRoot
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
   })
 
   it('blob EIP 4844 transaction', async () => {
     // Disable stateroot validation in TxPool since valid state root isn't available
-    const originalSetStateRoot = DefaultStateManager.prototype.setStateRoot
-    DefaultStateManager.prototype.setStateRoot = (): any => {}
-    const originalStateManagerCopy = DefaultStateManager.prototype.shallowCopy
-    DefaultStateManager.prototype.shallowCopy = function () {
+    const originalSetStateRoot = MerkleStateManager.prototype.setStateRoot
+    MerkleStateManager.prototype.setStateRoot = (): any => {}
+    const originalStateManagerCopy = MerkleStateManager.prototype.shallowCopy
+    MerkleStateManager.prototype.shallowCopy = function () {
       return this
     }
     // Disable block header consensus format validation
@@ -283,8 +283,8 @@ describe(method, () => {
     assert.ok(res2.error.message.includes('replacement blob gas too low'))
 
     // Restore stubbed out functionality
-    DefaultStateManager.prototype.setStateRoot = originalSetStateRoot
-    DefaultStateManager.prototype.shallowCopy = originalStateManagerCopy
+    MerkleStateManager.prototype.setStateRoot = originalSetStateRoot
+    MerkleStateManager.prototype.shallowCopy = originalStateManagerCopy
     BlockHeader.prototype['_consensusFormatValidation'] = consensusFormatValidation
   })
 })
diff --git a/packages/client/test/sim/snapsync.spec.ts b/packages/client/test/sim/snapsync.spec.ts
index 8b4a24a300..33d7c0e2f0 100644
--- a/packages/client/test/sim/snapsync.spec.ts
+++ b/packages/client/test/sim/snapsync.spec.ts
@@ -25,7 +25,7 @@ import {
 } from './simutils.js'
 
 import type { EthereumClient } from '../../src/client.js'
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 import type { PrefixedHexString } from '@ethereumjs/util'
 
 const client = Client.http({ port: 8545 })
@@ -43,7 +43,7 @@ let senderBalance = BigInt(customGenesisState[sender][0])
 let ejsClient: EthereumClient | null = null
 let beaconSyncRelayer: any = null
 let snapCompleted: Promise<unknown> | undefined = undefined
-let stateManager: DefaultStateManager | undefined = undefined
+let stateManager: MerkleStateManager | undefined = undefined
 
 // This account doesn't exist in the genesis so starting balance is zero
 const EOATransferToAccount = '0x3dA33B9A0894b908DdBb00d96399e506515A1009'
@@ -271,7 +271,7 @@ async function createSnapClient(
   const snapSyncCompletedPromise = new Promise((resolve) => {
     config.events.once(
       Event.SYNC_SNAPSYNC_COMPLETE,
-      (stateRoot: Uint8Array, stateManager: DefaultStateManager) =>
+      (stateRoot: Uint8Array, stateManager: MerkleStateManager) =>
         resolve([stateRoot, stateManager]),
     )
   })
diff --git a/packages/client/test/sync/txpool.spec.ts b/packages/client/test/sync/txpool.spec.ts
index b93d5e2f25..812dfe12fd 100644
--- a/packages/client/test/sync/txpool.spec.ts
+++ b/packages/client/test/sync/txpool.spec.ts
@@ -1,6 +1,6 @@
 import { createBlock } from '@ethereumjs/block'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { createAccessList2930Tx, createFeeMarket1559Tx } from '@ethereumjs/tx'
 import {
   Account,
@@ -106,7 +106,7 @@ const config = new Config({ accountCache: 10000, storageCache: 1000 })
 const handleTxs = async (
   txs: any[],
   failMessage: string,
-  stateManager?: DefaultStateManager,
+  stateManager?: MerkleStateManager,
   pool?: TxPool,
 ) => {
   if (pool === undefined) {
@@ -152,8 +152,8 @@ const handleTxs = async (
 }
 
 describe('[TxPool]', async () => {
-  const ogStateManagerSetStateRoot = DefaultStateManager.prototype.setStateRoot
-  DefaultStateManager.prototype.setStateRoot = (): any => {}
+  const ogStateManagerSetStateRoot = MerkleStateManager.prototype.setStateRoot
+  MerkleStateManager.prototype.setStateRoot = (): any => {}
 
   const A = {
     address: hexToBytes('0x0b90087d864e82a284dca15923f3776de6bb016f'),
@@ -884,5 +884,5 @@ describe('[TxPool]', async () => {
     pool.stop()
     pool.close()
   })
-  DefaultStateManager.prototype.setStateRoot = ogStateManagerSetStateRoot
+  MerkleStateManager.prototype.setStateRoot = ogStateManagerSetStateRoot
 })
diff --git a/packages/evm/examples/browser.html b/packages/evm/examples/browser.html
index 586f5f4561..7d60c4b90c 100644
--- a/packages/evm/examples/browser.html
+++ b/packages/evm/examples/browser.html
@@ -7,12 +7,12 @@
         import { Blockchain } from '@ethereumjs/blockchain'
         import { Chain, Common, Hardfork } from '@ethereumjs/common'
         import { EVM } from '@ethereumjs/evm'
-        import { DefaultStateManager } from '@ethereumjs/statemanager'
+        import { MerkleStateManager } from '@ethereumjs/statemanager'
         import { bytesToHex, hexToBytes } from '@ethereumjs/util'
 
         const main = async () => {
             const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.London })
-            const stateManager = new DefaultStateManager()
+            const stateManager = new MerkleStateManager()
             const blockchain = await Blockchain.create()
 
             const evm = await EVM.create({
diff --git a/packages/evm/examples/withBlockchain.ts b/packages/evm/examples/withBlockchain.ts
index 4bdda1dc48..89c0c45c6c 100644
--- a/packages/evm/examples/withBlockchain.ts
+++ b/packages/evm/examples/withBlockchain.ts
@@ -1,14 +1,14 @@
 import { createBlockchain } from '@ethereumjs/blockchain'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { createEVM } from '@ethereumjs/evm'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { bytesToHex, hexToBytes } from '@ethereumjs/util'
 
 import type { PrefixedHexString } from '@ethereumjs/util'
 
 const main = async () => {
   const common = new Common({ chain: Mainnet, hardfork: Hardfork.Shanghai })
-  const stateManager = new DefaultStateManager()
+  const stateManager = new MerkleStateManager()
   const blockchain = await createBlockchain()
 
   const evm = await createEVM({
diff --git a/packages/statemanager/examples/basicUsage.ts b/packages/statemanager/examples/basicUsage.ts
index 462e28b8cd..8dc4f38d63 100644
--- a/packages/statemanager/examples/basicUsage.ts
+++ b/packages/statemanager/examples/basicUsage.ts
@@ -1,8 +1,8 @@
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { Account, Address, hexToBytes } from '@ethereumjs/util'
 
 const main = async () => {
-  const stateManager = new DefaultStateManager()
+  const stateManager = new MerkleStateManager()
   const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
   const account = new Account(BigInt(0), BigInt(1000))
   await stateManager.checkpoint()
diff --git a/packages/statemanager/examples/browser.html b/packages/statemanager/examples/browser.html
index 0d0d377ce2..2fa2183759 100644
--- a/packages/statemanager/examples/browser.html
+++ b/packages/statemanager/examples/browser.html
@@ -5,11 +5,11 @@
     <title>EthereumJS Browser Examples</title>
     <script type="module">
         import { Account, Address } from '@ethereumjs/util'
-        import { DefaultStateManager } from '@ethereumjs/statemanager'
+        import { MerkleStateManager } from '@ethereumjs/statemanager'
         import { hexToBytes } from '@ethereumjs/util'
 
         const run = async () => {
-            const stateManager = new DefaultStateManager()
+            const stateManager = new MerkleStateManager()
             const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
             const account = new Account(BigInt(0), BigInt(1000))
             await stateManager.checkpoint()
diff --git a/packages/statemanager/examples/fromProofInstantiation.ts b/packages/statemanager/examples/fromProofInstantiation.ts
index 2e1117f9c8..581bfd5773 100644
--- a/packages/statemanager/examples/fromProofInstantiation.ts
+++ b/packages/statemanager/examples/fromProofInstantiation.ts
@@ -1,9 +1,9 @@
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { Address, hexToBytes } from '@ethereumjs/util'
 
 const main = async () => {
   // setup `stateManager` with some existing address
-  const stateManager = new DefaultStateManager()
+  const stateManager = new MerkleStateManager()
   const contractAddress = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
   const byteCode = hexToBytes('0x67ffffffffffffffff600160006000fb')
   const storageKey1 = hexToBytes(
@@ -21,7 +21,7 @@ const main = async () => {
 
   const proof = await stateManager.getProof(contractAddress)
   const proofWithStorage = await stateManager.getProof(contractAddress, [storageKey1, storageKey2])
-  const partialStateManager = await DefaultStateManager.fromProof(proof)
+  const partialStateManager = await MerkleStateManager.fromProof(proof)
 
   // To add more proof data, use `addProofData`
   await partialStateManager.addProofData(proofWithStorage)
diff --git a/packages/statemanager/src/index.ts b/packages/statemanager/src/index.ts
index b0059ad440..e78f2f24b0 100644
--- a/packages/statemanager/src/index.ts
+++ b/packages/statemanager/src/index.ts
@@ -1,7 +1,7 @@
 export * from './accessWitness.js'
 export * from './cache/index.js'
+export * from './merkleStateManager.js'
 export * from './rpcStateManager.js'
 export * from './simpleStateManager.js'
 export * from './statelessVerkleStateManager.js'
-export * from './stateManager.js'
 export * from './types.js'
diff --git a/packages/statemanager/src/stateManager.ts b/packages/statemanager/src/merkleStateManager.ts
similarity index 98%
rename from packages/statemanager/src/stateManager.ts
rename to packages/statemanager/src/merkleStateManager.ts
index 1bd2ae6869..61064e4311 100644
--- a/packages/statemanager/src/stateManager.ts
+++ b/packages/statemanager/src/merkleStateManager.ts
@@ -34,7 +34,7 @@ import { keccak256 } from 'ethereum-cryptography/keccak.js'
 import { OriginalStorageCache } from './cache/index.js'
 import { modifyAccountFields } from './util.js'
 
-import { CODEHASH_PREFIX, type DefaultStateManagerOpts } from './index.js'
+import { CODEHASH_PREFIX, type MerkleStateManagerOpts } from './index.js'
 
 import type { Caches, StorageProof } from './index.js'
 import type {
@@ -62,7 +62,7 @@ import type { Debugger } from 'debug'
  * package which might be an alternative to this implementation
  * for many basic use cases.
  */
-export class DefaultStateManager implements StateManagerInterface {
+export class MerkleStateManager implements StateManagerInterface {
   protected _debug: Debugger
   protected _caches?: Caches
 
@@ -93,7 +93,7 @@ export class DefaultStateManager implements StateManagerInterface {
   /**
    * Instantiate the StateManager interface.
    */
-  constructor(opts: DefaultStateManagerOpts = {}) {
+  constructor(opts: MerkleStateManagerOpts = {}) {
     // Skip DEBUG calls unless 'ethjs' included in environmental DEBUG variables
     // Additional window check is to prevent vite browser bundling (and potentially other) to break
     this.DEBUG =
@@ -598,16 +598,16 @@ export class DefaultStateManager implements StateManagerInterface {
    * @param proof Either a proof retrieved from `getProof`, or an array of those proofs
    * @param safe Whether or not to verify that the roots of the proof items match the reported roots
    * @param opts a dictionary of StateManager opts
-   * @returns A new DefaultStateManager with elements from the given proof included in its backing state trie
+   * @returns A new MerkleStateManager with elements from the given proof included in its backing state trie
    */
   static async fromProof(
     proof: Proof | Proof[],
     safe: boolean = false,
-    opts: DefaultStateManagerOpts = {},
-  ): Promise<DefaultStateManager> {
+    opts: MerkleStateManagerOpts = {},
+  ): Promise<MerkleStateManager> {
     if (Array.isArray(proof)) {
       if (proof.length === 0) {
-        return new DefaultStateManager(opts)
+        return new MerkleStateManager(opts)
       } else {
         const trie =
           opts.trie ??
@@ -615,7 +615,7 @@ export class DefaultStateManager implements StateManagerInterface {
             proof[0].accountProof.map((e) => hexToBytes(e)),
             { useKeyHashing: true },
           ))
-        const sm = new DefaultStateManager({ ...opts, trie })
+        const sm = new MerkleStateManager({ ...opts, trie })
         const address = createAddressFromString(proof[0].address)
         await sm.addStorageProof(proof[0].storageProof, proof[0].storageHash, address, safe)
         for (let i = 1; i < proof.length; i++) {
@@ -626,7 +626,7 @@ export class DefaultStateManager implements StateManagerInterface {
         return sm
       }
     } else {
-      return DefaultStateManager.fromProof([proof], safe, opts)
+      return MerkleStateManager.fromProof([proof], safe, opts)
     }
   }
 
@@ -918,7 +918,7 @@ export class DefaultStateManager implements StateManagerInterface {
    * Cache values are generally not copied along regardless of the
    * `downlevelCaches` setting.
    */
-  shallowCopy(downlevelCaches = true): DefaultStateManager {
+  shallowCopy(downlevelCaches = true): MerkleStateManager {
     const common = this.common.copy()
     common.setHardfork(this.common.hardfork())
 
@@ -927,7 +927,7 @@ export class DefaultStateManager implements StateManagerInterface {
     const prefixCodeHashes = this._prefixCodeHashes
     const prefixStorageTrieKeys = this._prefixStorageTrieKeys
 
-    return new DefaultStateManager({
+    return new MerkleStateManager({
       common,
       trie,
       prefixStorageTrieKeys,
diff --git a/packages/statemanager/src/statelessVerkleStateManager.ts b/packages/statemanager/src/statelessVerkleStateManager.ts
index 94c988103c..12ec182ad0 100644
--- a/packages/statemanager/src/statelessVerkleStateManager.ts
+++ b/packages/statemanager/src/statelessVerkleStateManager.ts
@@ -32,7 +32,7 @@ import { modifyAccountFields } from './util.js'
 import type { AccessedStateWithAddress } from './accessWitness.js'
 import type { Caches } from './cache/index.js'
 import type { StatelessVerkleStateManagerOpts, VerkleState } from './index.js'
-import type { DefaultStateManager } from './stateManager.js'
+import type { MerkleStateManager } from './merkleStateManager.js'
 import type { AccountFields, Proof, StateManagerInterface } from '@ethereumjs/common'
 import type {
   Address,
@@ -122,7 +122,7 @@ export class StatelessVerkleStateManager implements StateManagerInterface {
       typeof window === 'undefined' ? (process?.env?.DEBUG?.includes('ethjs') ?? false) : false
   }
 
-  async getTransitionStateRoot(_: DefaultStateManager, __: Uint8Array): Promise<Uint8Array> {
+  async getTransitionStateRoot(_: MerkleStateManager, __: Uint8Array): Promise<Uint8Array> {
     throw Error('not implemented')
   }
 
diff --git a/packages/statemanager/src/types.ts b/packages/statemanager/src/types.ts
index a9051bc2e0..f351009def 100644
--- a/packages/statemanager/src/types.ts
+++ b/packages/statemanager/src/types.ts
@@ -30,7 +30,7 @@ export interface RPCStateManagerOpts extends BaseStateManagerOpts {
 /**
  * Options for constructing a {@link StateManager}.
  */
-export interface DefaultStateManagerOpts extends BaseStateManagerOpts {
+export interface MerkleStateManagerOpts extends BaseStateManagerOpts {
   /**
    * A {@link Trie} instance
    */
diff --git a/packages/statemanager/test/checkpointing.account.spec.ts b/packages/statemanager/test/checkpointing.account.spec.ts
index edc19c25f1..3829ea0f4f 100644
--- a/packages/statemanager/test/checkpointing.account.spec.ts
+++ b/packages/statemanager/test/checkpointing.account.spec.ts
@@ -1,7 +1,7 @@
 import { Address, createAccount, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { DefaultStateManager, SimpleStateManager } from '../src/index.js'
+import { MerkleStateManager, SimpleStateManager } from '../src/index.js'
 
 import type { StateManagerInterface } from '@ethereumjs/common'
 import type { Account } from '@ethereumjs/util'
@@ -31,7 +31,7 @@ type CompareList = [Account | undefined, bigint | undefined]
 describe('StateManager -> Account Checkpointing', () => {
   const address = new Address(hexToBytes(`0x${'11'.repeat(20)}`))
 
-  const stateManagers = [DefaultStateManager, SimpleStateManager]
+  const stateManagers = [MerkleStateManager, SimpleStateManager]
 
   const accountN1: CompareList = [
     createAccount({
diff --git a/packages/statemanager/test/checkpointing.code.spec.ts b/packages/statemanager/test/checkpointing.code.spec.ts
index e53b39c109..2b1105442d 100644
--- a/packages/statemanager/test/checkpointing.code.spec.ts
+++ b/packages/statemanager/test/checkpointing.code.spec.ts
@@ -2,7 +2,7 @@ import { type StateManagerInterface } from '@ethereumjs/common'
 import { Account, Address, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { Caches, DefaultStateManager, SimpleStateManager } from '../src/index.js'
+import { Caches, MerkleStateManager, SimpleStateManager } from '../src/index.js'
 
 const codeEval = async (
   sm: StateManagerInterface,
@@ -18,7 +18,7 @@ const codeEval = async (
 describe('StateManager -> Code Checkpointing', () => {
   const address = new Address(hexToBytes(`0x${'11'.repeat(20)}`))
 
-  const stateManagers = [DefaultStateManager, SimpleStateManager]
+  const stateManagers = [MerkleStateManager, SimpleStateManager]
 
   const value = hexToBytes('0x01')
   const root = hexToBytes('0x5fe7f977e71dba2ea1a68e21057beebb9be2ac30c6410aa38d4f3fbe41dcffd2')
@@ -93,14 +93,14 @@ describe('StateManager -> Code Checkpointing', () => {
   for (const SM of stateManagers) {
     for (const c of codeSets) {
       it(`No CP -> C1 -> Flush() (-> C1)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
         }
 
-        if (SM === DefaultStateManager) {
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -119,8 +119,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`CP -> C1.1 -> Commit -> Flush() (-> C1.1)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -138,8 +138,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`CP -> C1.1 -> Revert -> Flush() (-> Undefined)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -160,8 +160,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> Commit -> Flush() (-> C1.1)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -180,8 +180,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> Revert -> Flush() (-> C1.1)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -200,8 +200,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> C1.2 -> Commit -> Flush() (-> C1.2)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -221,8 +221,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> C1.2 -> Commit -> C1.3 -> Flush() (-> C1.3)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -243,8 +243,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> C1.2 -> C1.3 -> Commit -> Flush() (-> C1.3)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -265,8 +265,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`CP -> C1.1 -> C1.2 -> Commit -> Flush() (-> C1.2)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -286,8 +286,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`CP -> C1.1 -> C1.2 -> Revert -> Flush() (-> Undefined)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -308,8 +308,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it(`C1.1 -> CP -> C1.2 -> Revert -> Flush() (-> C1.1)`, async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -329,8 +329,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it('C1.1 -> CP -> C1.2 -> CP -> C1.3 -> Commit -> Commit -> Flush() (-> C1.3)', async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -353,8 +353,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it('C1.1 -> CP -> C1.2 -> CP -> C1.3 -> Commit -> Revert -> Flush() (-> C1.1)', async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -377,8 +377,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it('C1.1 -> CP -> C1.2 -> CP -> C1.3 -> Revert -> Commit -> Flush() (-> C1.2)', async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -401,8 +401,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it('C1.1 -> CP -> C1.2 -> CP -> C1.3 -> Revert -> C1.4 -> Commit -> Flush() (-> C1.4)', async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
@@ -426,8 +426,8 @@ describe('StateManager -> Code Checkpointing', () => {
       })
 
       it('C1.1 -> CP -> C1.2 -> CP -> C1.3 -> Revert -> C1.4 -> CP -> C1.5 -> Commit -> Commit -> Flush() (-> C1.5)', async () => {
-        let sm: DefaultStateManager | SimpleStateManager
-        if (SM === DefaultStateManager) {
+        let sm: MerkleStateManager | SimpleStateManager
+        if (SM === MerkleStateManager) {
           sm = new SM({ caches: new Caches() })
         } else {
           sm = new SM()
diff --git a/packages/statemanager/test/checkpointing.storage.spec.ts b/packages/statemanager/test/checkpointing.storage.spec.ts
index cd8fbb999c..928790f6c7 100644
--- a/packages/statemanager/test/checkpointing.storage.spec.ts
+++ b/packages/statemanager/test/checkpointing.storage.spec.ts
@@ -1,7 +1,7 @@
 import { Account, Address, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { DefaultStateManager, SimpleStateManager } from '../src/index.js'
+import { MerkleStateManager, SimpleStateManager } from '../src/index.js'
 
 import type { StateManagerInterface } from '@ethereumjs/common'
 
@@ -25,7 +25,7 @@ describe('StateManager -> Storage Checkpointing', () => {
 
   const stateManagers = [
     {
-      SM: DefaultStateManager,
+      SM: MerkleStateManager,
       rootCheck: true,
     },
     {
diff --git a/packages/statemanager/test/proofStateManager.spec.ts b/packages/statemanager/test/proofStateManager.spec.ts
index 3a1e2bef2e..ddc7636334 100644
--- a/packages/statemanager/test/proofStateManager.spec.ts
+++ b/packages/statemanager/test/proofStateManager.spec.ts
@@ -15,7 +15,7 @@ import {
 import { keccak256 } from 'ethereum-cryptography/keccak.js'
 import { assert, describe, it } from 'vitest'
 
-import { DefaultStateManager } from '../src/index.js'
+import { MerkleStateManager } from '../src/index.js'
 
 import * as ropsten_contractWithStorage from './testdata/ropsten_contractWithStorage.json'
 import * as ropsten_nonexistentAccount from './testdata/ropsten_nonexistentAccount.json'
@@ -28,7 +28,7 @@ describe('ProofStateManager', () => {
   it(`should return quantity-encoded RPC representation`, async () => {
     const address = createZeroAddress()
     const key = zeros(32)
-    const stateManager = new DefaultStateManager()
+    const stateManager = new MerkleStateManager()
 
     const proof = await stateManager.getProof(address, [key])
     assert.equal(proof.balance, '0x0', 'Balance is in quantity-encoded RPC representation')
@@ -38,7 +38,7 @@ describe('ProofStateManager', () => {
   it(`should correctly return the right storage root / account root`, async () => {
     const address = createZeroAddress()
     const key = zeros(32)
-    const stateManager = new DefaultStateManager()
+    const stateManager = new MerkleStateManager()
 
     await stateManager.putAccount(address, new Account(BigInt(100), BigInt(200)))
     const storageRoot = (await stateManager.getAccount(address))!.storageRoot
@@ -52,7 +52,7 @@ describe('ProofStateManager', () => {
   it(`should return quantity-encoded RPC representation for existing accounts`, async () => {
     const address = createZeroAddress()
     const key = zeros(32)
-    const stateManager = new DefaultStateManager()
+    const stateManager = new MerkleStateManager()
 
     const account = new Account()
     await stateManager.putAccount(address, account)
@@ -82,7 +82,7 @@ describe('ProofStateManager', () => {
     const key = zeros(32)
     const value = hexToBytes('0x0000aabb00')
     const code = hexToBytes('0x6000')
-    const stateManager = new DefaultStateManager()
+    const stateManager = new MerkleStateManager()
     await stateManager.checkpoint()
     await stateManager.putAccount(address, new Account())
     await stateManager.putStorage(address, key, value)
@@ -117,7 +117,7 @@ describe('ProofStateManager', () => {
     // Storage slots: empty list
     const address = createAddressFromString('0xc626553e7c821d0f8308c28d56c60e3c15f8d55a')
     const trie = await createTrie({ useKeyHashing: true })
-    const stateManager = new DefaultStateManager({ trie })
+    const stateManager = new MerkleStateManager({ trie })
     // Dump all the account proof data in the DB
     let stateRoot: Uint8Array | undefined
     for (const proofData of ropsten_validAccount.accountProof) {
@@ -141,7 +141,7 @@ describe('ProofStateManager', () => {
     // Storage slots: empty list
     const address = createAddressFromString('0x68268f12253f69f66b188c95b8106b2f847859fc')
     const trie = new Trie({ useKeyHashing: true })
-    const stateManager = new DefaultStateManager({ trie })
+    const stateManager = new MerkleStateManager({ trie })
     // Dump all the account proof data in the DB
     let stateRoot: Uint8Array | undefined
     for (const proofData of ropsten_nonexistentAccount.accountProof) {
@@ -165,7 +165,7 @@ describe('ProofStateManager', () => {
     // Note: block hash 0x1d9ea6981b8093a2b63f22f74426ceb6ba1acae3fddd7831442bbeba3fa4f146
     const address = createAddressFromString('0x2D80502854FC7304c3E3457084DE549f5016B73f')
     const trie = new Trie({ useKeyHashing: true })
-    const stateManager = new DefaultStateManager({ trie })
+    const stateManager = new MerkleStateManager({ trie })
     // Dump all the account proof data in the DB
     let stateRoot: Uint8Array | undefined
     for (const proofData of ropsten_contractWithStorage.accountProof) {
@@ -203,7 +203,7 @@ describe('ProofStateManager', () => {
     // Note: block hash 0x1d9ea6981b8093a2b63f22f74426ceb6ba1acae3fddd7831442bbeba3fa4f146
     const address = createAddressFromString('0x2D80502854FC7304c3E3457084DE549f5016B73f')
     const trie = new Trie({ useKeyHashing: true })
-    const stateManager = new DefaultStateManager({ trie })
+    const stateManager = new MerkleStateManager({ trie })
     // Dump all the account proof data in the DB
     let stateRoot: Uint8Array | undefined
     for (const proofData of ropsten_contractWithStorage.accountProof) {
@@ -269,7 +269,7 @@ describe('ProofStateManager', () => {
     // Note: block hash 0x1d9ea6981b8093a2b63f22f74426ceb6ba1acae3fddd7831442bbeba3fa4f146
     const address = createAddressFromString('0x68268f12253f69f66b188c95b8106b2f847859fc')
     const trie = new Trie({ useKeyHashing: true })
-    const stateManager = new DefaultStateManager({ trie })
+    const stateManager = new MerkleStateManager({ trie })
     // Dump all the account proof data in the DB
     let stateRoot: Uint8Array | undefined
     for (const proofData of ropsten_nonexistentAccount.accountProof) {
diff --git a/packages/statemanager/test/rpcStateManager.spec.ts b/packages/statemanager/test/rpcStateManager.spec.ts
index 6a60ee76e7..b684ffecf9 100644
--- a/packages/statemanager/test/rpcStateManager.spec.ts
+++ b/packages/statemanager/test/rpcStateManager.spec.ts
@@ -17,8 +17,8 @@ import {
 import { createVM, runBlock, runTx } from '@ethereumjs/vm'
 import { assert, describe, expect, it, vi } from 'vitest'
 
+import { MerkleStateManager } from '../src/merkleStateManager.js'
 import { RPCBlockChain, RPCStateManager } from '../src/rpcStateManager.js'
-import { DefaultStateManager } from '../src/stateManager.js'
 
 import * as blockData from './testdata/providerData/blocks/block0x7a120.json'
 import { getValues } from './testdata/providerData/mockProvider.js'
@@ -231,7 +231,7 @@ describe('runTx custom transaction test', () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.London })
 
     const state = new RPCStateManager({ provider, blockTag: 1n })
-    const vm = await createVM({ common, stateManager: <any>state }) // TODO fix the type DefaultStateManager back to StateManagerInterface in VM
+    const vm = await createVM({ common, stateManager: <any>state }) // TODO fix the type MerkleStateManager back to StateManagerInterface in VM
 
     const vitalikDotEth = createAddressFromString('0xd8da6bf26964af9d7eed9e03e53415d37aa96045')
     const privateKey = hexToBytes(
@@ -337,17 +337,17 @@ describe('blockchain', () =>
     )
   }))
 
-describe('Should return same value as DefaultStateManager when account does not exist', () => {
+describe('Should return same value as MerkleStateManager when account does not exist', () => {
   it('should work', async () => {
     const rpcState = new RPCStateManager({ provider, blockTag: 1n })
-    const defaultState = new DefaultStateManager()
+    const defaultState = new MerkleStateManager()
 
     const account0 = await rpcState.getAccount(new Address(hexToBytes(`0x${'01'.repeat(20)}`)))
     const account1 = await defaultState.getAccount(new Address(hexToBytes(`0x${'01'.repeat(20)}`)))
     assert.equal(
       account0,
       account1,
-      'Should return same value as DefaultStateManager when account does not exist',
+      'Should return same value as MerkleStateManager when account does not exist',
     )
   })
 })
diff --git a/packages/statemanager/test/stateManager.account.spec.ts b/packages/statemanager/test/stateManager.account.spec.ts
index 6d0e010253..c9c29104ae 100644
--- a/packages/statemanager/test/stateManager.account.spec.ts
+++ b/packages/statemanager/test/stateManager.account.spec.ts
@@ -1,14 +1,14 @@
 import { Address, KECCAK256_RLP, bytesToHex, equalsBytes, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { Caches, DefaultStateManager } from '../src/index.js'
+import { Caches, MerkleStateManager } from '../src/index.js'
 
 import { createAccountWithDefaults } from './util.js'
 
 describe('StateManager -> General/Account', () => {
   for (const accountCacheOpts of [{ size: 1000 }, { size: 0 }]) {
     it(`should set the state root to empty`, async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       assert.ok(equalsBytes(stateManager['_trie'].root(), KECCAK256_RLP), 'it has default root')
@@ -30,7 +30,7 @@ describe('StateManager -> General/Account', () => {
     })
 
     it(`should clear the cache when the state root is set`, async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -75,7 +75,7 @@ describe('StateManager -> General/Account', () => {
     })
 
     it('should put and get account, and add to the underlying cache if the account is not found', async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       const account = createAccountWithDefaults()
@@ -96,7 +96,7 @@ describe('StateManager -> General/Account', () => {
     })
 
     it(`should return undefined for a non-existent account`, async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -107,7 +107,7 @@ describe('StateManager -> General/Account', () => {
     })
 
     it(`should return undefined for an existent account`, async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       const account = createAccountWithDefaults(BigInt(0x1), BigInt(0x1))
@@ -121,7 +121,7 @@ describe('StateManager -> General/Account', () => {
     })
 
     it(`should modify account fields correctly`, async () => {
-      const stateManager = new DefaultStateManager({
+      const stateManager = new MerkleStateManager({
         caches: new Caches({ account: accountCacheOpts }),
       })
       const account = createAccountWithDefaults()
diff --git a/packages/statemanager/test/stateManager.code.spec.ts b/packages/statemanager/test/stateManager.code.spec.ts
index 02c563c92b..b1e1df410d 100644
--- a/packages/statemanager/test/stateManager.code.spec.ts
+++ b/packages/statemanager/test/stateManager.code.spec.ts
@@ -7,7 +7,7 @@ import {
 } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { Caches, DefaultStateManager } from '../src/index.js'
+import { Caches, MerkleStateManager } from '../src/index.js'
 
 import { createAccountWithDefaults } from './util.js'
 
@@ -28,10 +28,10 @@ describe('StateManager -> Code', () => {
         */
 
         // Setup
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
-        const codeStateManager = new DefaultStateManager({
+        const codeStateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address1 = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -88,7 +88,7 @@ describe('StateManager -> Code', () => {
       })
 
       it(`should set and get code`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -108,7 +108,7 @@ describe('StateManager -> Code', () => {
       })
 
       it(`should not get code if is not contract`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -123,7 +123,7 @@ describe('StateManager -> Code', () => {
       })
 
       it(`should set empty code`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -140,7 +140,7 @@ describe('StateManager -> Code', () => {
       })
 
       it(`should prefix codehashes by default`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
@@ -151,7 +151,7 @@ describe('StateManager -> Code', () => {
       })
 
       it(`should not prefix codehashes if prefixCodeHashes = false`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixCodeHashes: false,
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
@@ -166,7 +166,7 @@ describe('StateManager -> Code', () => {
       })
 
       it('putCode with empty code on existing address should correctly propagate', async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           caches: new Caches({ account: accountCacheOpts, code: codeCacheOpts }),
         })
         const address = createZeroAddress()
diff --git a/packages/statemanager/test/stateManager.spec.ts b/packages/statemanager/test/stateManager.spec.ts
index f3f466a8da..001a02f635 100644
--- a/packages/statemanager/test/stateManager.spec.ts
+++ b/packages/statemanager/test/stateManager.spec.ts
@@ -15,7 +15,7 @@ import {
 } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { CacheType, Caches, DefaultStateManager } from '../src/index.js'
+import { CacheType, Caches, MerkleStateManager } from '../src/index.js'
 
 import type { PrefixedHexString } from '@ethereumjs/util'
 
@@ -37,7 +37,7 @@ function verifyAccount(
 
 describe('StateManager -> General', () => {
   it(`should instantiate`, async () => {
-    const sm = new DefaultStateManager()
+    const sm = new MerkleStateManager()
 
     assert.deepEqual(sm['_trie'].root(), KECCAK256_RLP, 'it has default root')
     const res = await sm.getStateRoot()
@@ -45,7 +45,7 @@ describe('StateManager -> General', () => {
   })
 
   it('should not throw on getContractStorage() on non-existing accounts', async () => {
-    const sm = new DefaultStateManager()
+    const sm = new MerkleStateManager()
 
     try {
       const storage = await sm.getStorage(createZeroAddress(), zeros(32))
@@ -56,7 +56,7 @@ describe('StateManager -> General', () => {
   })
 
   it(`should clear contract storage`, async () => {
-    const sm = new DefaultStateManager()
+    const sm = new MerkleStateManager()
 
     const contractAddress = createAddressFromString('0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984')
     const contractCode = Uint8Array.from([0, 1, 2, 3])
@@ -80,7 +80,7 @@ describe('StateManager -> General', () => {
 
   it(`copy()`, async () => {
     const trie = new Trie({ cacheSize: 1000 })
-    let sm = new DefaultStateManager({
+    let sm = new MerkleStateManager({
       trie,
       prefixCodeHashes: false,
     })
@@ -92,7 +92,7 @@ describe('StateManager -> General', () => {
       'should retain non-default values',
     )
 
-    sm = new DefaultStateManager({
+    sm = new MerkleStateManager({
       trie,
       caches: new Caches({
         account: {
@@ -197,7 +197,7 @@ describe('StateManager -> General', () => {
     const state1 = stateSetup[address1Str] as MakeNonOptional<StateEntry>
     const state2 = stateSetup[address2Str] as MakeNonOptional<StateEntry>
 
-    const stateManager = new DefaultStateManager()
+    const stateManager = new MerkleStateManager()
 
     for (const [addressStr, entry] of Object.entries(stateSetup)) {
       const address = createAddressFromString(addressStr)
@@ -216,7 +216,7 @@ describe('StateManager -> General', () => {
 
     const proof1 = await stateManager.getProof(address1)
 
-    const partialStateManager = await DefaultStateManager.fromProof(proof1)
+    const partialStateManager = await MerkleStateManager.fromProof(proof1)
     let account1 = await partialStateManager.getAccount(address1)!
 
     verifyAccount(account1!, state1)
@@ -244,9 +244,9 @@ describe('StateManager -> General', () => {
     assert.ok(equalsBytes(stSlot1_2, new Uint8Array()))
 
     // Check Array support as input
-    const newPartialStateManager = await DefaultStateManager.fromProof([proof2, stProof])
+    const newPartialStateManager = await MerkleStateManager.fromProof([proof2, stProof])
 
-    async function postVerify(sm: DefaultStateManager) {
+    async function postVerify(sm: MerkleStateManager) {
       account1 = await sm.getAccount(address1)
       verifyAccount(account1!, state1)
 
@@ -269,7 +269,7 @@ describe('StateManager -> General', () => {
     await postVerify(newPartialStateManager)
 
     // Check: empty proof input
-    const newPartialStateManager2 = await DefaultStateManager.fromProof([])
+    const newPartialStateManager2 = await MerkleStateManager.fromProof([])
 
     try {
       await newPartialStateManager2.addProofData([proof2, stProof], true)
@@ -287,7 +287,7 @@ describe('StateManager -> General', () => {
     const zeroAddressProof = await stateManager.getProof(createZeroAddress())
 
     try {
-      await DefaultStateManager.fromProof([proof1, zeroAddressProof], true)
+      await MerkleStateManager.fromProof([proof1, zeroAddressProof], true)
       assert.fail('cannot reach this')
     } catch (e: any) {
       assert.ok(e.message.includes('proof does not have the expected trie root'))
@@ -306,7 +306,7 @@ describe('StateManager -> General', () => {
     'should create a statemanager fromProof with opts preserved',
     async () => {
       const trie = await createTrie({ useKeyHashing: false })
-      const sm = new DefaultStateManager({ trie })
+      const sm = new MerkleStateManager({ trie })
       const pk = hexToBytes('0x9f12aab647a25a81f821a5a0beec3330cd057b2346af4fb09d7a807e896701ea')
       const pk2 = hexToBytes('0x8724f27e2ce3714af01af3220478849db68a03c0f84edf1721d73d9a6139ad1c')
       const address = createAddressFromPrivateKey(pk)
@@ -327,7 +327,7 @@ describe('StateManager -> General', () => {
         proof.accountProof.map((e) => hexToBytes(e)),
         { useKeyHashing: false },
       )
-      const partialSM = await DefaultStateManager.fromProof([proof, proof2], true, {
+      const partialSM = await MerkleStateManager.fromProof([proof, proof2], true, {
         trie: newTrie,
       })
       assert.equal(
@@ -337,7 +337,7 @@ describe('StateManager -> General', () => {
       )
       assert.deepEqual(intToBytes(32), await partialSM.getStorage(address, hexToBytes(keys[0])))
       assert.equal((await partialSM.getAccount(address2))?.balance, 100n)
-      const partialSM2 = await DefaultStateManager.fromProof(proof, true, {
+      const partialSM2 = await MerkleStateManager.fromProof(proof, true, {
         trie: newTrie,
       })
       await partialSM2.addProofData(proof2, true)
diff --git a/packages/statemanager/test/stateManager.storage.spec.ts b/packages/statemanager/test/stateManager.storage.spec.ts
index f8a1fb48cc..1c0ded01f1 100644
--- a/packages/statemanager/test/stateManager.storage.spec.ts
+++ b/packages/statemanager/test/stateManager.storage.spec.ts
@@ -11,7 +11,7 @@ import {
 import { keccak256 } from 'ethereum-cryptography/keccak.js'
 import { assert, describe, it } from 'vitest'
 
-import { Caches, DefaultStateManager } from '../src/index.js'
+import { Caches, MerkleStateManager } from '../src/index.js'
 
 import { createAccountWithDefaults } from './util.js'
 
@@ -20,7 +20,7 @@ describe('StateManager -> Storage', () => {
   for (const storageCacheOpts of [{ size: 1000 }, { size: 0 }]) {
     for (const prefixStorageTrieKeys of [false, true]) {
       it.skipIf(isBrowser() === true)(`should dump storage`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
@@ -39,7 +39,7 @@ describe('StateManager -> Storage', () => {
       })
 
       it("should validate the key's length when modifying a contract's storage", async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
@@ -58,7 +58,7 @@ describe('StateManager -> Storage', () => {
       })
 
       it("should validate the key's length when reading a contract's storage", async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
@@ -77,7 +77,7 @@ describe('StateManager -> Storage', () => {
       })
 
       it(`should throw on storage values larger than 32 bytes`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
@@ -96,7 +96,7 @@ describe('StateManager -> Storage', () => {
       })
 
       it(`should strip zeros of storage values`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
@@ -129,7 +129,7 @@ describe('StateManager -> Storage', () => {
         const zeroLengths = [0, 1, 31, 32] // checks for arbitrary-length zeros
 
         for (const length of zeroLengths) {
-          const stateManager = new DefaultStateManager({
+          const stateManager = new MerkleStateManager({
             prefixStorageTrieKeys,
             caches: new Caches({ storage: storageCacheOpts }),
           })
@@ -152,7 +152,7 @@ describe('StateManager -> Storage', () => {
       })
 
       it(`should not strip trailing zeros`, async () => {
-        const stateManager = new DefaultStateManager({
+        const stateManager = new MerkleStateManager({
           prefixStorageTrieKeys,
           caches: new Caches({ storage: storageCacheOpts }),
         })
diff --git a/packages/statemanager/test/statelessVerkleStateManager.spec.ts b/packages/statemanager/test/statelessVerkleStateManager.spec.ts
index 5285f5c02a..ccb27178bd 100644
--- a/packages/statemanager/test/statelessVerkleStateManager.spec.ts
+++ b/packages/statemanager/test/statelessVerkleStateManager.spec.ts
@@ -128,7 +128,9 @@ describe('StatelessVerkleStateManager: Kaustinen Verkle Block', () => {
     const codeHashKey = getVerkleKey(stem, VerkleLeafType.CodeHash)
 
     const basicDataRaw = stateManager['_state'][bytesToHex(basicDataKey)]
+
     const basicData = decodeVerkleLeafBasicData(hexToBytes(basicDataRaw!))
+
     const codeHash = stateManager['_state'][bytesToHex(codeHashKey)]
 
     const account = await stateManager.getAccount(address)
diff --git a/packages/statemanager/test/vmState.spec.ts b/packages/statemanager/test/vmState.spec.ts
index 698a3196cc..64079ff27e 100644
--- a/packages/statemanager/test/vmState.spec.ts
+++ b/packages/statemanager/test/vmState.spec.ts
@@ -3,7 +3,7 @@ import { getGenesis } from '@ethereumjs/genesis'
 import { Account, Address, hexToBytes, utf8ToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { DefaultStateManager } from '../src/index.js'
+import { MerkleStateManager } from '../src/index.js'
 
 export function createAccount(nonce = BigInt(0), balance = BigInt(0xfff384)) {
   return new Account(nonce, balance)
@@ -12,7 +12,7 @@ export function createAccount(nonce = BigInt(0), balance = BigInt(0xfff384)) {
 // Hack to detect if running in browser or not
 const isBrowser = new Function('try {return this===window;}catch(e){ return false;}')
 
-const StateManager = DefaultStateManager
+const StateManager = MerkleStateManager
 
 describe('stateManager', () => {
   it(`should generate the genesis state root correctly for mainnet from common`, async () => {
@@ -22,7 +22,7 @@ describe('stateManager', () => {
     const expectedStateRoot = hexToBytes(
       '0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544',
     )
-    const stateManager = new StateManager({})
+    const stateManager = new StateManager()
 
     await stateManager.generateCanonicalGenesis(getGenesis(Chain.Mainnet))
     const stateRoot = await stateManager.getStateRoot()
@@ -47,7 +47,7 @@ describe('stateManager', () => {
     ]
 
     for (const [chain, expectedStateRoot] of chains) {
-      const stateManager = new DefaultStateManager({})
+      const stateManager = new MerkleStateManager()
 
       await stateManager.generateCanonicalGenesis(getGenesis(chain))
       const stateRoot = await stateManager.getStateRoot()
@@ -62,7 +62,7 @@ describe('stateManager', () => {
 })
 
 describe('Original storage cache', async () => {
-  const stateManager = new DefaultStateManager()
+  const stateManager = new MerkleStateManager()
 
   const address = new Address(hexToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
   const account = createAccount()
diff --git a/packages/vm/benchmarks/util.ts b/packages/vm/benchmarks/util.ts
index f346134417..aa533e08cc 100644
--- a/packages/vm/benchmarks/util.ts
+++ b/packages/vm/benchmarks/util.ts
@@ -10,7 +10,7 @@ import {
 } from '@ethereumjs/util'
 import { Common } from '@ethereumjs/common'
 import { Block } from '@ethereumjs/block'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { RunBlockResult } from '@ethereumjs/vm'
 import { Mockchain } from './mockchain.js'
 
@@ -34,8 +34,8 @@ export async function getPreState(
     [k: string]: StateTestPreAccount
   },
   common: Common,
-): Promise<DefaultStateManager> {
-  const state = new DefaultStateManager()
+): Promise<MerkleStateManager> {
+  const state = new MerkleStateManager()
   await state.checkpoint()
   for (const k in pre) {
     const address = new Address(hexToBytes(isHexString(k) ? k : `0x${k}`))
diff --git a/packages/vm/src/constructors.ts b/packages/vm/src/constructors.ts
index 5d42144d89..275fc6b4d0 100644
--- a/packages/vm/src/constructors.ts
+++ b/packages/vm/src/constructors.ts
@@ -1,6 +1,6 @@
 import { Common, Mainnet } from '@ethereumjs/common'
 import { EVMMockBlockchain, createEVM, getActivePrecompiles } from '@ethereumjs/evm'
-import { DefaultStateManager } from '@ethereumjs/statemanager'
+import { MerkleStateManager } from '@ethereumjs/statemanager'
 import { Account, Address, createAccount, unprefixedHexToBytes } from '@ethereumjs/util'
 
 import { VM } from './vm.js'
@@ -22,7 +22,7 @@ export async function createVM(opts: VMOpts = {}): Promise<VM> {
   }
 
   if (opts.stateManager === undefined) {
-    opts.stateManager = new DefaultStateManager({
+    opts.stateManager = new MerkleStateManager({
       common: opts.common,
     })
   }
diff --git a/packages/vm/test/api/index.spec.ts b/packages/vm/test/api/index.spec.ts
index 9d2ab80904..80cf4120eb 100644
--- a/packages/vm/test/api/index.spec.ts
+++ b/packages/vm/test/api/index.spec.ts
@@ -9,7 +9,7 @@ import * as testnetMerge from './testdata/testnetMerge.json'
 import { setupVM } from './utils.js'
 
 import type { ChainConfig } from '@ethereumjs/common'
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 
 /**
  * Tests for the main constructor API and
@@ -31,7 +31,7 @@ describe('VM -> basic instantiation / boolean switches', () => {
     const vm = await createVM()
     assert.ok(vm.stateManager)
     assert.deepEqual(
-      (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      (vm.stateManager as MerkleStateManager)['_trie'].root(),
       KECCAK256_RLP,
       'it has default trie',
     )
@@ -41,7 +41,7 @@ describe('VM -> basic instantiation / boolean switches', () => {
   it('should be able to activate precompiles', async () => {
     const vm = await createVM({ activatePrecompiles: true })
     assert.notDeepEqual(
-      (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      (vm.stateManager as MerkleStateManager)['_trie'].root(),
       KECCAK256_RLP,
       'it has different root',
     )
@@ -231,7 +231,7 @@ describe('VM -> setHardfork, blockchain', () => {
   it('should instantiate', async () => {
     const vm = await setupVM()
     assert.deepEqual(
-      (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      (vm.stateManager as MerkleStateManager)['_trie'].root(),
       KECCAK256_RLP,
       'it has default trie',
     )
diff --git a/packages/vm/test/api/runBlock.spec.ts b/packages/vm/test/api/runBlock.spec.ts
index 8aa7529057..e4f521058d 100644
--- a/packages/vm/test/api/runBlock.spec.ts
+++ b/packages/vm/test/api/runBlock.spec.ts
@@ -52,7 +52,7 @@ import type {
 } from '../../src/types.js'
 import type { Block, BlockBytes } from '@ethereumjs/block'
 import type { ChainConfig } from '@ethereumjs/common'
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 import type { AuthorizationListBytesItem, TypedTransaction } from '@ethereumjs/tx'
 import type { NestedUint8Array, PrefixedHexString } from '@ethereumjs/util'
 
@@ -69,14 +69,14 @@ describe('runBlock() -> successful API parameter usage', async () => {
     await setupPreConditions(vm.stateManager, testData)
 
     assert.deepEqual(
-      (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      (vm.stateManager as MerkleStateManager)['_trie'].root(),
       genesis.header.stateRoot,
       'genesis state root should match calculated state root',
     )
 
     const res = await runBlock(vm, {
       block,
-      root: (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      root: (vm.stateManager as MerkleStateManager)['_trie'].root(),
       skipBlockValidation: true,
       skipHardForkValidation: true,
     })
@@ -98,7 +98,7 @@ describe('runBlock() -> successful API parameter usage', async () => {
     const block1 = createBlockFromRLP(block1Rlp, { common })
     await runBlock(vm, {
       block: block1,
-      root: (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      root: (vm.stateManager as MerkleStateManager)['_trie'].root(),
       skipBlockValidation: true,
       skipHardForkValidation: true,
     })
@@ -108,7 +108,7 @@ describe('runBlock() -> successful API parameter usage', async () => {
     await runBlock(vm, {
       block: block2,
 
-      root: (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      root: (vm.stateManager as MerkleStateManager)['_trie'].root(),
       skipBlockValidation: true,
       skipHardForkValidation: true,
     })
@@ -118,7 +118,7 @@ describe('runBlock() -> successful API parameter usage', async () => {
     await runBlock(vm, {
       block: block3,
 
-      root: (vm.stateManager as DefaultStateManager)['_trie'].root(),
+      root: (vm.stateManager as MerkleStateManager)['_trie'].root(),
       skipBlockValidation: true,
       skipHardForkValidation: true,
     })
diff --git a/packages/vm/test/api/state/accountExists.spec.ts b/packages/vm/test/api/state/accountExists.spec.ts
index 2258a91d9f..932bc28835 100644
--- a/packages/vm/test/api/state/accountExists.spec.ts
+++ b/packages/vm/test/api/state/accountExists.spec.ts
@@ -4,7 +4,7 @@ import { assert, describe, it } from 'vitest'
 
 import { createVM } from '../../../src/index.js'
 
-import type { DefaultStateManager } from '@ethereumjs/statemanager'
+import type { MerkleStateManager } from '@ethereumjs/statemanager'
 
 describe('correctly apply new account gas fee on pre-Spurious Dragon hardforks', () => {
   it('should work', async () => {
@@ -71,7 +71,7 @@ describe('do not apply new account gas fee for empty account in DB on pre-Spurio
     const emptyAddress = new Address(hexToBytes('0xf48a1bdc65d9ccb4b569ffd4bffff415b90783d6'))
     await vm.stateManager.putAccount(emptyAddress, new Account())
     const emptyAccount = (await vm.stateManager.getAccount(emptyAddress)) as Account
-    await (vm.stateManager as DefaultStateManager)['_trie'].put(
+    await (vm.stateManager as MerkleStateManager)['_trie'].put(
       toBytes(emptyAddress),
       emptyAccount.serialize(),
     )
diff --git a/packages/vm/test/tester/runners/BlockchainTestsRunner.ts b/packages/vm/test/tester/runners/BlockchainTestsRunner.ts
index 553daaa9ff..de8623cc2d 100644
--- a/packages/vm/test/tester/runners/BlockchainTestsRunner.ts
+++ b/packages/vm/test/tester/runners/BlockchainTestsRunner.ts
@@ -3,7 +3,7 @@ import { EthashConsensus, createBlockchain } from '@ethereumjs/blockchain'
 import { ConsensusAlgorithm } from '@ethereumjs/common'
 import { Ethash } from '@ethereumjs/ethash'
 import { RLP } from '@ethereumjs/rlp'
-import { Caches, DefaultStateManager } from '@ethereumjs/statemanager'
+import { Caches, MerkleStateManager } from '@ethereumjs/statemanager'
 import { Trie } from '@ethereumjs/trie'
 import { createTxFromSerializedData } from '@ethereumjs/tx'
 import {
@@ -48,7 +48,7 @@ export async function runBlockchainTest(options: any, testData: any, t: tape.Tes
 
   let cacheDB = new MapDB()
   let state = new Trie({ useKeyHashing: true, common })
-  let stateManager = new DefaultStateManager({
+  let stateManager = new MerkleStateManager({
     caches: new Caches(),
     trie: state,
     common,
diff --git a/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts b/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts
index 2a81d85d39..310bb35a61 100644
--- a/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts
+++ b/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts
@@ -1,7 +1,7 @@
 import { Block } from '@ethereumjs/block'
 import { createBlockchain } from '@ethereumjs/blockchain'
 import { type InterpreterStep } from '@ethereumjs/evm'
-import { Caches, DefaultStateManager } from '@ethereumjs/statemanager'
+import { Caches, MerkleStateManager } from '@ethereumjs/statemanager'
 import { Trie } from '@ethereumjs/trie'
 import {
   Account,
@@ -80,7 +80,7 @@ async function runTestCase(options: any, testData: any, t: tape.Test) {
   const genesisBlock = new Block(undefined, undefined, undefined, undefined, { common })
   const blockchain = await createBlockchain({ genesisBlock, common })
   const state = new Trie({ useKeyHashing: true, common })
-  const stateManager = new DefaultStateManager({
+  const stateManager = new MerkleStateManager({
     caches: new Caches(),
     trie: state,
     common,