diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp
index 8ff2993fc..cc5755b4b 100644
--- a/include/SFML/Window/Keyboard.hpp
+++ b/include/SFML/Window/Keyboard.hpp
@@ -334,7 +334,7 @@ public:
             LaunchMail,         //!< Keyboard Launch Mail key
             LaunchMediaSelect,  //!< Keyboard Launch Media Select key
 
-            ScancodeCount           //!< Keep last -- the total number of scancodes
+            ScancodeCount       //!< Keep last -- the total number of scancodes
         };
     };
 
diff --git a/src/SFML/Window/Android/InputImpl.cpp b/src/SFML/Window/Android/InputImpl.cpp
index 33caa5714..12d24305b 100644
--- a/src/SFML/Window/Android/InputImpl.cpp
+++ b/src/SFML/Window/Android/InputImpl.cpp
@@ -58,7 +58,7 @@ Keyboard::Key InputImpl::localize(Keyboard::Scancode /* code */)
 Keyboard::Scancode InputImpl::delocalize(Keyboard::Key /* key */)
 {
     // Not applicable
-    return Keyboard::ScanUnknown;
+    return Keyboard::Scan::Unknown;
 }
 
 String InputImpl::getDescription(Keyboard::Scancode /* code */)
diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp
index 5a4316871..d30fd9d02 100644
--- a/src/SFML/Window/Unix/KeyboardImpl.cpp
+++ b/src/SFML/Window/Unix/KeyboardImpl.cpp
@@ -500,7 +500,7 @@ void ensureMapping()
         {
             scancode = translateKeyCode(display, static_cast<KeyCode>(keycode));
 
-            if (scancode != sf::Keyboard::ScanUnknown && scancodeToKeycode[scancode] == NullKeyCode)
+            if (scancode != sf::Keyboard::Scan::Unknown && scancodeToKeycode[scancode] == NullKeyCode)
                 scancodeToKeycode[scancode] = static_cast<KeyCode>(keycode);
 
             keycodeToScancode[keycode] = scancode;
@@ -554,7 +554,7 @@ KeyCode keyToKeyCode(sf::Keyboard::Key key)
 
     // Fallback for when XKeysymToKeycode cannot tell the KeyCode for XK_Alt_R
     if (key == sf::Keyboard::RAlt)
-        return scancodeToKeycode[sf::Keyboard::ScanRAlt];
+        return scancodeToKeycode[sf::Keyboard::Scan::RAlt];
 
     return NullKeyCode;
 }