1.  Renamed CIM 1.5 to CIM 1.  2.  Prepared for new CIM 1.8.1 schema usage.