Merge "fix model domains to valid names"