Removed duplicate collection attribute names.  Renamed hierarchical attribute names.  Generated files in other encodings.