Make step name more logical