fixes to XalFromXml plus some renaming.
Renamed ContentType to Content in xAL