CMS-4324 Cleanup duplicate xml objects. Renamed some objects.