diff --git a/src/test/mock/synergy/MockKeyState.h b/src/test/mock/synergy/MockKeyState.h
index 78dc3356..0b05da40 100644
--- a/src/test/mock/synergy/MockKeyState.h
+++ b/src/test/mock/synergy/MockKeyState.h
@@ -54,4 +54,4 @@ typedef ::testing::NiceMock<MockKeyState> KeyStateImpl;
 typedef UInt32 KeyID;
 
 typedef void (*ForeachKeyCallback)(
-		KeyID, SInt32 group, CKeyMap::KeyItem&, void* userData);
+		KeyID, SInt32 group, synergy::KeyMap::KeyItem&, void* userData);
diff --git a/src/test/unittests/synergy/KeyStateTests.cpp b/src/test/unittests/synergy/KeyStateTests.cpp
index b75c7b88..1987881a 100644
--- a/src/test/unittests/synergy/KeyStateTests.cpp
+++ b/src/test/unittests/synergy/KeyStateTests.cpp
@@ -36,16 +36,16 @@ stubPollPressedKeys(IKeyState::KeyButtonSet& pressedKeys);
 void
 assertMaskIsOne(ForeachKeyCallback cb, void* userData);
 
-const CKeyMap::KeyItem*
+const synergy::KeyMap::KeyItem*
 stubMapKey(
-		   CKeyMap::Keystrokes& keys, KeyID id, SInt32 group,
-		   CKeyMap::ModifierToKeys& activeModifiers,
+		   synergy::KeyMap::Keystrokes& keys, KeyID id, SInt32 group,
+		   synergy::KeyMap::ModifierToKeys& activeModifiers,
 		   KeyModifierMask& currentState,
 		   KeyModifierMask desiredMask,
 		   bool isAutoRepeat);
 
-CKeyMap::Keystroke s_stubKeystroke(1, false, false);
-CKeyMap::KeyItem s_stubKeyItem;
+synergy::KeyMap::Keystroke s_stubKeystroke(1, false, false);
+synergy::KeyMap::KeyItem s_stubKeyItem;
 
 TEST(CKeyStateTests, onKey_aKeyDown_keyStateOne)
 {