Removed redundant (and obsolete) name attributes