Update KeyboardCleanTool for new naming conventions
Merge pull request #1579 from Cottser/keyboardcleantool

Update KeyboardCleanTool for new naming conventions