[Graeme] Corrected step tag references so they are consistent.