Update PCKeyboardHack for new naming conventions
Merge pull request #1642 from Cottser/pckeyboardhack

Update PCKeyboardHack for new naming conventions