The step name refactor should probably be in a separate commit. I don't mind it, though, it helps with consistency and isn't something we'll want to roll back.