Changed some field names to match the specification