UI-821: Correct steps' references