diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index c4f4ebe6b7028e8d79afa999d5685d0a1f9ee266..f84055191bb2a08d1fe59117c82ae3f6befe3781 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -134,13 +134,9 @@ func remoteConsole(ctx *cli.Context) error {
 				path = filepath.Join(path, "rinkeby")
 			} else if ctx.GlobalBool(utils.GoerliFlag.Name) {
 				path = filepath.Join(path, "goerli")
-			} else if ctx.GlobalBool(utils.MumbaiFlag.Name) {
+			} else if (ctx.GlobalBool(utils.MumbaiFlag.Name) || ctx.GlobalBool(utils.BorMainnetFlag.Name)) {
 				homeDir, _ := os.UserHomeDir()
 				path = filepath.Join(homeDir, "/.bor/data")
-			} else if ctx.GlobalBool(utils.BorMainnetFlag.Name) {
-				homeDir, _ := os.UserHomeDir()
-				path = filepath.Join(homeDir, "/.bor/data")
-			}
 		}
 		endpoint = fmt.Sprintf("%s/geth.ipc", path)
 	}
diff --git a/core/allocs/bormainnet.json b/core/allocs/bor_mainnet.json
similarity index 100%
rename from core/allocs/bormainnet.json
rename to core/allocs/bor_mainnet.json
diff --git a/core/genesis.go b/core/genesis.go
index 1057a9b793c2e97e88a4a209c8ed86517edcc573..278879777f9b917cfc443e613e877220170a3935 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -429,7 +429,7 @@ func DefaultBorMainnetGenesisBlock() *Genesis {
 		Difficulty: big.NewInt(1),
 		Mixhash:    common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"),
 		Coinbase:   common.HexToAddress("0x0000000000000000000000000000000000000000"),
-		Alloc:      readPrealloc("allocs/bormainnet.json"),
+		Alloc:      readPrealloc("allocs/bor_mainnet.json"),
 		Number:     0x0,
 		GasUsed:    0x0,
 		ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"),