Changed naming of step types