Renamed XSD file name. Added namespaces in model for XSD generation