diff --git a/src/core/macscreensaver.cpp b/src/core/macscreensaver.cpp
index c6f738531..9c12a211c 100644
--- a/src/core/macscreensaver.cpp
+++ b/src/core/macscreensaver.cpp
@@ -32,7 +32,7 @@
 MacScreensaver::MacScreensaver() : assertion_id_(0) {}
 
 void MacScreensaver::Inhibit() {
-  CFStringRef assertion_type = (Utilities::GetMacVersion() >= 7) ? kLionDisplayAssertion : kIOPMAssertionTypeNoDisplaySleep;
+  CFStringRef assertion_type = (Utilities::GetMacOsVersion() >= 7) ? kLionDisplayAssertion : kIOPMAssertionTypeNoDisplaySleep;
 
   IOPMAssertionCreateWithName(
       assertion_type,
diff --git a/src/globalshortcuts/globalshortcuts.cpp b/src/globalshortcuts/globalshortcuts.cpp
index 10976bb41..a716491e5 100644
--- a/src/globalshortcuts/globalshortcuts.cpp
+++ b/src/globalshortcuts/globalshortcuts.cpp
@@ -166,7 +166,7 @@ void GlobalShortcuts::Unregister() {
 
 bool GlobalShortcuts::IsMacAccessibilityEnabled() const {
 #ifdef Q_OS_MACOS
-  if (macos_backend_) return static_cast<GlobalShortcutBackendMacOS*>(macos_backend_)->IsAccessibilityEnabled();
+  if (system_backend_) return static_cast<GlobalShortcutBackendMacOS*>(system_backend_)->IsAccessibilityEnabled();
   else return false;
 #else
   return true;
@@ -175,7 +175,7 @@ bool GlobalShortcuts::IsMacAccessibilityEnabled() const {
 
 void GlobalShortcuts::ShowMacAccessibilityDialog() {
 #ifdef Q_OS_MACOS
-  if (macos_backend_) static_cast<GlobalShortcutBackendMacOS*>(macos_backend_)->ShowAccessibilityDialog();
+  if (system_backend_) static_cast<GlobalShortcutBackendMacOS*>(system_backend_)->ShowAccessibilityDialog();
 #endif
 }
 
diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp
index 90d47bf15..501bf25c2 100644
--- a/src/settings/shortcutssettingspage.cpp
+++ b/src/settings/shortcutssettingspage.cpp
@@ -85,8 +85,8 @@ GlobalShortcutsSettingsPage::~GlobalShortcutsSettingsPage() { delete ui_; }
 bool GlobalShortcutsSettingsPage::IsEnabled() const {
 
 #ifdef Q_OS_MACOS
-  qLog(Debug) << Utilities::GetMacVersion();
-  if (Utilities::GetMacVersion() < 6) {  // Leopard and earlier.
+  qLog(Debug) << Utilities::GetMacOsVersion();
+  if (Utilities::GetMacOsVersion() < 6) {  // Leopard and earlier.
     return false;
   }
 #endif