Changing names for standardization