diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index aca0966bf4f98d39bd1671ca941e458f4faf9f9b..97fdcd97f28d5a5e0ab3fa8347afcede425d153d 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -171,7 +171,7 @@ private:
   mutable std::map<std::string, std::shared_ptr<Connection>> connections;
   mutable std::string default_connection_name;
 
-  static ConnectionManager instance;
+  static ConnectionManager mInstance;
 
   inline ConnectionManager(){};
 
diff --git a/src/linkahead/configuration.cpp b/src/linkahead/configuration.cpp
index f8074ba8c5bfa8c0d45976c320c50271d0fd6397..1c60cfe4c9154a8e2077bd9f08bfdd348483f647 100644
--- a/src/linkahead/configuration.cpp
+++ b/src/linkahead/configuration.cpp
@@ -427,7 +427,7 @@ auto ConfigurationManager::mGetDefaultConnectionName() const -> std::string {
   throw ConfigurationError("Could not determine the default connection.");
 }
 
-inline ConfigurationManager &ConfigurationManager::GetInstance() { return mInstance; }
+ConfigurationManager &ConfigurationManager::GetInstance() { return mInstance; }
 
 // TODO(tf) This has apparently a cognitive complexity of 34>25 (threshold).
 auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
diff --git a/src/linkahead/connection.cpp b/src/linkahead/connection.cpp
index 373b3674c4230df7a4077c810aaa85a8e8a7d003..bff799b093741b81b90417446b3dc8ccf37916d4 100644
--- a/src/linkahead/connection.cpp
+++ b/src/linkahead/connection.cpp
@@ -67,10 +67,10 @@ using linkahead::transaction::Transaction;
 using linkahead::transaction::TransactionStatus;
 
 
-ConnectionManager ConnectionManager::instance;
+ConnectionManager ConnectionManager::mInstance;
 
 ConnectionManager &ConnectionManager::GetInstance() {
-  return instance;
+  return mInstance;
 }
 
 Connection::Connection(const ConnectionConfiguration &configuration) {