Renamed and re-written to remove new names on completion.