diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 643b88e614..744b7dd426 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -223,7 +223,7 @@ func initGenesis(ctx *cli.Context) error {
 		overrides.OverrideVerkle = &v
 	}
 
-	chaindb, err := stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, 0, 0, ctx.String(utils.AncientFlag.Name), ethconfig.DatabaseNamespace, false)
+	chaindb, err := stack.OpenDatabaseWithFreezer(ethconfig.ChainDbName, 0, 0, ctx.String(utils.AncientFlag.Name), ethconfig.ChainDbNamespace, false)
 	if err != nil {
 		utils.Fatalf("Failed to open database: %v", err)
 	}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index d3ff4db0c5..759997a289 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -2029,7 +2029,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.
 		}
 		chainDb = remotedb.New(client)
 	default:
-		chainDb, err = stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, cache, handles, ctx.String(AncientFlag.Name), ethconfig.DatabaseNamespace, readonly)
+		chainDb, err = stack.OpenDatabaseWithFreezer(ethconfig.ChainDbName, cache, handles, ctx.String(AncientFlag.Name), ethconfig.ChainDbNamespace, readonly)
 	}
 	if err != nil {
 		Fatalf("Could not open database: %v", err)
diff --git a/eth/backend.go b/eth/backend.go
index 697bfab633..1790e413fd 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -128,7 +128,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	}
 	log.Info("Allocated trie memory caches", "clean", common.StorageSize(config.TrieCleanCache)*1024*1024, "dirty", common.StorageSize(config.TrieDirtyCache)*1024*1024)
 
-	chainDb, err := stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, config.DatabaseCache, config.DatabaseHandles, config.DatabaseFreezer, ethconfig.DatabaseNamespace, false)
+	chainDb, err := stack.OpenDatabaseWithFreezer("chaindata", config.DatabaseCache, config.DatabaseHandles, config.DatabaseFreezer, "eth/db/chaindata/", false)
 	if err != nil {
 		return nil, err
 	}
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index 212d7fc340..c9acea8030 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -37,11 +37,11 @@ import (
 )
 
 const (
-	// DatabaseName is the name of the chain database
-	DatabaseName = "chaindata"
+	// ChainDbName is the name of the chain database
+	ChainDbName = "chaindata"
 
-	// DatabaseNamespace is the namespace for the chain database
-	DatabaseNamespace = "eth/db/chaindata/"
+	// ChainDbNamespace is the namespace for the chain database
+	ChainDbNamespace = "eth/db/chaindata/"
 )
 
 // FullNodeGPO contains default gasprice oracle settings for full node.