Update XML, fix several scripts that were broken by field name changes