Some benign renaming/consistentification