Fixed namings after joystick cleanup