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

Implements #640 
Fixed in 16204a35312c5d9a2485f1b434bb12474aec8102