Renamed methods in waiting steps to remove ambiguity