KeyMap now meets Java naming conventions