MT-3363: reverted more changes to XmlType names (Ranges, Requirements)