Add name attribute to metadata and remove old/duplicate supports attribute.