Rename SpeedControlState->SpeedState
Trivial changes