renamed mouse and keyboard classes