diff --git a/services/tunnelbroker/src/Database/DeviceSessionItem.cpp b/services/tunnelbroker/src/Database/DeviceSessionItem.cpp
--- a/services/tunnelbroker/src/Database/DeviceSessionItem.cpp
+++ b/services/tunnelbroker/src/Database/DeviceSessionItem.cpp
@@ -8,8 +8,8 @@
 namespace network {
 namespace database {
 
-const std::string DeviceSessionItem::FIELD_SESSION_ID = "SessionId";
-const std::string DeviceSessionItem::FIELD_DEVICE_ID = "DeviceId";
+const std::string DeviceSessionItem::FIELD_SESSION_ID = "SessionID";
+const std::string DeviceSessionItem::FIELD_DEVICE_ID = "DeviceID";
 const std::string DeviceSessionItem::FIELD_PUBKEY = "PubKey";
 const std::string DeviceSessionItem::FIELD_NOTIFY_TOKEN = "NotifyToken";
 const std::string DeviceSessionItem::FIELD_DEVICE_TYPE = "DeviceType";
diff --git a/services/tunnelbroker/src/Database/PublicKeyItem.cpp b/services/tunnelbroker/src/Database/PublicKeyItem.cpp
--- a/services/tunnelbroker/src/Database/PublicKeyItem.cpp
+++ b/services/tunnelbroker/src/Database/PublicKeyItem.cpp
@@ -6,7 +6,7 @@
 namespace network {
 namespace database {
 
-const std::string PublicKeyItem::FIELD_DEVICE_ID = "DeviceId";
+const std::string PublicKeyItem::FIELD_DEVICE_ID = "DeviceID";
 const std::string PublicKeyItem::FIELD_PUBLIC_KEY = "PublicKey";
 
 PublicKeyItem::PublicKeyItem(
diff --git a/services/tunnelbroker/src/Database/SessionSignItem.cpp b/services/tunnelbroker/src/Database/SessionSignItem.cpp
--- a/services/tunnelbroker/src/Database/SessionSignItem.cpp
+++ b/services/tunnelbroker/src/Database/SessionSignItem.cpp
@@ -8,7 +8,7 @@
 
 const std::string SessionSignItem::FIELD_SESSION_VERIFICATION =
     "VerificationMessage";
-const std::string SessionSignItem::FIELD_DEVICE_ID = "DeviceId";
+const std::string SessionSignItem::FIELD_DEVICE_ID = "DeviceID";
 const std::string SessionSignItem::FIELD_EXPIRE = "Expire";
 
 SessionSignItem::SessionSignItem(