Use new naming convention for step names