Adjusting some names to align with pre-existing attribute options