386.13 Cleaning up naming in stepper module