Removed duplicate collection attribute names.  Renamed hierarchical attribute names.