Attribute names adjusted.