Added name attribute to descriptors