normalize naming across everything