Fix civzone type, make some field names more consistent