diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
index ac688e7df57..89a6931a5ed 100644
--- a/core/chaincode/chaincodetest.yaml
+++ b/core/chaincode/chaincodetest.yaml
@@ -435,14 +435,14 @@ ledger:
        # CouchDB request timeout (unit: duration, e.g. 20s)
        requestTimeout: 20s
 
-
-    # historyDatabase - options are true or false
-    # Indicates if the history of key updates should be stored in goleveldb
-    historyDatabase: true
-
     # Limit on the number of records to return per query
     queryLimit: 10000
 
+  history:
+    # enableHistoryDatabase - options are true or false
+    # Indicates if the history of key updates should be stored in goleveldb
+    enableHistoryDatabase: true
+
 
 ################################################################################
 #
diff --git a/core/ledger/kvledger/history/historydb/historyleveldb/historyleveldb_test.go b/core/ledger/kvledger/history/historydb/historyleveldb/historyleveldb_test.go
index f46573f43bf..77bf8409c06 100644
--- a/core/ledger/kvledger/history/historydb/historyleveldb/historyleveldb_test.go
+++ b/core/ledger/kvledger/history/historydb/historyleveldb/historyleveldb_test.go
@@ -195,7 +195,7 @@ func TestHistoryDisabled(t *testing.T) {
 	env := NewTestHistoryEnv(t)
 	defer env.cleanup()
 
-	viper.Set("ledger.state.historyDatabase", "false")
+	viper.Set("ledger.history.enableHistoryDatabase", "false")
 
 	//no need to pass blockstore into history executore, it won't be used in this test
 	qhistory, err := env.testHistoryDB.NewHistoryQueryExecutor(nil)
diff --git a/core/ledger/kvledger/history/historydb/historyleveldb/pkg_test.go b/core/ledger/kvledger/history/historydb/historyleveldb/pkg_test.go
index d04c4ef0f78..1068c82c076 100644
--- a/core/ledger/kvledger/history/historydb/historyleveldb/pkg_test.go
+++ b/core/ledger/kvledger/history/historydb/historyleveldb/pkg_test.go
@@ -45,7 +45,7 @@ type levelDBLockBasedHistoryEnv struct {
 
 func NewTestHistoryEnv(t *testing.T) *levelDBLockBasedHistoryEnv {
 
-	viper.Set("ledger.state.historyDatabase", "true")
+	viper.Set("ledger.history.enableHistoryDatabase", "true")
 
 	blockStorageTestEnv := newBlockStorageTestEnv(t)
 
diff --git a/core/ledger/ledgerconfig/ledger_config.go b/core/ledger/ledgerconfig/ledger_config.go
index 378c4a55560..a9ff636be94 100644
--- a/core/ledger/ledgerconfig/ledger_config.go
+++ b/core/ledger/ledgerconfig/ledger_config.go
@@ -99,7 +99,7 @@ func GetQueryLimit() int {
 
 //IsHistoryDBEnabled exposes the historyDatabase variable
 func IsHistoryDBEnabled() bool {
-	return viper.GetBool("ledger.state.historyDatabase")
+	return viper.GetBool("ledger.history.enableHistoryDatabase")
 }
 
 // IsQueryReadsHashingEnabled enables or disables computing of hash
diff --git a/core/ledger/ledgerconfig/ledger_config_test.go b/core/ledger/ledgerconfig/ledger_config_test.go
index bb866766845..3efd0c640d9 100644
--- a/core/ledger/ledgerconfig/ledger_config_test.go
+++ b/core/ledger/ledgerconfig/ledger_config_test.go
@@ -69,7 +69,7 @@ func TestIsHistoryDBEnabledDefault(t *testing.T) {
 func TestIsHistoryDBEnabledTrue(t *testing.T) {
 	setUpCoreYAMLConfig()
 	defer ledgertestutil.ResetConfigToDefaultValues()
-	viper.Set("ledger.state.historyDatabase", true)
+	viper.Set("ledger.history.enableHistoryDatabase", true)
 	updatedValue := IsHistoryDBEnabled()
 	testutil.AssertEquals(t, updatedValue, true) //test config returns true
 }
@@ -77,7 +77,7 @@ func TestIsHistoryDBEnabledTrue(t *testing.T) {
 func TestIsHistoryDBEnabledFalse(t *testing.T) {
 	setUpCoreYAMLConfig()
 	defer ledgertestutil.ResetConfigToDefaultValues()
-	viper.Set("ledger.state.historyDatabase", false)
+	viper.Set("ledger.history.enableHistoryDatabase", false)
 	updatedValue := IsHistoryDBEnabled()
 	testutil.AssertEquals(t, updatedValue, false) //test config returns false
 }
diff --git a/core/ledger/testutil/test_util.go b/core/ledger/testutil/test_util.go
index 145209c9521..aba2180ff06 100644
--- a/core/ledger/testutil/test_util.go
+++ b/core/ledger/testutil/test_util.go
@@ -84,7 +84,7 @@ func SetupCoreYAMLConfig(coreYamlPath string) {
 func ResetConfigToDefaultValues() {
 	//reset to defaults
 	viper.Set("ledger.state.stateDatabase", "goleveldb")
-	viper.Set("ledger.state.historyDatabase", false)
+	viper.Set("ledger.history.enableHistoryDatabase", false)
 }
 
 // SetLogLevel sets up log level
diff --git a/peer/core.yaml b/peer/core.yaml
index 40ceb288b81..45d34bc723f 100644
--- a/peer/core.yaml
+++ b/peer/core.yaml
@@ -394,9 +394,10 @@ ledger:
        # CouchDB request timeout (unit: duration, e.g. 20s)
        requestTimeout: 20s
 
-    # historyDatabase - options are true or false
-    # Indicates if the history of key updates should be stored in goleveldb
-    historyDatabase: true
-
     # Limit on the number of records to return per query
     queryLimit: 10000
+
+  history:
+    # enableHistoryDatabase - options are true or false
+    # Indicates if the history of key updates should be stored in goleveldb
+    enableHistoryDatabase: true