Missed some references to old names