diff --git a/common/dbconnector.cpp b/common/dbconnector.cpp
index 740ecfa3e..9adfd737c 100755
--- a/common/dbconnector.cpp
+++ b/common/dbconnector.cpp
@@ -116,9 +116,9 @@ void SonicDBConfig::initializeGlobalConfig(const string &file)
                     key.netns = element["namespace"];
                 }
 
-                if (!element["database_name"].empty())
+                if (!element["container_name"].empty())
                 {
-                    key.containerName = element["database_name"];
+                    key.containerName = element["container_name"];
                 }
 
                 // If database_config.json is already initlized via SonicDBConfig::initialize
diff --git a/tests/main.cpp b/tests/main.cpp
index 8453bf27e..6cbaf251d 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -67,7 +67,8 @@ class SwsscommonEnvironment : public ::testing::Environment {
         }
         catch (exception &e)
         {
-            EXPECT_TRUE(strstr(e.what(), "Key invalid is not a valid key name in config file"));
+            // EXPECT_TRUE(strstr(e.what(), "Key :invalid invalid is not a valid key name in config file"));
+            EXPECT_STREQ(e.what(), "Key :invalid is not a valid key name in config file");
         }
 
         // reset SonicDBConfig, init should be false
diff --git a/tests/redis_multi_db_ut_config/database_global.json b/tests/redis_multi_db_ut_config/database_global.json
index 292d47a91..c8a8e331b 100644
--- a/tests/redis_multi_db_ut_config/database_global.json
+++ b/tests/redis_multi_db_ut_config/database_global.json
@@ -20,11 +20,11 @@
             "include" : "../redis_multi_db_ut_config/database_config3.json"
         },
         {
-            "database_name" : "dpu0",
+            "container_name" : "dpu0",
             "include" : "../redis_multi_db_ut_config/database_config4.json"
         },
         {
-            "database_name" : "dpu1",
+            "container_name" : "dpu1",
             "include" : "../redis_multi_db_ut_config/database_config5.json"
         }
     ],
diff --git a/tests/redis_multi_ns_ut.cpp b/tests/redis_multi_ns_ut.cpp
index ffb4084dc..ca379ecf1 100644
--- a/tests/redis_multi_ns_ut.cpp
+++ b/tests/redis_multi_ns_ut.cpp
@@ -69,9 +69,9 @@ TEST(DBConnector, multi_ns_test)
             }
             namespaces.insert(key.netns);
 
-            if (!element["database_name"].empty())
+            if (!element["container_name"].empty())
             {
-                key.containerName = element["database_name"];
+                key.containerName = element["container_name"];
             }
 
             // parse config file