Updated machine names with os2web prefix
Updated field names to prefixed version