Use attribute name as only attribute identification (type is not used anymore)

Implements #640