Use display names for attributes/attribute sets

Let's use
- getAttributeDisplayName instead of getAttributeName 
- getAttributeSetDisplayName instead of getAttributeSetName