Fix names elsewhere too