diff --git a/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp b/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
index cbbc91b1d..371037a1f 100644
--- a/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
+++ b/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
@@ -204,7 +204,7 @@ namespace gpgmm::d3d12 {
             SetEventMessageLevel(GetLogSeverity(descriptor.MinRecordLevel));
         }
 
-        SetLogMessageLevel(GetLogSeverity(descriptor.MinLogLevel));
+        SetLogLevel(GetLogSeverity(descriptor.MinLogLevel));
 
         std::unique_ptr<ResidencyManager> residencyManager = std::unique_ptr<ResidencyManager>(
             new ResidencyManager(descriptor, std::move(residencyFence)));
diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
index 056a287b4..ce4d5c3e4 100644
--- a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
+++ b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
@@ -528,7 +528,7 @@ namespace gpgmm::d3d12 {
         // Do not override the default min. log level specified by the residency manager.
         // Only if this allocator is without residency, does the min. log level have affect.
         if (pResidencyManager == nullptr) {
-            SetLogMessageLevel(GetLogSeverity(newDescriptor.MinLogLevel));
+            SetLogLevel(GetLogSeverity(newDescriptor.MinLogLevel));
         }
 
 #if defined(GPGMM_ENABLE_DEVICE_LEAK_CHECKS)
diff --git a/src/gpgmm/utils/Log.cpp b/src/gpgmm/utils/Log.cpp
index 669dd01dc..a9179946d 100644
--- a/src/gpgmm/utils/Log.cpp
+++ b/src/gpgmm/utils/Log.cpp
@@ -33,7 +33,7 @@ namespace gpgmm {
 
     static const char kLogTag[] = "GPGMM";
 
-    LogSeverity GetDefaultLogMessageLevel() {
+    LogSeverity GetDefaultLogLevel() {
 #if defined(NDEBUG)
         return LogSeverity::Info;
 #else
@@ -42,7 +42,7 @@ namespace gpgmm {
     }
 
     // Messages with equal or greater to severity will be logged.
-    static LogSeverity gLogMessageLevel = GetDefaultLogMessageLevel();
+    static LogSeverity gLogLevel = GetDefaultLogLevel();
     static std::mutex mMutex;
 
     namespace {
@@ -83,14 +83,14 @@ namespace gpgmm {
 
     }  // anonymous namespace
 
-    void SetLogMessageLevel(const LogSeverity& newLevel) {
+    void SetLogLevel(const LogSeverity& newLevel) {
         std::lock_guard<std::mutex> lock(mMutex);
-        gLogMessageLevel = newLevel;
+        gLogLevel = newLevel;
     }
 
-    LogSeverity GetLogMessageLevel() {
+    LogSeverity GetLogLevel() {
         std::lock_guard<std::mutex> lock(mMutex);
-        return gLogMessageLevel;
+        return gLogLevel;
     }
 
     // LogMessage
@@ -126,7 +126,7 @@ namespace gpgmm {
 #endif  // defined(GPGMM_PLATFORM_WINDOWS)
 
         // If this message is below the global severity level, do not print it.
-        if (GetLogMessageLevel() > mSeverity) {
+        if (GetLogLevel() > mSeverity) {
             return;
         }
 
diff --git a/src/gpgmm/utils/Log.h b/src/gpgmm/utils/Log.h
index 1651b1c1f..51cd75a97 100644
--- a/src/gpgmm/utils/Log.h
+++ b/src/gpgmm/utils/Log.h
@@ -58,8 +58,8 @@ namespace gpgmm {
     };
 
     // Messages of a given severity to be logged.
-    void SetLogMessageLevel(const LogSeverity& level);
-    LogSeverity GetLogMessageLevel();
+    void SetLogLevel(const LogSeverity& level);
+    LogSeverity GetLogLevel();
 
     // Essentially an ostringstream that will print itself in its destructor.
     class LogMessage {
@@ -101,12 +101,12 @@ namespace gpgmm {
     // RAII helper to set the global log severity level.
     class ScopedLogLevel {
       public:
-        explicit ScopedLogLevel(const LogSeverity& newLevel) : mPrevLevel(GetLogMessageLevel()) {
-            SetLogMessageLevel(newLevel);
+        explicit ScopedLogLevel(const LogSeverity& newLevel) : mPrevLevel(GetLogLevel()) {
+            SetLogLevel(newLevel);
         }
 
         ~ScopedLogLevel() {
-            SetLogMessageLevel(mPrevLevel);
+            SetLogLevel(mPrevLevel);
         }
 
       private:
diff --git a/src/tests/GPGMMTest.cpp b/src/tests/GPGMMTest.cpp
index e556b67dc..b75524f29 100644
--- a/src/tests/GPGMMTest.cpp
+++ b/src/tests/GPGMMTest.cpp
@@ -155,7 +155,7 @@ void GPGMMTestEnvironment::SetEnvironment(GPGMMTestEnvironment* env) {
 }
 
 void GPGMMTestEnvironment::SetUp() {
-    mLogLevel = gpgmm::GetLogMessageLevel();
+    mLogLevel = gpgmm::GetLogLevel();
 }
 
 bool GPGMMTestEnvironment::IsDumpEventsEnabled() const {