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

Implements #640 
If LISTENER_PORT is changed, this test stops working