Standardize use of STEP_NAME()