CurrentStep renamed to current item