diff --git a/changelog.txt b/changelog.txt
index 8b46a25fc..dec6611fd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,6 +19,81 @@ Template for new versions:
 # Future
 
 ## Structures
+- filled in missing ``original-name`` attributes
+- fixed assorted typos in ``original-name`` attributes
+- ensured that ``original-name`` always appears after ``name`` or ``type-name``, never before
+- fixed several structure field type errors
+- specific changes: fixed ``building_constructionst.type`` to be 32-bit, along with the ``construction_type`` enum
+- specific changes: fixed ``contextst.interrogator_relationships`` to be a pointer to ``evidence_repositoryst``
+- specific changes: fixed ``actor_entryst.associated_org`` to contain pointers to ``organization_entryst``
+- specific changes: fixed ``justice_interfacest.interrogation_report`` to contain pointers to ``interrogation_report``
+- specific changes: fixed ``main_interface_settings.member`` to contain shared pointers to ``world_gen_param_valuest``
+- specific changes: fixed ``squad_equipment_interfacest.am_cand_subtype`` to contain ``int16_t``
+- specific changes: fixed ``startup_charactersheet_petst.race`` to be ``int32_t``
+- specific changes: fixed ``lookinfo_verminst.caste`` to be ``int16_t``
+- specific changes: fixed ``intrigue_corruption.facet_rating`` to be ``int16_t``
+- specific changes: fixed ``historical_entity.current_wgwg`` to be a direct pointer
+- specific changes: fixed ``historical_figure.worldgen_relationships`` to be a direct pointer
+- specific changes: fixed ``pmd_tree_texture_infost.texpos_tree_wood_tile`` to use correct array length (sized against the correct enum)
+- fixed several enums
+- specific changes: fixed ``build_square_type`` enum to add missing element ``OUTSIDE``
+- specific changes: swapped ``main_hover_instruction`` elements ``ADVENTURE_MOVE_DOWN_RAMP_E`` and ``ADVENTURE_MOVE_DOWN_RAMP_W``
+- added some missing enums and bitfields
+- specific changes: ``viewscreen_titlest.mode`` now uses new enum ``title_mode_type``
+- specific changes: ``viewscreen_worldst.squad_flag`` now uses new bitfield ``civlist_squad_flag``
+- specific changes: ``viewscreen_worldst.messenger_flag`` now uses new bitfield ``civlist_messenger_flag``
+- specific changes: fixed ``historical_entity.resources.art_image_types`` to use new ``entity_art_image_type`` enum
+- changed various fields to make use of existing enums and bitfields
+- specific changes: ``adventure_movement_movest.aim_attack_flag`` now uses ``aim_attack_flag`` bitfield
+- specific changes: ``adventure_movement_mountst.riderposition`` now uses ``rider_positions_type`` enum
+- specific changes: ``adventure_constructionst.building_jobitemflag`` now uses ``job_material_category`` bitfield
+- specific changes: ``adventure_constructionst.mat_jobitemflag`` now uses ``job_material_category`` bitfield
+- specific changes: ``adventure_constructionst.mat_jobitemflag_master`` now uses ``job_material_category`` bitfield
+- specific changes: ``building_defst.build_key`` now uses ``interface_key`` enum
+- specific changes: ``body_detail_plan.bp_layers_tissue`` now uses ``creature_interaction_effect_target_mode`` enum
+- specific changes: ``body_detail_plan.bp_position_value`` now uses ``body_part_position_type`` enum
+- specific changes: ``body_detail_plan.bp_relation_value_1`` now uses ``body_part_relation_type`` enum
+- specific changes: ``custom_stockpile_interfacest.cur_main_mode_flag`` now uses ``stockpile_group_set`` bitfield
+- specific changes: ``custom_stockpile_interfacest.main_mode_flag`` now uses ``stockpile_group_set`` bitfield
+- specific changes: ``name_creator_interfacest.cur_name_place`` now uses ``language_name_component`` enum
+- specific changes: ``name_creator_interfacest.cur_word_place`` now uses ``language_word_table_index`` enum
+- specific changes: ``dance_form_section.dance_flag`` now uses ``dance_flag`` bitfield
+- specific changes: ``evidence_hf_filest.evidence`` now uses ``evidence_type`` enum
+- specific changes: ``historical_entity.resources.scholar_flag`` now uses ``entity_scholar_flag`` bitfield
+- specific changes: ``interaction_effect_summon_unitst`` fields ``required_creature_flags`` and ``forbidden_creature_flags`` now use ``creature_raw_flags`` enum
+- specific changes: ``interaction_effect_summon_unitst`` fields ``required_caste_flags`` and ``forbidden_caste_flags`` now use ``caste_raw_flags`` enum
+- specific changes: ``interaction_effect_change_weatherst`` fields ``add_weather_flag`` and ``remove_weather_flag`` now use ``region_weather_bits`` bitfield
+- specific changes: ``creature_interaction_effect_body_transformationst`` fields ``required_creature_flags`` and ``forbidden_creature_flags`` now use ``creature_raw_flags`` enum
+- specific changes: ``creature_interaction_effect_body_transformationst`` fields ``required_caste_flags`` and ``forbidden_caste_flags`` now use ``caste_raw_flags`` enum
+- specific changes: ``unit_personality.habit`` now uses ``habit_type`` enum
+- specific changes: ``world_region_feature.vertical_connection`` now uses ``layer_connection_type`` enum
+- specific changes: ``site_construction_blueprintst`` fields ``construction_type`` and ``building_type`` now use ``building_type`` enum
+- specific changes: ``site_construction_blueprintst`` fields ``construction_jobitemflag`` and ``building_jobitemflag`` now use ``job_material_category`` bitfield
+- fixed various fields to use correct signedness
+- specific changes: ``building_weaponrackst.rack_flags`` is now unsigned
+- specific changes: ``temperaturest.fraction`` is now unsigned
+- specific changes: ``historical_entity`` fields ``did_wg_variable_position`` and ``did_wg_variable_market_position`` are now unsigned
+- specific changes: ``item_body_component`` fields ``nonsolid_remaining``, ``layer_wound_area``, ``layer_cut_fraction``, ``layer_dent_fraction``, and ``layer_effect_fraction`` are now signed
+- specific changes: ``unit_personality.traits`` is now signed
+- specific changes: ``rpd_indicator_datast`` fields ``marker_char``, ``marker_f``, ``marker_b``, and ``marker_br`` are now unsigned
+- specific changes: ``embark_note.tile`` is now unsigned
+- specific changes: ``world_population`` fields ``count_min``, ``count_max``, and ``temp_num`` are now unsigned
+- specific changes: ``world_site_realization.mini_colors`` is now unsigned
+- specific changes: ``unit.body.components`` fields ``nonsolid_remaining``, ``layer_wound_area``, ``layer_cut_fraction``, ``layer_dent_fraction``, and ``layer_effect_fraction`` are now signed
+- specific changes: ``unit.body`` fields ``blood_max`` and ``blood_count`` are now signed
+- specific changes: ``unit.counters`` fields ``pain``, ``nausea``, and ``dizziness`` are now signed
+- specific changes: ``unit`` fields ``uwss_alt_period``, ``uwss_alt_on_period``, ``uwss_speed_add``, ``uwss_speed_perc``, and ``uwss_skill_role_adjust`` are now signed
+- specific changes: ``unit.counters`` fields ``paralysis``, ``numbness``, ``fever``, ``exhaustion``, ``hunger_timer``, ``thirst_timer``, ``sleepiness_timer``, ``stomach_content``, ``stomach_food``, ``vomit_timeout``, and ``stored_fat`` are now signed
+- specific changes: ``unit.status2.liquid_depth`` are now signed
+- fixed various fields to use ``int8_t`` or ``bool`` as appropriate
+- specific changes: ``viewscreen_dwarfmodest.sideSubmenu`` is now ``bool``
+- specific changes: ``entity_raw`` fields ``likes_site``, ``tolerates_site``, ``start_biome``, ``settlement_biome``, and ``active_season`` are now ``bool``
+- specific changes: ``entity_raw.jobs.permitted_labor`` is now ``int8_t``
+- specific changes: ``graphicst`` fields ``do_clean_tile_cache`` and ``do_post_init_texture_clear`` are now ``bool``
+- specific changes: ``world_generatorst`` fields ``have_logged_parameters`` and ``last_used_valid`` are now ``bool``
+- other changes: added name to field ``cgl_itemst.item_type``
+- other changes: ``inclusion_type`` now has 16-bit base type (though nothing relies on it)
+- other changes: renamed ``adventure_interface_attackst.scrselected_item_idoll_position_wrestle`` to ``selected_item_id``
 
 # 53.11-r2
 
diff --git a/df.activity.xml b/df.activity.xml
index cc9444615..9b5eb9afd 100644
--- a/df.activity.xml
+++ b/df.activity.xml
@@ -68,7 +68,7 @@
         <enum-item name='TrainingSession' original-name='TRAINING_SESSION'/>
         <enum-item name='CombatTraining' original-name='COMBAT_TRAINING'/>
         <enum-item name='SkillDemonstration' original-name='SKILL_DEMONSTRATION'/>
-        <enum-item name='IndividualSkillDrill' original-name='ORIGINAL_SKILL_DRILL'/>
+        <enum-item name='IndividualSkillDrill' original-name='INDIVIDUAL_SKILL_DRILL'/>
         <enum-item name='Sparring' original-name='SPARRING'/>
         <enum-item name='RangedPractice' original-name='RANGED_PRACTICE'/>
         <enum-item name='Harassment' original-name='HARASSMENT'/>
@@ -670,7 +670,7 @@
     <class-type type-name='activity_event_prayerst' inherits-from='activity_event'>
         <compound type-name='activity_event_participants' name='participants' original-name='list'/>
         <int32_t name='histfig_id' original-name='prayer_target_hfid' ref-target='historical_figure' comment='praying to deity'/>
-        <enum type-name='sphere_type' original-name='sphere_target' name='topic' comment='praying to sphere'/>
+        <enum type-name='sphere_type' name='topic' original-name='sphere_target' comment='praying to sphere'/>
         <int32_t name='site_id' original-name='location_stid' ref-target='world_site'/>
         <int32_t name='location_id' original-name='location_abid' ref-target='abstract_building' aux-value='$$.site_id'/>
         <int32_t name='building_id' original-name='location_zone_bldid' ref-target='building'/>
diff --git a/df.activity_meeting.xml b/df.activity_meeting.xml
index c30f50e1d..ff80e75c9 100644
--- a/df.activity_meeting.xml
+++ b/df.activity_meeting.xml
@@ -8,7 +8,7 @@
     </bitfield-type>
 
     <struct-type type-name='activity_info' original-name='activity_meetingst'>
-        <int32_t name='id' original-name='save-index' init-value='-1' comment='assigned during Save'/>
+        <int32_t name='id' original-name='save_index' init-value='-1' comment='assigned during Save'/>
         <int32_t name='unit_actor' original-name='actor_unid' ref-target='unit' init-value='-1' comment='diplomat or worker'/>
         <int32_t name='unit_noble' original-name='target_unid' ref-target='unit' init-value='-1' comment='meeting recipient'/>
         <int32_t name='place' original-name='civzone_id' ref-target='building' init-value='-1'/>
diff --git a/df.adventure.xml b/df.adventure.xml
index 64d11193d..65916eefa 100644
--- a/df.adventure.xml
+++ b/df.adventure.xml
@@ -32,7 +32,7 @@
     </struct-type>
 
     <enum-type type-name='ui_advmode_menu' original-name='adventure_view_mode'> bay12: AdventureViewModes
-        <enum-item name='None' value='-1'/>
+        <enum-item name='None' original-name='NONE' value='-1'/>
         <enum-item name='Default' original-name='MAIN'/>
         <enum-item name='Look' original-name='LOOK'/>
         <enum-item name='ConversationAddress' original-name='CONVERSATION_START_NEW'/>
@@ -519,7 +519,7 @@
 
     <class-type type-name='adventure_movement_movest' inherits-from='adventure_movement_optionst'>
         <bitfield type-name='pathfinding_flags' name='override_permit'/>
-        <uint32_t name='aim_attack_flag' comment='which flags?'/>
+        <bitfield type-name='aim_attack_flag' name='aim_attack_flag'/>
     </class-type>
 
     <class-type type-name='adventure_movement_hold_tilest' inherits-from='adventure_movement_optionst'>
@@ -554,7 +554,7 @@
 
     <class-type type-name='adventure_movement_mountst' inherits-from='adventure_movement_optionst'>
         <pointer type-name='unit' name='animal' original-name='mount'/>
-        <int16_t name='riderposition'/>
+        <enum base-type='int16_t' type-name='rider_positions_type' name='riderposition'/>
     </class-type>
 
     <class-type type-name='adventure_movement_dismountst' inherits-from='adventure_movement_optionst'/>
@@ -616,7 +616,7 @@
         <int32_t name='abs_x'/>
         <int32_t name='abs_y'/>
         <int32_t name='abs_z'/>
-        <pointer type-name='world_site' name='target_site' original-name='target+st'/>
+        <pointer type-name='world_site' name='target_site' original-name='target_st'/>
     </struct-type>
 
     <enum-type type-name='adventure_construction_mode_type' base-type='int32_t'> bay12: AdventureConstructionModeType
@@ -649,7 +649,7 @@
         <int32_t name='building_subtype'/>
         <int32_t name='building_subcat1'/>
         <int32_t name='building_subcat2'/>
-        <uint32_t name='building_jobitemflag'/>
+        <bitfield type-name='job_material_category' name='building_jobitemflag'/>
 
         <int32_t name='selected_build_phase'/>
 
@@ -687,11 +687,11 @@
 
         <stl-vector type-name='int16_t' name='material'/>
         <stl-vector type-name='int32_t' name='matgloss'/>
-        <stl-vector type-name='uint32_t' name='mat_jobitemflag'/>
+        <stl-vector type-name='job_material_category' name='mat_jobitemflag'/>
         <stl-vector type-name='int32_t' name='material_count'/>
         <stl-vector type-name='int16_t' name='material_master'/>
         <stl-vector type-name='int32_t' name='matgloss_master'/>
-        <stl-vector type-name='uint32_t' name='mat_jobitemflag_master'/>
+        <stl-vector type-name='job_material_category' name='mat_jobitemflag_master'/>
         <stl-vector type-name='int32_t' name='material_count_master'/>
         <int32_t name='material_select'/>
         <stl-string name='material_filter'/>
@@ -710,7 +710,7 @@
         <stl-vector type-name='int32_t' name='start_menu_used_mat_item_tool_use'/>
         <stl-vector type-name='int16_t' name='start_menu_used_material'/>
         <stl-vector type-name='int32_t' name='start_menu_used_matgloss'/>
-        <stl-vector type-name='uint32_t' name='start_menu_used_mat_job_item_flag'/>
+        <stl-vector type-name='job_material_category' name='start_menu_used_mat_job_item_flag'/>
         <stl-vector type-name='matter_state' name='start_menu_used_mat_state'/>
         <stl-vector type-name='int32_t' name='start_menu_used_mat_count'/>
         <stl-vector type-name='int32_t' name='start_menu_have_mat_count'/>
@@ -1003,7 +1003,7 @@
         <int16_t name='move_direction_z' original-name='move_sz' comment='z-axis direction for the last attempted player unit movement: -1 = down, 0 = none, 1 = up'/>
         <bool name='move_do_mid_move'/>
         <bool name='move_carefully' original-name='move_do_care' comment='Is set when the player prepares to move carefully (via the Alt + movement key combo)'/>
-        <int16_t name='careful_direction_x' original-name='move_care_sz' comment='x-axis direction for the last attempted careful player unit movement: -1 = west, 0 = none, 1 = east'/>
+        <int16_t name='careful_direction_x' original-name='move_care_sx' comment='x-axis direction for the last attempted careful player unit movement: -1 = west, 0 = none, 1 = east'/>
         <int16_t name='careful_direction_y' original-name='move_care_sy' comment='y-axis direction for the last attempted careful player unit movement: -1 = north, 0 = none, 1 = south'/>
         <stl-string name='interrupt_performance_warning' original-name='move_confirm_str' comment='the message displayed when the player attempts to move while their unit is performing'/>
 
diff --git a/df.adventure_log.xml b/df.adventure_log.xml
index 48144747d..ba118f980 100644
--- a/df.adventure_log.xml
+++ b/df.adventure_log.xml
@@ -29,7 +29,7 @@
 
         <pointer type-name='squad' name='sq'/>
         <pointer type-name='squad_order' name='so'/>
-        <bool name='squad_order_repeatable'/>
+        <bool name='squad_order_repeatable' original-name='squad_order_reportable'/>
 
         <stl-string name='list_name'/>
         <stl-string name='simple_list_name'/>
diff --git a/df.agreement.xml b/df.agreement.xml
index 375ab54c5..fe0a4924e 100644
--- a/df.agreement.xml
+++ b/df.agreement.xml
@@ -214,7 +214,7 @@
             <pointer type-name='agreement_details_data_retrieve_artifact' name='RetrieveArtifact' original-name='retrieve_artifact'/>
         </compound>
 
-        <enum base-type='int32_t' type-name='agreement_details_type' name='type'/>
+        <enum base-type='int32_t' type-name='agreement_details_type' name='type' original-name='subject'/>
     </struct-type>
 
     <bitfield-type type-name='agreement_flag' base-type='uint32_t' since='v0.42.01'> bay12: AGREEMENT_FLAG_*
diff --git a/df.building.xml b/df.building.xml
index 3612875bd..67725eb3f 100644
--- a/df.building.xml
+++ b/df.building.xml
@@ -240,7 +240,7 @@
         <int16_t name='y2' original-name='appey'/>
     </struct-type>
 
-    <bitfield-type type-name='machine_conn_modes' base-type='uint8_t'> bay12: BUILDING_MACHINE_HOOKUP_DIR_*
+    <bitfield-type type-name='machine_conn_modes' original-name='building_machine_hookup_dir' base-type='uint8_t'> bay12: BUILDING_MACHINE_HOOKUP_DIR_*
         <flag-bit name='up' original-name='N'/>
         <flag-bit name='down' original-name='S'/>
         <flag-bit name='right' original-name='E'/>
@@ -745,7 +745,7 @@
         <stl-vector type-name='bool' name='mats' original-name='material' comment='unused'/>
     </struct-type>
 
-    <enum-type type-name='stockpile_ammo_mat' original-name='stockpileammo_storage_type' base-type='int16_t'> bay12: StockpileAmmoStorageType
+    <enum-type type-name='stockpile_ammo_mat' original-name='stockpile_ammo_storage_type' base-type='int16_t'> bay12: StockpileAmmoStorageType
         <enum-item name='None' original-name='NONE' value='-1'/>
         <enum-item name='Wood' original-name='WOOD'/>
         <enum-item name='Bone' original-name='BONE'/>
@@ -936,7 +936,7 @@
         <stl-vector type-name='bool' name='shield' original-name='shield_type'
                     index-refers-to='$global.world.raws.itemdefs.shields[$]'/>
         <stl-vector type-name='bool' name='other_mats' original-name='material' index-enum='stockpile_armor_mat'/>
-        <stl-vector type-name='bool' name='mats' original-name='matgloss_emtal'
+        <stl-vector type-name='bool' name='mats' original-name='matgloss_metal'
                     index-refers-to='(material-by-id 0 $)'/>
         <stl-vector type-name='bool' name='color'/>
         <static-array type-name='bool' name='quality_core' original-name='quality' count='7' index-enum='item_quality'/>
@@ -995,7 +995,7 @@
         <bitfield base-type='uint32_t' type-name='building_stockpile_flag' name='stockpile_flag'/>
         <int32_t name='stockpile_number' original-name='id_number' init-value='-1'/>
 
-        <stl-vector pointer-type='hauling_stop' name='linked_stops'/>
+        <stl-vector pointer-type='hauling_stop' name='linked_stops' original-name='hauling_stop'/>
     </class-type>
 
     <bitfield-type type-name='civzone_pen_flag' base-type='uint32_t'> bay12: CIVZONE_PEN_FLAG_*
@@ -1042,24 +1042,24 @@
     </struct-type>
 
     <bitfield-type type-name='civzone_activity_flag' base-type='uint32_t'> bay12: CIVZONE_ACTIVITY_FLAG_*
-        <flag-bit name='unused_01'/>
-        <flag-bit name='unused_02'/>
-        <flag-bit name='unused_03'/>
+        <flag-bit name='unused_01' original-name='UNUSED_01'/>
+        <flag-bit name='unused_02' original-name='UNUSED_02'/>
+        <flag-bit name='unused_03' original-name='UNUSED_03'/>
         <flag-bit name='active' original-name='ACTIVE'/>
-        <flag-bit name='unused_05'/>
-        <flag-bit name='unused_06'/>
-        <flag-bit name='unused_07'/>
-        <flag-bit name='unused_08'/>
-        <flag-bit name='unused_09'/>
-        <flag-bit name='unused_10'/>
-        <flag-bit name='unused_11'/>
-        <flag-bit name='unused_12'/>
+        <flag-bit name='unused_05' original-name='UNUSED_05'/>
+        <flag-bit name='unused_06' original-name='UNUSED_06'/>
+        <flag-bit name='unused_07' original-name='UNUSED_07'/>
+        <flag-bit name='unused_08' original-name='UNUSED_08'/>
+        <flag-bit name='unused_09' original-name='UNUSED_09'/>
+        <flag-bit name='unused_10' original-name='UNUSED_10'/>
+        <flag-bit name='unused_11' original-name='UNUSED_11'/>
+        <flag-bit name='unused_12' original-name='UNUSED_12'/>
     </bitfield-type>
 
     <class-type type-name='building_civzonest' inherits-from='building'>
         <stl-vector type-name='int32_t' name='assigned_units' original-name='assigned_u' ref-target='unit'/>
         <stl-vector type-name='int32_t' name='assigned_items' original-name='assigned_i' ref-target='item'/>
-        <enum type-name='civzone_type' name="type" comment='only saved as int16'/>
+        <enum type-name='civzone_type' name="type" original-name='civzone_type' comment='only saved as int16'/>
         <bitfield base-type='uint32_t' type-name='civzone_activity_flag' name='spec_sub_flag'/>
         <int32_t name='site_realization_building_id'/>
         <int32_t name='site_realization_sul_id'/>
@@ -1091,7 +1091,7 @@
     </enum-type>
 
     <struct-type type-name='buildingitemst'>
-        <pointer type-name='item' name='item' original-name='ot'/>
+        <pointer type-name='item' name='item' original-name='it'/>
         <enum type-name='building_item_role_type' name='use_mode' original-name='role'/>
     </struct-type>
 
@@ -1124,7 +1124,7 @@
     </class-type>
 
     <class-type type-name='building_weaponrackst' inherits-from='building_actual'>
-        <int16_t name='rack_flags' original-name='rack_flag'/>
+        <uint16_t name='rack_flags' original-name='rack_flag'/>
         <int32_t name='specific_squad' original-name='using_sqid' ref-target='squad'/>
     </class-type>
 
@@ -1137,7 +1137,7 @@
 
     <bitfield-type type-name='building_door_flag' base-type='uint16_t'> bay12: BUILDINGFLAG_DOOR_*
         <flag-bit name='forbidden' original-name='FORBIDDEN'/>
-        <flag-bit name='unused_02'/>
+        <flag-bit name='unused_02' original-name='UNUSED_02'/>
         <flag-bit name='taken_by_invaders' original-name='SIEGED'/>
         <flag-bit name='used_by_intruder' original-name='THIEVED'/>
         <flag-bit name='closed' original-name='CLOSED'/>
@@ -1151,7 +1151,7 @@
 
     <bitfield-type type-name='building_hatch_flag' base-type='uint16_t'> bay12: BUILDINGFLAG_HATCH_*
         <flag-bit name='forbidden' original-name='FORBIDDEN'/>
-        <flag-bit name='unused_02'/>
+        <flag-bit name='unused_02' original-name='UNUSED_02'/>
         <flag-bit name='taken_by_invaders' original-name='SIEGED'/>
         <flag-bit name='used_by_intruder' original-name='THIEVED'/>
         <flag-bit name='closed' original-name='CLOSED'/>
@@ -1354,7 +1354,7 @@
 
     <class-type type-name='building_archerytargetst' inherits-from='building_actual'/>
 
-    <enum-type type-name='screw_pump_direction'> bay12: BUILDING_SCREW_PUMP_DIR_*
+    <enum-type type-name='screw_pump_direction' original-name='building_screw_pump_dir'> bay12: BUILDING_SCREW_PUMP_DIR_*
         <enum-item name='FromNorth' original-name='GET_FROM_NORTH'/>
         <enum-item name='FromEast' original-name='GET_FROM_EAST'/>
         <enum-item name='FromSouth' original-name='GET_FROM_SOUTH'/>
@@ -1407,7 +1407,7 @@
 
     <class-type type-name='building_cagest' inherits-from='building_actual'>
         <stl-vector type-name='int32_t' name='assigned_units' original-name='assigned_u' ref-target='unit'/>
-        <stl-vector type-name='int32_t' name='assigned_items' original-name='assigned_u' ref-target='item'/>
+        <stl-vector type-name='int32_t' name='assigned_items' original-name='assigned_i' ref-target='item'/>
         <bitfield base-type='uint16_t' type-name='building_cage_flag' name='cage_flags' original-name='cage_flag'/>
         <int16_t name='fill_timer'/>
     </class-type>
@@ -1728,7 +1728,7 @@
         <int16_t name='terrain_purge_timer' original-name='trample_count' init-value='500'/>
     </class-type>
 
-    <enum-type type-name='construction_type' original-name='building_construction_type' base-type='int16_t'> bay12: BuildingConstructionType
+    <enum-type type-name='construction_type' original-name='building_construction_type'> bay12: BuildingConstructionType
         <enum-item name="NONE" value='-1' comment='unused'/>
         <enum-item name="Fortification" original-name='FORTIFICATION'/>
         <enum-item name="Wall" original-name='WALL'/>
@@ -1771,7 +1771,7 @@
     </enum-type>
 
     <class-type type-name='building_constructionst' inherits-from='building_actual'>
-        <enum base-type='int16_t' type-name='construction_type' name='type' original-name='construction_type'/>
+        <enum type-name='construction_type' name='type' original-name='construction_type' comment='saved as int16'/>
     </class-type>
 
     -- Helper type for building_handlerst
@@ -2867,6 +2867,7 @@
         <enum-item name='WATER'/>
         <enum-item name='MAGMA'/>
         <enum-item name='BUILDING_PRESENT'/>
+        <enum-item name='OUTSIDE'/>
         <enum-item name='CLOSE_TO_EDGE'/>
         <enum-item name='INSIDE'/>
         <enum-item name='NEED_OPEN_AIR'/>
diff --git a/df.building_def.xml b/df.building_def.xml
index 1d71ddd9f..8b9ddcdd8 100644
--- a/df.building_def.xml
+++ b/df.building_def.xml
@@ -68,7 +68,7 @@
             </static-array>
         </static-array>
 
-        <long name='build_key'/>
+        <enum type-name='interface_key' name='build_key'/>
         <bool name='needs_magma'/>
 
         <stl-vector pointer-type='building_def_item' name="build_items" original-name='build_item'/>
diff --git a/df.creature.xml b/df.creature.xml
index a1b3fe545..507112971 100644
--- a/df.creature.xml
+++ b/df.creature.xml
@@ -143,7 +143,7 @@
         <enum-item name='FUNCTIONAL'/>
 
         <enum-item name='MAJOR_ARTERIES'/>
-        <enum-item name='TISSUE_LEAKS'/>
+        <enum-item name='TISSUE_LEAKS' original-name='LEAKS'/>
         <enum-item name='STYLEABLE'/>
         <enum-item name='CONNECTIVE_TISSUE_ANCHOR'/>
         <enum-item name='SETTABLE'/>
@@ -262,7 +262,7 @@
 
         <stl-vector type-name='int32_t' name='bp_layers_thickness' original-name='tissue_thickness'/>
         <stl-vector type-name='body_part_position_type' name='bp_layers_selection' original-name='tissue_position'/>
-        <stl-vector type-name='int16_t' name='bp_layers_tissue' original-name='tissue_rel_bp_group'/>
+        <stl-vector type-name='creature_interaction_effect_target_mode' name='bp_layers_tissue' original-name='tissue_rel_bp_group'/>
         <stl-vector pointer-type='stl-string' name='bp_layers_criteria' original-name='tissue_rel_bp_token'/>
         <stl-vector type-name='body_part_relation_type' name='bp_layers_position' original-name='tissue_rel_bp_rel'/>
         <stl-vector type-name='int8_t' name='bp_layers_over_under' original-name='tissue_over'/>
@@ -273,11 +273,11 @@
 
         <stl-vector type-name='creature_interaction_effect_target_mode' name='bp_position_selection' original-name='position_bp_group'/>
         <stl-vector pointer-type='stl-string' name='bp_position_criteria' original-name='position_bp_token'/>
-        <stl-vector type-name='int16_t' name='bp_position_value' original-name='position_bp_pos'/>
+        <stl-vector type-name='body_part_position_type' name='bp_position_value' original-name='position_bp_pos'/>
 
         <stl-vector type-name='creature_interaction_effect_target_mode' name='bp_relation_selection_1' original-name='relation_bp_group1'/>
         <stl-vector pointer-type='stl-string' name='bp_relation_criteria_1' original-name='relation_bp_token1'/>
-        <stl-vector type-name='int16_t' name='bp_relation_value_1' original-name='relation_bp_rel'/>
+        <stl-vector type-name='body_part_relation_type' name='bp_relation_value_1' original-name='relation_bp_rel'/>
 
         <stl-vector type-name='creature_interaction_effect_target_mode' name='bp_relation_selection_2' original-name='relation_bp_group2'/>
         <stl-vector pointer-type='stl-string' name='bp_relation_criteria_2' original-name='relation_bp_token2'/>
@@ -577,7 +577,7 @@
         </static-array>
     </struct-type>
 
-    <enum-type type-name='creature_graphics_tissue_layer_swap_condition_type' base-type='int32_t'> bay12: CGLTissueLayerSwapConditionType
+    <enum-type type-name='creature_graphics_tissue_layer_swap_condition_type' original-name='cgl_tissue_layer_swap_condition_type' base-type='int32_t'> bay12: CGLTissueLayerSwapConditionType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='IF_MIN_CURLY'/>
     </enum-type>
@@ -639,7 +639,7 @@
         <stl-vector type-name='int32_t' name='check_caste'/>
         <stl-vector type-name='int16_t' name='check_bp'/>
 
-        <enum base-type='int16_t' type-name='item_type'/>
+        <enum base-type='int16_t' type-name='item_type' name='item_type'/>
         <stl-vector type-name='int32_t' name='item_subtype'/>
 
         <bitfield base-type='uint32_t' type-name='cgl_item_flag' name='flags' original-name='flag'/>
@@ -1159,8 +1159,8 @@
         <int32_t name='color_gene_count' original-name='genetic_total_color_mod_selection'/>
 
         <stl-vector type-name='job_skill' name='natural_skill_id' original-name='racial_skill_type'/>
-        <stl-vector type-name='int32_t' original-name='racial_skill_total_ip' name='natural_skill_exp'/>
-        <stl-vector type-name='skill_rating' original-name='racial_skill_min_level' name='natural_skill_lvl'/>
+        <stl-vector type-name='int32_t' name='natural_skill_exp' original-name='racial_skill_total_ip'/>
+        <stl-vector type-name='skill_rating' name='natural_skill_lvl' original-name='racial_skill_min_level'/>
 
         <compound name='caste_profession_name'> not a compound
             <static-array type-name='stl-string' name='singular' original-name='unit_name' index-enum='profession'/>
diff --git a/df.creaturebody.xml b/df.creaturebody.xml
index c9896304f..7665e77b4 100644
--- a/df.creaturebody.xml
+++ b/df.creaturebody.xml
@@ -73,7 +73,7 @@
         <stl-string name='con_cat' original-name='str_CONNECTION_CATEGORY'/>
 
         -- int16_t[CreateBodyPartShorts]
-        <enum base-type='int16_t' type-name='body_part_template_contype' original-name='var_s_PARENTTYPE' name='contype'/>
+        <enum base-type='int16_t' type-name='body_part_template_contype' name='contype' original-name='var_s_PARENTTYPE'/>
 
         <df-flagarray name='flags' original-name='flag' index-enum='body_part_template_flags'/>
 
diff --git a/df.d_basics.xml b/df.d_basics.xml
index f5cb7afb9..4274ff4f7 100644
--- a/df.d_basics.xml
+++ b/df.d_basics.xml
@@ -921,7 +921,7 @@
             <item-attr name='color' value='9'/>
             <item-attr name='divider' value='-2'/>
         </enum-item>
-        <enum-item name='EXPECTANCY'>
+        <enum-item name='EXPECTANCY' original-name='EXPECTANT'>
             <item-attr name='color' value='10'/>
             <item-attr name='divider' value='-8'/>
         </enum-item>
@@ -1426,7 +1426,7 @@
         </enum-item>
     </enum-type>
 
-    <enum-type type-name='insurrection_outcome' base-type='int32_t'> bay12: InsurrectionOutcomeType
+    <enum-type type-name='insurrection_outcome' original-name='insurrection_outcome_type' base-type='int32_t'> bay12: InsurrectionOutcomeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='LeadershipOverthrown' original-name='LEADERSHIP_OVERTHROWN'/>
         <enum-item name='PopulationGone' original-name='POPULATION_GONE'/>
@@ -2404,7 +2404,7 @@
         <flag-bit name='StuckInBuilding' original-name='BUILDING_IGNORE'/>
         <flag-bit name='AllowUnrevealed' original-name='HIDDEN'/>
         <flag-bit name='Doors' original-name='DOOR_STOP'/>
-        <flag-bit name='DoorTotal' original-name='DOOR_STOP_TOTAL'/>
+        <flag-bit name='DoorTotal' original-name='DOOR_TOTAL_STOP'/>
         <flag-bit name='CanLearn' original-name='USE_TRAFFIC'/>
         <flag-bit name='SolidWall' original-name='SOLID_WALL'/>
         <flag-bit name='JumpCliff' original-name='LEAPER'/>
@@ -3387,7 +3387,7 @@
     </enum-type>
 
     <enum-type type-name='research_project_type' base-type='int32_t'> bay12: ResearchProjectType
-        <enum-item name='None' value='-1'/>
+        <enum-item name='None' original-name='NONE' value='-1'/>
         <enum-item name='PHILOSOPHY_FLAG'/>
         <enum-item name='PHILOSOPHY_FLAG2'/>
         <enum-item name='MATHEMATICS_FLAG'/>
@@ -3488,7 +3488,7 @@
         <flag-bit name='mathematics_numbers_sieve_algorithm_for_primes' original-name='NUMBERS_SIEVE_ALGORITHM_FOR_PRIMES'/>
     </bitfield-type>
 
-    <bitfield-type type-name='knowledge_scholar_flags_3' original-name='sk_mathematics_flag' base-type='uint32_t'> bay12: SK_MATHEMATICS_FLAG2_*
+    <bitfield-type type-name='knowledge_scholar_flags_3' original-name='sk_mathematics_flag2' base-type='uint32_t'> bay12: SK_MATHEMATICS_FLAG2_*
         <flag-bit name='mathematics_numbers_root_2_to_5_digits' original-name='NUMBERS_ROOT_2_TO_5_DIGITS'/>
         <flag-bit name='mathematics_numbers_infinite_primes' original-name='NUMBERS_INFINITE_PRIMES'/>
         <flag-bit name='mathematics_numbers_root_2_irrational' original-name='NUMBERS_ROOT_2_IRRATIONAL'/>
@@ -4578,7 +4578,7 @@
     -- Unused: CanEatValue
     -- Unused: SafeTemperatureValue
 
-    <enum-type type-name='inclusion_type'> bay12: InclusionType, no base type
+    <enum-type type-name='inclusion_type' base-type='int16_t'> bay12: InclusionType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='TOTAL'/>
         <enum-item name='VEIN'/>
@@ -4628,7 +4628,7 @@
 
     <struct-type type-name='temperaturest'> seems like a convenient name
         <uint16_t name='whole' original-name='temp' init-value='10050'/>
-        <int16_t name='fraction' original-name='cur_heat' init-value='0'/>
+        <uint16_t name='fraction' original-name='cur_heat' init-value='0'/>
     </struct-type>
 
     -- Unused: FireState
@@ -10766,7 +10766,7 @@
         <enum-item name='INDOOR_ORCHARDS'/>
         <enum-item name='OUTDOOR_ORCHARDS'/>
         <enum-item name='WANDERER'/>
-        <enum-item name='BEAST_HUNTER'/>
+        <enum-item name='BEAST_HUNTER' original-name='HUNTER'/>
         <enum-item name='SCOUT'/>
 
         <enum-item name='WILL_ACCEPT_TRIBUTE'/>
@@ -12115,7 +12115,7 @@
 
     <struct-type type-name='history_event_context' original-name='contextst'>
         <bitfield base-type='uint32_t' type-name='context_flag' name='flags' original-name='flag'/>
-        <pointer type-name='historical_figure_relationships' name='interrogator_relationships' original-name='evidence_repository'/> evidence_repositoryst
+        <pointer type-name='evidence_repositoryst' name='interrogator_relationships' original-name='evidence_repository'/>
         <pointer type-name='interrogation_report' name='interrogation' original-name='interrogation_report'/>
         <int32_t name='artifact_id' ref-target='artifact_record'/>
         <int32_t name='entity_id' ref-target='historical_entity'/>
diff --git a/df.d_interface.xml b/df.d_interface.xml
index aa80f80ec..91d0faa4b 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -750,11 +750,11 @@
         <pointer type-name='stockpile_settings' name='sp'/>
 
         <enum type-name='stockpile_list' name='cur_main_mode'/>
-        <uint32_t name='cur_main_mode_flag'/>
+        <bitfield base-type='uint32_t' type-name='stockpile_group_set' name='cur_main_mode_flag'/>
         <enum type-name='stockpile_list' name='cur_sub_mode'/>
 
         <stl-vector type-name='stockpile_list' name='main_mode'/>
-        <stl-vector type-name='uint32_t' name='main_mode_flag'/>
+        <stl-vector type-name='stockpile_group_set' name='main_mode_flag'/>
 
         <stl-vector type-name='stockpile_list' name='sub_mode'/>
         <stl-vector type-name='stock_pile_pointer_type' name='sub_mode_ptr_type'/>
@@ -1205,8 +1205,8 @@
         <pointer type-name='language_name' name='name'/>
         <enum type-name='language_name_type' name='name_type'/>
 
-        <int32_t name='cur_name_place'/>
-        <int32_t name='cur_word_place'/>
+        <enum type-name='language_name_component' name='cur_name_place'/>
+        <enum base-type='int32_t' type-name='language_word_table_index' name='cur_word_place'/>
         <compound type-name='language_word_table' name='word_sel'/>
         <stl-vector type-name='int32_t' name='word_index'/>
         <stl-vector type-name='part_of_speech' name='word_index_asp'/>
@@ -1219,7 +1219,7 @@
         <stl-string name='cull_str'/>
 
         <pointer type-name='item' name='name_item_ptr'/>
-        <compound type-name='language_name' name='name_item' comment='used when naming items'/>
+        <compound type-name='language_name' name='name_item' original-name='name_item_name' comment='used when naming items'/>
 
         <pointer type-name='activity_entry' name='adv_naming_act'/>
         <pointer type-name='activity_event_conversationst' name='adv_naming_actev'/>
@@ -1502,7 +1502,7 @@
         <stl-vector type-name='int32_t' name='am_cand_spec_matg'/>
         <bool name='setting_ammo_new_type'/>
         <stl-vector type-name='int16_t' name='am_cand_type'/>
-        <stl-vector type-name='int32_t' name='am_cand_subtype'/>
+        <stl-vector type-name='int16_t' name='am_cand_subtype'/>
         <stl-bit-vector name='am_cand_foreign'/>
         <int32_t name='setting_ammo_scroll_position_am'/>
         <bool name='setting_ammo_scrolling_am'/>
@@ -1583,7 +1583,7 @@
 
     <enum-type type-name='burrow_selector_context_type' base-type='int32_t'> bay12: BurrowSelectorContextType
         <enum-item name='NONE' value='-1'/>
-        <enum-item name='GIVING_SQUAD_ORDER'/>
+        <enum-item name='GIVING_SQUAD_ORDER' original-name='GIVING_SQUAD_DEFENSE_ORDER'/>
     </enum-type>
 
     <struct-type type-name='burrow_selector_interfacest'>
@@ -1733,7 +1733,7 @@
 
         <static-array type-name='int32_t' index-enum='need_type' name='unmet_need_type'/>
         <static-array type-name='int32_t' index-enum='need_type' name='unmet_need_spec_id'/>
-        <static-array type-name='int32_t' index-enum='need_type' name='unmet_need_se'/>
+        <static-array type-name='int32_t' index-enum='need_type' name='unmet_need_sev'/>
         <int32_t name='unmet_need_num'/>
 
         <stl-vector pointer-type='stl-string' name='raw_thought_str'/>
@@ -2289,7 +2289,7 @@
         <stl-vector type-name='int32_t' name='alias_identity_id'/>
 
         <pointer type-name='organization_entryst' name='principle_org'/>
-        <stl-vector type-name='organization_entryst' name='associated_org'/>
+        <stl-vector pointer-type='organization_entryst' name='associated_org'/>
         <stl-vector pointer-type='plot_entryst' name='associated_plot'/>
 
         <bitfield base-type='uint32_t' type-name='actor_entry_flag' name='flag'/>
@@ -2381,7 +2381,7 @@
 
         <compound type-name='curses_text_boxst' name='interrogation_report_box'/>
         <int32_t name='interrogation_report_box_width'/>
-        <stl-vector type-name='interrogation_report' name='interrogation_report'/>
+        <stl-vector pointer-type='interrogation_report' name='interrogation_report'/>
         <pointer type-name='interrogation_report' name='viewing_interrogation_report'/>
         <int32_t name='scroll_position_interrogation_list'/>
         <bool name='scrolling_interrogation_list'/>
@@ -2805,7 +2805,7 @@
         <bool name='entering_value_str'/>
         <int32_t name='entering_value_index'/>
         <stl-string name='value_str'/>
-        <stl-vector pointer-type='world_gen_param_basest' name='member'/>
+        <stl-vector name='member'><stl-shared-ptr type-name='world_gen_param_valuest'/></stl-vector>
 
         <bool name='fullscreen_resolution_open'/>
         <stl-vector type-name='int32_t' name='permitted_fullscreen_w'/>
@@ -2951,13 +2951,13 @@
         <enum-item name='BURROW'/>
         <enum-item name='BURROW_PAINT'/>
         <enum-item name='HAULING'/>
-        <enum-item name='ARENA_UNIT'/>
-        <enum-item name='ARENA_TREE'/>
-        <enum-item name='ARENA_WATER_PAINT'/>
-        <enum-item name='ARENA_MAGMA_PAINT'/>
-        <enum-item name='ARENA_SNOW_PAINT'/>
-        <enum-item name='ARENA_MUD_PAINT'/>
-        <enum-item name='ARENA_REMOVE_PAINT'/>
+        <enum-item name='ARENA_UNIT' original-name='PLACING_CREATURE'/>
+        <enum-item name='ARENA_TREE' original-name='PLACING_TREE'/>
+        <enum-item name='ARENA_WATER_PAINT' original-name='FLUIDS_WATER'/>
+        <enum-item name='ARENA_MAGMA_PAINT' original-name='FLUIDS_MAGMA'/>
+        <enum-item name='ARENA_SNOW_PAINT' original-name='FLUIDS_SNOW'/>
+        <enum-item name='ARENA_MUD_PAINT' original-name='FLUIDS_MUD'/>
+        <enum-item name='ARENA_REMOVE_PAINT' original-name='FLUIDS_REMOVE'/>
     </enum-type>
 
     <enum-type type-name='main_hover_instruction' original-name='hover_instruction_type' base-type='int32_t'> bay12: HoverInstructionType
@@ -4869,10 +4869,10 @@
         <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_S'>
             <item-attr name='caption' value=''/>
         </enum-item>
-        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_E'>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_W'>
             <item-attr name='caption' value=''/>
         </enum-item>
-        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_W'>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_E'>
             <item-attr name='caption' value=''/>
         </enum-item>
         <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_NW'>
@@ -5195,7 +5195,7 @@
         <enum-item name='MUSIC_FORMS_PIECES'/>
         <enum-item name='MUSIC_ROLES'/>
         <enum-item name='DANCE_FORMS_PIECES'/>
-        <enum-item name='SERMON_TYPE'/>
+        <enum-item name='SERMON_TYPE' original-name='SERMON_TYPES'/>
         <enum-item name='SERMON_HFID'/>
         <enum-item name='SERMON_SPHERE'/>
         <enum-item name='SERMON_PROMOTE_VALUE'/>
@@ -5311,7 +5311,7 @@
         <bool name='scrolling_wrestle'/>
 
         <int32_t name='selected_bp'/>
-        <int32_t name='scrselected_item_idoll_position_wrestle'/>
+        <int32_t name='selected_item_id'/>
         <stl-vector type-name='dungeon_wrestle_type' name='cl_type'/>
         <stl-vector type-name='int32_t' name='cl_index'/>
         <compound type-name='combat_listst' name='combat_list'/>
@@ -5642,7 +5642,7 @@
     <struct-type type-name='startup_charactersheet_petst'>
         <compound type-name='language_name' name='name'/>
 
-        <int16_t name='race' ref-target='creature_raw'/>
+        <int32_t name='race' ref-target='creature_raw'/>
         <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
         <int16_t name='type'/>
     </struct-type>
@@ -5703,7 +5703,7 @@
             <enum base-type='int32_t' type-name='adventurer_attribute_level'/>
         </static-array>
 
-        <enum base-type='int16_t' name='difficulty' comment='chosen_destiny'>
+        <enum base-type='int16_t' name='difficulty' original-name='chosen_destiny'>
             <enum-item name='Peasant'/>
             <enum-item name='Hero'/>
             <enum-item name='Demigod'/>
@@ -5852,7 +5852,7 @@
 
     <struct-type type-name='lookinfo_verminst'>
         <int16_t name='race' ref-target='creature_raw'/>
-        <int32_t name='caste'/>
+        <int16_t name='caste'/>
         <int32_t name='item_id' ref-target='item'/>
         <uint32_t name='flag'/>
         <int32_t name='number'/>
@@ -6047,14 +6047,14 @@
         <enum-item name='PROCESS_MUSIC'/>
         <enum-item name='PROCESS_SOUND'/>
         <enum-item name='FINALIZE_LANGUAGE'/>
-        <enum-item name='FINALIZE_DESCRIPOR'/>
+        <enum-item name='FINALIZE_DESCRIPOR' original-name='FINALIZE_DESCRIPTOR'/>
         <enum-item name='FINALIZE_MATERIAL_TEMPLATE'/>
         <enum-item name='FINALIZE_INORGANIC'/>
         <enum-item name='FINALIZE_PLANT'/>
         <enum-item name='FINALIZE_TISSUE_TEMPLATE'/>
         <enum-item name='FINALIZE_ITEM'/>
         <enum-item name='FINALIZE_BUILDING'/>
-        <enum-item name='FINALIZE_BODY_DEAIL_PLAN'/>
+        <enum-item name='FINALIZE_BODY_DEAIL_PLAN' original-name='FINALIZE_BODY_DETAIL_PLAN'/>
         <enum-item name='FINALIZE_CREATURE_VARIATION'/>
         <enum-item name='FINALIZE_CREATURE'/>
         <enum-item name='FINALIZE_ENTITY'/>
@@ -6078,11 +6078,11 @@
         <bool name='entering_param_name'/>
         <int32_t name='sel_param'/>
         <stl-string name='enter_seed'/>
-        <bool name='editing_seed'/>
-        <bool name='editing_name'/>
-        <bool name='editing_title'/>
-        <bool name='confirm_delete'/>
-        <bool name='confirm_new_dims'/>
+        <bool name='editing_seed' original-name='entering_seed'/>
+        <bool name='editing_name' original-name='entering_name'/>
+        <bool name='editing_title' original-name='entering_title'/>
+        <bool name='confirm_delete' original-name='confirming_delete'/>
+        <bool name='confirm_new_dims' original-name='confirming_new_dims'/>
         <int16_t name='new_dimx'/>
         <int16_t name='new_dimy'/>
         <int8_t name='confirming_abort_save'/>
@@ -6310,7 +6310,14 @@
         <enum-item name="Quit" original-name='QUIT'/>
     </enum-type>
 
-    -- Unused: TitleModeType
+    <enum-type type-name='title_mode_type'> bay12: TitleModeType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='MAIN_MENU'/>
+        <enum-item name='CONTINUE_INACTIVE'/>
+        <enum-item name='CONTINUE_ACTIVE_WORLD'/>
+        <enum-item name='CONTINUE_ACTIVE'/>
+        <enum-item name='ABOUT'/>
+    </enum-type>
 
     <enum-type type-name='save_game_sort_type' base-type='uint8_t'> bay12: SaveGameSort
         <enum-item name='Name'/>
@@ -6323,7 +6330,7 @@
 
         <bool name='clean_first'/>
 
-        <int16_t name='mode'/>
+        <enum base-type='int16_t' type-name='title_mode_type' name='mode'/>
         <int32_t name='selected'/>
         <int32_t name='selected_r'/>
         <int8_t name='game_start_proceed'/>
@@ -6423,7 +6430,7 @@
             <enum base-type='int32_t' type-name='unit_labor'/>
         </stl-vector>
         <int32_t name='unit_labors_sidemenu_uplevel_idx' original-name='main_preflist_modepage'/>
-        <int8_t name='sideSubmenu' original-name='in_sub_pref_screen'/> determine if ESC is Done or Back
+        <bool name='sideSubmenu' original-name='in_sub_pref_screen'/> determine if ESC is Done or Back
 
         <int8_t name='keyRepeat' original-name='repause'/>
 
@@ -6924,7 +6931,7 @@
         <enum-item name='NORMAL'/>
         <enum-item name='CIVILIZATIONS'/>
         <enum-item name='MISSIONS_LIST'/>
-        <enum-item name='MISSION_DETAILS'/>
+        <enum-item name='MISSION_DETAILS' original-name='MISSIONS_DETAILS'/>
         <enum-item name='NEWS'/>
         <enum-item name='REPORTS'/>
         <enum-item name='CITIZENS'/>
@@ -6936,8 +6943,13 @@
     -- Unused: CIVLIST_MESSENGER_FLAG_*
     -- Unused: viewscreen_civlistst
 
-    -- Unused: CIVLIST_SQUAD_FLAG_* (again)
-    -- Unused: CIVLIST_MESSENGER_FLAG_* (again)
+    <bitfield-type type-name='civlist_squad_flag' base-type='uint32_t'> bay12: CIVLIST_SQUAD_FLAG_*
+        <flag-bit name='LOCKED_IN'/>
+    </bitfield-type>
+
+    <bitfield-type type-name='civlist_messenger_flag' base-type='uint32_t'> bay12: CIVLIST_MESSENGER_FLAG_*
+        <flag-bit name='LOCKED_IN'/>
+    </bitfield-type>
 
     <class-type type-name='viewscreen_worldst' inherits-from='viewscreen'>
         <int32_t name='region_cent_x'/>
@@ -6977,10 +6989,10 @@
         <int32_t name='scroll_position_ac'/>
 
         <stl-vector pointer-type='squad' name='squad'/>
-        <stl-vector type-name='uint32_t' name='squad_flag'/>
+        <stl-vector type-name='civlist_squad_flag' name='squad_flag'/>
         <stl-vector pointer-type='entity_position_assignment' name='messenger_epp'/>
         <stl-vector pointer-type='historical_entity' name='messenger_ent'/>
-        <stl-vector type-name='uint32_t' name='messenger_flag'/>
+        <stl-vector type-name='civlist_messenger_flag' name='messenger_flag'/>
         <int32_t name='scroll_position_squad'/>
         <bool name='scrolling_squad'/>
         <int32_t name='scroll_position_messenger'/>
@@ -7090,7 +7102,7 @@
     <class-type type-name='layer_object_buttonst' inherits-from='layer_object'>
         <int32_t name='x1' original-name='start_x'/>
         <int32_t name='y1' original-name='start_y'/>
-        <int32_t name='x2' original-name='end_X'/>
+        <int32_t name='x2' original-name='end_x'/>
         <int32_t name='y2' original-name='end_y'/>
         <int32_t name='has_mouse_lclick' original-name='clicked_lbut'/>
         <int32_t name='has_mouse_rclick' original-name='clicked_rbut'/>
@@ -7112,7 +7124,7 @@
         <int32_t name='x1' original-name='start_x'/>
         <int32_t name='y1' original-name='start_y'/>
         <int32_t name='page_size' original-name='jump'/>
-        <int32_t name='x2' original-name='end_X'/>
+        <int32_t name='x2' original-name='end_x'/>
         <int32_t name='y2' original-name='end_y'/>
         <int32_t name='mouse_l_cur' original-name='clicked_lbut_index'/>
         <int32_t name='mouse_r_cur' original-name='clicked_rbut_index'/>
diff --git a/df.dance_form.xml b/df.dance_form.xml
index d4f047f5c..8c1372195 100644
--- a/df.dance_form.xml
+++ b/df.dance_form.xml
@@ -193,7 +193,7 @@
         <enum type-name='dance_form_partner_intent' name='partner_intent' original-name='section_connection_tension'/>
         <enum type-name='dance_form_partner_cue_frequency' name='partner_cue_frequency' original-name='section_connection_time'/>
         <stl-vector type-name='dance_form_partner_change_type' name='partner_changes' original-name='section_group_dynamic'/>
-        <uint32_t name='dance_flag' original-name='section_dance_flag' init-value='0'/>
+        <bitfield base-type='uint32_t' type-name='dance_flag' name='dance_flag' original-name='section_dance_flag'/>
         <int32_t name='acts_out_event' original-name='section_acts_out_heid' ref-target='history_event'/>
         <int32_t name='acts_out_hf_story' original-name='section_acts_out_story_of_hfid' ref-target='historical_figure'/>
         <int32_t name='imitate_animal_movement' original-name='section_imitate_animal_movement' ref-target='creature_raw'/>
diff --git a/df.descriptor.xml b/df.descriptor.xml
index abb6b39f0..587962b5d 100644
--- a/df.descriptor.xml
+++ b/df.descriptor.xml
@@ -190,7 +190,7 @@
         <int32_t name='texpos'/>
     </struct-type>
 
-    <bitfield-type type-name='viewport_wall_flag' base-type='int64_t'> TODO: defined in g_src/graphics.h
+    <bitfield-type type-name='viewport_wall_flag' base-type='uint64_t'> TODO: defined in g_src/graphics.h
         <flag-bit name='todo'/>
     </bitfield-type>
 
@@ -199,7 +199,7 @@
         <int32_t name='texpos'/>
     </struct-type>
 
-    <bitfield-type type-name='viewport_ramp_flag' base-type='int64_t'> TODO: defined in g_src/graphics.h
+    <bitfield-type type-name='viewport_ramp_flag' base-type='uint64_t'> TODO: defined in g_src/graphics.h
         <flag-bit name='todo'/>
     </bitfield-type>
 
@@ -208,12 +208,12 @@
         <int32_t name='texpos'/>
     </struct-type>
 
-    <bitfield-type type-name='viewport_spatter_flag' base-type='int64_t'> TODO: defined in g_src/graphics.h
+    <bitfield-type type-name='viewport_spatter_flag' base-type='uint32_t'> TODO: defined in g_src/graphics.h
         <flag-bit name='todo'/>
     </bitfield-type>
 
     <struct-type type-name='spatter_graphics_infost'>
-        <bitfield base-type='int64_t' type-name='viewport_spatter_flag' name='flags' original-name='local_id'/>
+        <int64_t name='flags' original-name='local_id'/> cannot use bitfield here, since it ignores base-type
         <int32_t name='texpos'/>
     </struct-type>
 
diff --git a/df.entity.xml b/df.entity.xml
index 7c8a588eb..de3cce3ab 100644
--- a/df.entity.xml
+++ b/df.entity.xml
@@ -36,7 +36,7 @@
 
         <bitfield base-type='uint32_t' type-name='evidence_hf_file_flag' name='flags' original-name='flag'/>
 
-        <stl-vector type-name='int32_t' name='evidence'/>
+        <stl-vector type-name='evidence_type' name='evidence'/>
         <stl-vector type-name='int32_t' name='agreement' original-name='evidence_agreement_id' ref-target='agreement'/>
         <stl-vector type-name='evidence_flag' name='evidence_flag'/>
 
@@ -649,14 +649,14 @@
         <static-array name='friendly_color' type-name='int16_t' count='3'/> not an array
 
         <enum base-type='int32_t' type-name='world_site_type' name='default_site_type'/>
-        <static-array name='likes_site' type-name='int8_t' index-enum='world_site_type'/>
-        <static-array name='tolerates_site' type-name='int8_t' index-enum='world_site_type'/>
+        <static-array name='likes_site' type-name='bool' index-enum='world_site_type'/>
+        <static-array name='tolerates_site' type-name='bool' index-enum='world_site_type'/>
 
         <static-array name='biome_support' type-name='int32_t' index-enum='biome_type'/>
-        <static-array name='start_biome' type-name='int8_t' index-enum='biome_type'/>
-        <static-array name='settlement_biome' type-name='int8_t' index-enum='biome_type'/>
+        <static-array name='start_biome' type-name='bool' index-enum='biome_type'/>
+        <static-array name='settlement_biome' type-name='bool' index-enum='biome_type'/>
 
-        <static-array name='active_season' type-name='int8_t' index-enum='season'/>
+        <static-array name='active_season' type-name='bool' index-enum='season'/>
 
         <compound name='progress_trigger'> not a compound
             <int16_t name='population' original-name='progress_trigger_population'/>
@@ -687,7 +687,7 @@
 
         <compound name='jobs'> not a compound
             <static-array name='permitted_job' type-name='bool' index-enum='profession'/>
-            <static-array name='permitted_labor' original-name='permitted_profession' type-name='bool' index-enum='unit_labor'/>
+            <static-array name='permitted_labor' original-name='permitted_profession' type-name='int8_t' index-enum='unit_labor'/>
             <static-array name='world_construction' type-name='bool' index-enum='world_construction_type'/>
         </compound>
 
@@ -751,9 +751,9 @@
 
     <enum-type type-name='entity_entity_link_type' original-name='entity_association_type'> bay12: EntityAssociation, no base type
         <enum-item name='NONE' value='-1'/>
-        <enum-item name='PARENT'/>
-        <enum-item name='CHILD'/>
-        <enum-item name='RELIGIOUS' comment='Seen between religion and merc company.' since='v0.47.01'/>
+        <enum-item name='PARENT' original-name='ID_IS_UMBRELLA_CIV'/>
+        <enum-item name='CHILD' original-name='ID_IS_UNDER_UMBRELLA'/>
+        <enum-item name='RELIGIOUS' original-name='ID_IS_CORELIGIOUS' comment='Seen between religion and merc company.' since='v0.47.01'/>
     </enum-type>
 
     <struct-type type-name='entity_entity_link' original-name='entity_associationst'>
@@ -857,7 +857,12 @@
     </struct-type>
 
     -- Unused: EquipmentRole
-    -- Unused: EntityArtImageType
+
+    <enum-type type-name='entity_art_image_type' base-type='int16_t'> bay12: EntityArtImageType, no base type but only used as int16
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='MAIN_SYMBOL'/>
+        <enum-item name='COMMISSIONED'/>
+    </enum-type>
 
     <enum-type type-name='entity_uniform_type' base-type='int16_t'> bay12: EntityUniformType
         <enum-item name='None' original-name='NONE' value='-1'/>
@@ -1382,7 +1387,7 @@
         <flag-bit name='might_have_interaction_region_pops' original-name='MIGHT_HAVE_INTERACTION_REGION_POPS'/>
     </bitfield-type>
 
-    <enum-type type-name='historical_entity_type' base-type='int16_t'> bay12: EntityType
+    <enum-type type-name='historical_entity_type' original-name='entity_type' base-type='int16_t'> bay12: EntityType; no base type, but usually int16
         <enum-item name='NONE' value='-1'/>
         <enum-item name='Civilization' original-name='CIVILIZATION'/>
         <enum-item name='SiteGovernment' original-name='SITE'/>
@@ -1562,10 +1567,10 @@
 
             <static-array name='ethic' index-enum='ethic_type' type-name='ethic_response'/>
             <static-array name='values' original-name='value' type-name='int32_t' count='64' index-enum='value_type'/> SAVE_VALUENUM
-            <uint32_t name='scholar_flag' since='v0.42.01'/> likely ENTITY_SCHOLAR_FLAG_*
+            <bitfield base-type='uint32_t' type-name='entity_scholar_flag' name='scholar_flag' since='v0.42.02'/>
             <static-array name='permitted_skill' type-name='bool' index-enum='job_skill'/>
 
-            <stl-vector type-name='int16_t' name='art_image_types' original-name='art_image_type' comment='0 = civilization symbol, 1 = commissioned'/>
+            <stl-vector type-name='entity_art_image_type' name='art_image_types' original-name='art_image_type'/>
             <stl-vector type-name='int32_t' name='art_image_ids' original-name='art_image_chunk'/>
             <stl-vector type-name='int16_t' name='art_image_subids' original-name='art_image_member'/>
             <stl-vector type-name='uint8_t' name='art_image_char'/>
@@ -1775,8 +1780,8 @@
         <stl-vector type-name='int32_t' name='attacked_site_id' comment='used during world gen'/>
         <stl-vector type-name='int32_t' name='attacked_site_timer' comment='used during world gen'/>
 
-        <int32_t name='did_wg_variable_position'/>
-        <int32_t name='did_wg_variable_market_position'/>
+        <uint32_t name='did_wg_variable_position'/>
+        <uint32_t name='did_wg_variable_market_position'/>
         <int32_t name='dig_caution_end_year'/>
 
         <int32_t name='total_pop'/>
@@ -1800,7 +1805,7 @@
         <int32_t name='account' since='v0.47.01'/>
 
         <stl-vector pointer-type='entity_burial_requestst' name='burial_request' since='v0.34.01'/>
-        <pointer pointer-type='world_gen_wandering_groupst' name='current_wgwg'/>
+        <pointer type-name='world_gen_wandering_groupst' name='current_wgwg'/>
         <int32_t name='total_outcast_strength' since='v0.47.01'/>
 
         <int32_t name='temporary_count'/>
diff --git a/df.event.xml b/df.event.xml
index 0db450f0b..44bcef1d2 100644
--- a/df.event.xml
+++ b/df.event.xml
@@ -97,7 +97,7 @@
         <flag-bit name='is_roaming_colony' original-name='NOT_LIMITING' comment="colony building vermin away from colony"/>
     </bitfield-type>
 
-    <enum-type type-name='vermin_category' original-name='vermin_creature_type'> bay12: VerminCreationType
+    <enum-type type-name='vermin_category' original-name='vermin_creation_type'> bay12: VerminCreationType
         <enum-item name='None' original-name='NONE' value='-1'/>
         <enum-item name='Eater' original-name='EATER'/>
         <enum-item name='Grounder' original-name='GROUNDER'/>
@@ -190,7 +190,7 @@
 
     <struct-type type-name='construction' instance-vector='$global.world.event.constructions' key-field='pos' original-name='event_constructionst' custom-methods='true'>
         <compound type-name='coord' name='pos'/>
-        <enum type-name='item_type' original-name='i_type' name='item_type'/>
+        <enum type-name='item_type' name='item_type' original-name='i_type'/>
         <int16_t name='item_subtype' original-name='i_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' original-name='i_sc1' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' original-name='i_sc2'/>
diff --git a/df.g_src.graphics.xml b/df.g_src.graphics.xml
index 88229537e..6cfa73046 100644
--- a/df.g_src.graphics.xml
+++ b/df.g_src.graphics.xml
@@ -216,7 +216,7 @@
     -- Unused: PCGLayeringModifierType
     -- Unused: UnitStatusType
     -- Unused: SideIndicatorType
-    -- Unused: TreeWoodTileType
+    -- Skipped: TreeWoodTileType
 
     <enum-type type-name='texture_type'> bay12: Texture, no base type
         <enum-item name='NONE' value='-1'/>
@@ -782,8 +782,8 @@
         <int32_t name='frame_display_dy'/>
 
         <int16_t name='force_full_display_count'/>
-        <int8_t name='do_clean_tile_cache' comment='true by main, false by graphics'/>
-        <int8_t name='do_post_init_texture_clear' comment='true by main, false by graphics'/>
+        <bool name='do_clean_tile_cache' comment='true by main, false by graphics'/>
+        <bool name='do_post_init_texture_clear' comment='true by main, false by graphics'/>
 
         <int8_t name='original_rect'/>
         <int32_t name='dimx'/>
diff --git a/df.g_src.keybindings.xml b/df.g_src.keybindings.xml
index 2423640e2..ebe74cefe 100644
--- a/df.g_src.keybindings.xml
+++ b/df.g_src.keybindings.xml
@@ -693,8 +693,8 @@
         <enum-item name='ARENA_FLUIDS_REMOVE'/>
         <enum-item name='ARENA_CREATE_TREE'/>
         <enum-item name='ARENA_WEATHER'/>
-        <enum-item name='ARENA_CONFLICT_STATE1'/>
-        <enum-item name='ARENA_CONFLICT_STATE2'/>
+        <enum-item name='ARENA_CONFLICT_STATE1' original-name='ARENA_CONFLICT_STATE_1'/>
+        <enum-item name='ARENA_CONFLICT_STATE2' original-name='ARENA_CONFLICT_STATE_2'/>
         <enum-item name='ARENA_MORALE'/>
         <enum-item name='RECENTER'/>
         <enum-item name='OPEN_SHEET'/>
diff --git a/df.history.xml b/df.history.xml
index 4cba13970..de6e3b10d 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -28,7 +28,7 @@
         <int32_t name='method_modifier' comment="-141 to 351 seen"/>
 
         <enum type-name='personality_facet_type' name='manipulated_facet' original-name='facet'/>
-        <int32_t name='facet_rating'/>
+        <int16_t name='facet_rating'/>
         <int32_t name='facet_roll' original-name='facet_modifier'/>
 
         <enum type-name='value_type' name='manipulated_value' original-name='value'/>
diff --git a/df.history_event.xml b/df.history_event.xml
index 8af54ecad..a52af1bb6 100644
--- a/df.history_event.xml
+++ b/df.history_event.xml
@@ -1652,7 +1652,7 @@
 
     <enum-type type-name='building_profile_acquisition_method' original-name='sbp_acquisition_method_type' base-type='int32_t'> bay12: SBPAcquisitionMethodType
         <enum-item name='NONE' value='-1'/>
-        <enum-item name='PURCHASE_UNOWNED'/>
+        <enum-item name='PURCHASE_UNOWNED' original-name='PURCHASED_UNOWNED'/>
         <enum-item name='INHERITED'/>
         <enum-item name='REBUILT_RUINED'/>
     </enum-type>
diff --git a/df.history_figure.xml b/df.history_figure.xml
index bd7463fbe..bc566e1cf 100644
--- a/df.history_figure.xml
+++ b/df.history_figure.xml
@@ -1014,7 +1014,7 @@
         <enum-item name='never_cull' original-name='DO_NOT_CULL'/>
     </enum-type>
 
-    <bitfield-type type-name='histfig_temp_flag' base-type='uint32_t'> bay12: HF_TEMP_FLAG_*
+    <bitfield-type type-name='histfig_temp_flag' original-name='hf_temp_flag' base-type='uint32_t'> bay12: HF_TEMP_FLAG_*
         <flag-bit name='legends_has_network_map' original-name='LEGENDS_HAS_NETWORK_MAP'/>
     </bitfield-type>
 
@@ -1027,7 +1027,7 @@
 
         <enum type-name='pronoun_type' name='sex' original-name='gender'/>
 
-        <bitfield type-name='orientation_flags' original-name='sexual_orientation_flag' name='orientation_flags'/>
+        <bitfield type-name='orientation_flags' name='orientation_flags' original-name='sexual_orientation_flag'/>
         <int32_t name='appeared_year' original-name='appeared'/>
         <int32_t name='born_year' original-name='birth_year'/>
         <int32_t name='born_seconds' original-name='birth_season_count'/>
@@ -1076,7 +1076,7 @@
         <pointer type-name="world_region" name="worldgen_region" original-name='cur_location_sr'/>
         <pointer type-name="world_underground_region" name="worldgen_layer" original-name='cur_location_fl'/>
         <pointer type-name='unit_genes' name="worldgen_genetics" original-name='world_gen_genetics'/>
-        <pointer pointer-type='wg_relationship_quick_infost' name="worldgen_relationships" original-name='wg_relationship_quick_info'/>
+        <pointer type-name='wg_relationship_quick_infost' name="worldgen_relationships" original-name='wg_relationship_quick_info'/>
 
         <int32_t name="temp_var"/>
         <bitfield base-type='uint32_t' type-name='histfig_temp_flag' name="temp_flag"/>
diff --git a/df.interaction.xml b/df.interaction.xml
index ae5c8cbf8..34e1b6fe8 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -210,7 +210,7 @@
         <int16_t name='mat_type' original-name='material' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' original-name='matgloss'/>
         <enum type-name='matter_state' name='mat_state' original-name='matstate'/>
-        <enum type-name='breath_attack_type' original-name='breath_attack' name='breath_attack_type'/>
+        <enum type-name='breath_attack_type' name='breath_attack_type' original-name='breath_attack'/>
         <bitfield base-type='uint32_t' type-name='interaction_target_material_flag' name='restrictions' original-name='material_flag'/>
     </class-type>
 
@@ -341,10 +341,18 @@
         <stl-string name='caste_str' original-name='caste_token' comment='CREATURE'/>
         <stl-vector type-name='int32_t' name='races' original-name='race' ref-target='creature_raw'/>
         <stl-vector type-name='int16_t' name='castes' original-name='caste'/>
-        <stl-vector type-name='int32_t' name='required_creature_flags' original-name='required_creature_flag' comment='contains indexes of flags in creature_raw_flags, IE_CREATURE_FLAG'/>
-        <stl-vector type-name='int32_t' name='forbidden_creature_flags' original-name='forbidden_creature_flag' comment='contains indexes of flags in creature_raw_flags, IE_FORBIDDEN_CREATURE_FLAG'/>
-        <stl-vector type-name='int32_t' name='required_caste_flags' original-name='required_creature_caste_flag' comment='contains indexes of flags in caste_raw_flags, IE_CREATURE_CASTE_FLAG'/>
-        <stl-vector type-name='int32_t' name='forbidden_caste_flags' original-name='forbidden_creature_caste_flag' comment='contains indexes of flags in caste_raw_flags, IE_FORBIDDEN_CREATURE_CASTE_FLAG'/>
+        <stl-vector name='required_creature_flags' original-name='required_creature_flag' comment='IE_CREATURE_FLAG'>
+            <enum base-type='int32_t' type-name='creature_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='forbidden_creature_flags' original-name='forbidden_creature_flag' comment='IE_FORBIDDEN_CREATURE_FLAG'>
+            <enum base-type='int32_t' type-name='creature_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='required_caste_flags' original-name='required_creature_caste_flag' comment='IE_CREATURE_CASTE_FLAG'>
+            <enum base-type='int32_t' type-name='caste_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='forbidden_caste_flags' original-name='forbidden_creature_caste_flag' comment='IE_FORBIDDEN_CREATURE_CASTE_FLAG'>
+            <enum base-type='int32_t' type-name='caste_raw_flags'/>
+        </stl-vector>
         <int32_t name='min_gait_speed' original-name='minimum_effortless_gait_speed' init-value='-1'/>
         <int32_t name='max_gait_speed' original-name='maximum_effortless_gait_speed' init-value='-1'/>
         <int32_t name='time_range_min' original-name='min_time' comment='IE_TIME_RANGE'/>
@@ -369,8 +377,8 @@
 
     <class-type type-name='interaction_effect_change_weatherst' inherits-from='interaction_effect'>
         <uint32_t name='spec_flags' original-name='change_weather_flag'/>
-        <int16_t name='add_weather_flag'/>
-        <int16_t name='remove_weather_flag'/>
+        <bitfield base-type='int16_t' type-name='region_weather_bits' name='add_weather_flag'/>
+        <bitfield base-type='int16_t' type-name='region_weather_bits' name='remove_weather_flag'/>
     </class-type>
 
     <class-type type-name='interaction_effect_hidest' inherits-from='interaction_effect'>
diff --git a/df.item.xml b/df.item.xml
index 1d5ab19ae..a21f4bdef 100644
--- a/df.item.xml
+++ b/df.item.xml
@@ -128,7 +128,7 @@
         <enum-item name='BAR' original-name='i_bar'/>
         <enum-item name='SMALLGEM' original-name='i_smallgem'/>
         <enum-item name='BLOCKS' original-name='i_blocks'/>
-        <enum-item name='ROUGH' original-name='i_roughe'/>
+        <enum-item name='ROUGH' original-name='i_rough'/>
         <enum-item name='CORPSE' original-name='i_corpse'/>
         <enum-item name='FIGURINE' original-name='i_figurine'/>
         <enum-item name='AMULET' original-name='i_amulet'/>
@@ -166,7 +166,7 @@
         <enum-item name='ANY_CORPSE' original-name='i_body_component'/>
 
         <enum-item name='BOOK' original-name='i_book'/>
-        <enum-item name='FOOD_STORAGE' original-name='i_food_storage'/>
+        <enum-item name='FOOD_STORAGE' original-name='food_storage'/>
         <enum-item name='INSTRUMENT_STATIONARY' original-name='building_instrument'/>
         <enum-item name='SHEET' original-name='i_sheet'/>
         <enum-item name='BRANCH' original-name='branch'/>
@@ -1133,21 +1133,21 @@
 
                 <stl-vector type-name='uint32_t' name='numbered_masks' original-name='bp_ord_flag'
                             comment='1 bit per instance of a numbered body part'/>
-                <stl-vector type-name='uint32_t' name='nonsolid_remaining' original-name='tl_amount' comment='0-100%'
+                <stl-vector type-name='int32_t' name='nonsolid_remaining' original-name='tl_amount' comment='0-100%'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.nonsolid_layers[$].refers-to'/>
 
                 <stl-vector type-name='body_layer_status' name='layer_status' original-name='tl_flag'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_wound_area' original-name='tl_max_hole'
+                <stl-vector type-name='int32_t' name='layer_wound_area' original-name='tl_max_hole'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
 
                 Surface percentages for cuts/fractures, dents and effects (such as
                 bruises, burns, frostbite, melting, freezing, necrosis, and blistering)
-                <stl-vector type-name='uint32_t' name='layer_cut_fraction' original-name='tl_fracture_sum' comment='0-10000'
+                <stl-vector type-name='int32_t' name='layer_cut_fraction' original-name='tl_fracture_sum' comment='0-10000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_dent_fraction' original-name='tl_deform_sum' comment='0-10000'
+                <stl-vector type-name='int32_t' name='layer_dent_fraction' original-name='tl_deform_sum' comment='0-10000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_effect_fraction' original-name='tl_damage_sum' comment='0-1000000000'
+                <stl-vector type-name='int32_t' name='layer_effect_fraction' original-name='tl_damage_sum' comment='0-1000000000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
             </compound>
 
@@ -1546,7 +1546,7 @@
         <stl-string name='description' original-name='memorial'/>
 
         <int32_t name='topic' ref-target='historical_figure' comment='or interaction id for secrets'/>
-        <enum type-name='slab_engraving_type' original-name='engraving_intent' name='engraving_type'/>
+        <enum type-name='slab_engraving_type' name='engraving_type' original-name='engraving_intent'/>
     </class-type>
 
     <class-type type-name='item_quernst' inherits-from='item_constructed'/>
diff --git a/df.itemdef.xml b/df.itemdef.xml
index 54fed01ff..3fff48283 100644
--- a/df.itemdef.xml
+++ b/df.itemdef.xml
@@ -506,7 +506,7 @@
     </struct-type>
 
     <struct-type type-name='timbre_infost'>
-        <stl-vector pointer-type='instrument_register' name="registers"/>
+        <stl-vector pointer-type='instrument_register' name="registers" original-name='instrument_register'/>
         <stl-vector type-name='timbre_type' name="timbre" original-name='global_timbre'/>
     </struct-type>
 
@@ -572,7 +572,7 @@
         <stl-vector pointer-type='stl-string' name="tuning_parm" original-name='tuning_piece'/>
         <stl-vector type-name='int32_t' name="tuning_piece_id"/>
 
-        <compound type-name='timbre_infost' name='timbre'/>
+        <compound type-name='timbre_infost' name='timbre' original-name='timbre_info'/>
 
         <stl-string name="description"/>
     </class-type>
diff --git a/df.material.xml b/df.material.xml
index eda0783ee..def0cf42d 100644
--- a/df.material.xml
+++ b/df.material.xml
@@ -626,10 +626,18 @@
         <stl-string name="caste_str" original-name='caste_token'/>
         <stl-vector type-name='int32_t' name='race' ref-target='creature_raw'/>
         <stl-vector type-name='int16_t' name='caste' ref-target='caste_raw' aux-value='$$.race'/>
-        <stl-vector type-name='int32_t' name='required_creature_flags' original-name='required_creature_flag' comment='contains indexes of flags in creature_raw_flags'/>
-        <stl-vector type-name='int32_t' name='forbidden_creature_flags' original-name='forbidden_creature_flag' comment='contains indexes of flags in creature_raw_flags'/>
-        <stl-vector type-name='int32_t' name='required_caste_flags' original-name='required_creature_caste_flag' comment='contains indexes of flags in caste_raw_flags'/>
-        <stl-vector type-name='int32_t' name='forbidden_caste_flags' original-name='forbidden_creature_caste_flag' comment='contains indexes of flags in caste_raw_flags'/>
+        <stl-vector name='required_creature_flags' original-name='required_creature_flag'>
+            <enum base-type='int32_t' type-name='creature_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='forbidden_creature_flags' original-name='forbidden_creature_flag'>
+            <enum base-type='int32_t' type-name='creature_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='required_caste_flags' original-name='required_creature_caste_flag'>
+            <enum base-type='int32_t' type-name='caste_raw_flags'/>
+        </stl-vector>
+        <stl-vector name='forbidden_caste_flags' original-name='forbidden_creature_caste_flag'>
+            <enum base-type='int32_t' type-name='caste_raw_flags'/>
+        </stl-vector>
         <int32_t name='minimum_effortless_gait_speed' init-value='-1'/>
         <int32_t name='maximum_effortless_gait_speed' init-value='-1'/>
     </class-type>
diff --git a/df.matgloss.xml b/df.matgloss.xml
index 7eb7fb0dc..f6926cd7b 100644
--- a/df.matgloss.xml
+++ b/df.matgloss.xml
@@ -284,7 +284,7 @@
 
     -- Simplified: pmd_tree_texture_infost
     <struct-type type-name='pmd_tree_texture_infost'>
-        <static-array name='texpos_tree_wood_tile' type-name='int32_t' count='104'/> TREE_PART_TILENUM
+        <static-array name='texpos_tree_wood_tile' type-name='int32_t' count='216'/> TREE_WOOD_TILENUM
         <static-array name='texpos_tree_twigs_full' type-name='int32_t' count='12'/> most of these aren't actually arrays
         <static-array name='texpos_tree_twigs' type-name='int32_t' count='16'/> but definining them all individually will make builds take longer
         <static-array name='texpos_overleaves' type-name='int32_t' count='15'/>
diff --git a/df.mental_picture.xml b/df.mental_picture.xml
index 86143a27c..3a5c8003b 100644
--- a/df.mental_picture.xml
+++ b/df.mental_picture.xml
@@ -73,7 +73,7 @@
     </enum-type>
 
     <bitfield-type type-name='mental_picture_property_action_flag' base-type='uint32_t'> bay12: MENTAL_PICTURE_PROPERTY_ACTION_FLAG_*
-        <flag-bit name='continuous'/>
+        <flag-bit name='continuous' original-name='CONTINUOUS'/>
     </bitfield-type>
 
     <class-type type-name='mental_picture_property_actionst' inherits-from='mental_picture_propertyst'>
diff --git a/df.personality.xml b/df.personality.xml
index d4dcdc596..f19bf9fec 100644
--- a/df.personality.xml
+++ b/df.personality.xml
@@ -1480,13 +1480,13 @@
         <int32_t name='next_dream_id' original-name='next_goal_local_id' since='v0.40.01'/>
         <stl-vector pointer-type='personality_preferencest' name='preferences' original-name='preference' since='v0.40.01'/>
 
-        <static-array type-name='uint16_t' name='traits' original-name='nfacet' index-enum='personality_facet_type'/>
+        <static-array type-name='int16_t' name='traits' original-name='nfacet' index-enum='personality_facet_type'/>
 
         <int32_t name='civ_id' original-name='ethic_value_default_enid' ref-target='historical_entity' since='v0.40.01'/>
         <int32_t name='cultural_identity' original-name='ethic_value_default_cultural_identity_id' ref-target='cultural_identity' since='v0.40.01'/>
 
         <stl-vector pointer-type='mannerismst' name='mannerism'/>
-        <stl-vector type-name='int16_t' name='habit' comment='binary'/>
+        <stl-vector type-name='habit_type' name='habit' comment='binary'/>
 
         <int32_t name='stress'/>
         <int32_t name='time_without_distress' since='v0.40.14' comment='range 0-806400, higher values cause stress to decrease quicker'/>
diff --git a/df.plotinfo.xml b/df.plotinfo.xml
index 379686985..8c132a0bd 100644
--- a/df.plotinfo.xml
+++ b/df.plotinfo.xml
@@ -4,7 +4,7 @@
         <stl-vector type-name='int16_t' name='nemesis_member_idx' original-name='u_chunk_member'/>
         <stl-vector pointer-type='unit' name='units' original-name='nem_unit'/>
 
-        <pointer type-name='unit_chunk' original-name='uc' name='cur_unit_chunk'/>
+        <pointer type-name='unit_chunk' name='cur_unit_chunk' original-name='uc'/>
         <int32_t name='cur_unit_chunk_num' original-name='cur_chunk_id' init-value='-1'/>
         <int32_t name='units_offloaded' original-name='u' init-value='-1'/>
     </struct-type>
@@ -855,7 +855,7 @@
                     comment='guild complaints and diplomats'/>
 
         <stl-vector pointer-type='activity_info' name='activities' original-name='activity'/>
-        <stl-vector pointer-type='meeting_diplomat_info' name='dip_meeting_info' original-name='diplomat'/>
+        <stl-vector pointer-type='meeting_diplomat_info' name='dip_meeting_info' original-name='diplomacy'/>
 
         <stl-vector type-name='int32_t' name='aid_requesters' original-name='requester' ref-target='unit'/>
 
diff --git a/df.region.xml b/df.region.xml
index ae8d14336..836c7baa4 100644
--- a/df.region.xml
+++ b/df.region.xml
@@ -594,10 +594,10 @@
         <int32_t name='line_num'/>
 
         <static-array name='marker_xy' count='1000'><int32_t name='x'/><int32_t name='y'/></static-array>
-        <static-array name='marker_char' type-name='int8_t' count='1000'/>
-        <static-array name='marker_f' type-name='int8_t' count='1000'/>
-        <static-array name='marker_b' type-name='int8_t' count='1000'/>
-        <static-array name='marker_br' type-name='int8_t' count='1000'/>
+        <static-array name='marker_char' type-name='uint8_t' count='1000'/>
+        <static-array name='marker_f' type-name='uint8_t' count='1000'/>
+        <static-array name='marker_b' type-name='uint8_t' count='1000'/>
+        <static-array name='marker_br' type-name='uint8_t' count='1000'/>
         <int32_t name='marker_num'/>
     </struct-type>
 
@@ -680,7 +680,7 @@
     -- Unused: REGION_WALK_*
 
     <struct-type type-name='embark_note' original-name='region_notest'>
-        <int8_t name='tile' original-name='symbol'/>
+        <uint8_t name='tile' original-name='symbol'/>
         <int16_t name='fg_color' original-name='f'/>
         <int16_t name='bg_color' original-name='b'/>
         <stl-string name='name' original-name='text'/>
@@ -721,7 +721,7 @@
         <static-array count='12' name='spb'><static-array count='12' type-name='smm_pathing_blockst'/></static-array>
 
         <int32_t name='spb_pmap_start'/>
-        <int32_t name='spb_pmap_end'/>
+        <int32_t name='spb_pmap_end' original-name='spb_dirmap_start'/>
         <bool name='spb_pmap_clear'/>
         <bool name='spb_dirmap_clear'/>
     </struct-type>
@@ -885,7 +885,7 @@
         <static-array name='geo_layers' original-name='placement_layer' count='100' pointer-type='world_geo_layer'/>
         <static-array name='placement_freq' count='100' type-name='int8_t'/>
         <static-array name='placement_parent' count='100' type-name='int16_t'/>
-        <int32_t name='have_logged_parameters'/>
+        <bool name='have_logged_parameters'/>
 
         <int32_t name='finalized_civ_mats' original-name='finalizing_civ_mats'/>
         <int32_t name='finalized_art' original-name='finalizing_art_images'/>
@@ -905,7 +905,7 @@
         <int32_t name='rivers_total' original-name='rivernum'/>
         <int32_t name='rivers_cur' original-name='curriver'/>
 
-        <int8_t name='last_used_valid'/>
+        <bool name='last_used_valid'/>
         <stl-string name='last_param_set' original-name='last_used_title'/>
         <stl-string name='last_seed' original-name='last_used_seed'/>
         <stl-string name='last_history_seed' original-name='last_used_history_seed'/>
@@ -921,7 +921,7 @@
         <bool name='made_cave_civs' original-name='prehistory_have_layer_ents'/>
         <bool name='finished_prehistory' original-name='prehistory_finished'/>
         <stl-vector pointer-type='world_site' name='mythical_site'/>
-        <stl-vector pointer-type='world_site' name='caves' original-name='cage'/>
+        <stl-vector pointer-type='world_site' name='caves' original-name='cave'/>
         <stl-vector pointer-type='world_site' name='orig_cave'/>
         <int32_t name='current_bandit_num'/>
 
diff --git a/df.region_midmap.xml b/df.region_midmap.xml
index 53322f714..657e62ab8 100644
--- a/df.region_midmap.xml
+++ b/df.region_midmap.xml
@@ -90,7 +90,7 @@
         <int16_t name='liquid_upper_filled_z'/>
         <int16_t name='openness' original-name='open_perc'/>
         <int16_t name='passage_density' original-name='passage_density_perc'/>
-        <static-array count='2' type-name='int16_t' name='vertical_connection'/>
+        <static-array count='2' type-name='layer_connection_type' name='vertical_connection'/>
 
         <enum base-type='int16_t' type-name='layer_type' name="top_layer_idx" original-name='layer_depth'
                     comment='topmost cave layer the feature reaches'/>
diff --git a/df.regionpop.xml b/df.regionpop.xml
index 4a58442d5..4f51567d4 100644
--- a/df.regionpop.xml
+++ b/df.regionpop.xml
@@ -19,10 +19,10 @@
             <int16_t name="plant" ref-target='plant_raw'/>
         </compound>
 
-        <int32_t name="count_min" original-name='number' init-value='10000001'/>
-        <int32_t name="count_max" original-name='max_number' init-value='10000001'/>
+        <uint32_t name="count_min" original-name='number' init-value='10000001'/>
+        <uint32_t name="count_max" original-name='max_number' init-value='10000001'/>
 
-        <int32_t name='temp_num' original-name='temp_number' init-value='0' since='v0.40.01'/>
+        <uint32_t name='temp_num' original-name='temp_number' init-value='0' since='v0.40.01'/>
 
         <int32_t name="owner" original-name='controlling_enid' ref-target='historical_entity'/>
         <int32_t name="breed" original-name='breed_id' ref-target='breed'/>
diff --git a/df.site.xml b/df.site.xml
index 9163a9cfc..e3e3580da 100644
--- a/df.site.xml
+++ b/df.site.xml
@@ -210,18 +210,18 @@
         <int32_t name='y' original-name='abs_smm_y'/>
         <int32_t name='z' original-name='abs_z'/>
 
-        <static-array name='construction_type' count='16'><static-array count='16' type-name='int32_t'/></static-array>
+        <static-array name='construction_type' count='16'><static-array count='16'><enum base-type='int32_t' type-name='building_type'/></static-array></static-array>
         <static-array name='construction_subtype' count='16'><static-array count='16' type-name='int32_t'/></static-array>
         <static-array name='construction_subcat1' count='16'><static-array count='16' type-name='int32_t'/></static-array>
         <static-array name='construction_subcat2' count='16'><static-array count='16' type-name='int32_t'/></static-array>
-        <static-array name='construction_jobitemflag' count='16'><static-array count='16' type-name='uint32_t'/></static-array>
+        <static-array name='construction_jobitemflag' count='16'><static-array count='16' type-name='job_material_category'/></static-array>
         <static-array name='construction_phase' count='16'><static-array count='16' type-name='int32_t'/></static-array>
 
-        <static-array name='building_type' count='16'><static-array count='16' type-name='int32_t'/></static-array>
+        <static-array name='building_type' count='16'><static-array count='16'><enum base-type='int32_t' type-name='building_type'/></static-array></static-array>
         <static-array name='building_subtype' count='16'><static-array count='16' type-name='int32_t'/></static-array>
         <static-array name='building_subcat1' count='16'><static-array count='16' type-name='int32_t'/></static-array>
         <static-array name='building_subcat2' count='16'><static-array count='16' type-name='int32_t'/></static-array>
-        <static-array name='building_jobitemflag' count='16'><static-array count='16' type-name='uint32_t'/></static-array>
+        <static-array name='building_jobitemflag' count='16'><static-array count='16' type-name='job_material_category'/></static-array>
         <static-array name='building_phase' count='16'><static-array count='16' type-name='int32_t'/></static-array>
 
         <static-array name='progress_flag' count='16'><static-array count='16' type-name='scbp_progress_flag'/></static-array>
diff --git a/df.site_realization.xml b/df.site_realization.xml
index 887214a93..ddecdd9fe 100644
--- a/df.site_realization.xml
+++ b/df.site_realization.xml
@@ -429,7 +429,7 @@
     </struct-type>
 
     <struct-type type-name='sul_featurest'>
-        <int32_t name="feature_idx"/>
+        <int32_t name="feature_idx" original-name='feature_ind'/>
         <int32_t name="feature_x" original-name='feature_ax'/>
         <int32_t name="feature_y" original-name='feature_ay'/>
         <int32_t name="feature_depth"/>
@@ -490,7 +490,7 @@
         <stl-vector pointer-type='sul_featurest' name='feature' since='v0.44.01'/>
         <int32_t name="sewer_wet_el" init-value='-30000'/>
         <int32_t name="river_wet_el" init-value='-30000'/>
-        <bitfield base-type='uint32_t' type-name='underground_info_flag' name='flags' original-name='f;ag'/>
+        <bitfield base-type='uint32_t' type-name='underground_info_flag' name='flags' original-name='flag'/>
         <int32_t name="intersection_x"/>
         <int32_t name="intersection_y"/>
         <int32_t name="access_road_tx"/>
@@ -744,7 +744,7 @@
             <static-array count='17' type-name='uint8_t'/>
         </static-array>
         <static-array name='mini_colors' original-name='map_color' count='17'>
-            <static-array count='17' type-name='int16_t' comment='bold shl 6|bg shl 3|fg'/>
+            <static-array count='17' type-name='uint16_t' comment='bold shl 6|bg shl 3|fg'/>
         </static-array>
         <static-array name='map_tile_g' count='17'>
             <static-array count='17' type-name='site_graphics_tile_type'/>
diff --git a/df.skill_enum.xml b/df.skill_enum.xml
index 9830c5d10..67638fa3d 100644
--- a/df.skill_enum.xml
+++ b/df.skill_enum.xml
@@ -715,7 +715,7 @@
         -- 118
 
         <!-- cannot be 'SING' because this causes a conflict with math.h -->
-        <enum-item name='SING_MUSIC'>
+        <enum-item name='SING_MUSIC' original-name='SING'>
             <item-attr name='caption' value='Singing'/>
             <item-attr name='caption_noun' value='Singer'/>
             <item-attr name='profession' value='BARD'/>
diff --git a/df.soul.xml b/df.soul.xml
index 6d6d256d1..f00b042f9 100644
--- a/df.soul.xml
+++ b/df.soul.xml
@@ -51,7 +51,7 @@
             (fmt "~:(~A ~A~)" $it.caste[$.caste].caste_id $it.creature_id))
         </code-helper>
 
-        <bitfield type-name='orientation_flags' original-name='sexual_orientation_flag' name='orientation_flags'/>
+        <bitfield type-name='orientation_flags' name='orientation_flags' original-name='sexual_orientation_flag'/>
         <int32_t name='birth_year' init-value='-1'/>
         <int32_t name='birth_time' original-name='birth_season_count' init-value='-1'/>
         <int32_t name='curse_year' original-name='frozen_age_year' init-value='-1' since='v0.34.01'/>
diff --git a/df.squad.xml b/df.squad.xml
index 21a52a0da..9b587e37b 100644
--- a/df.squad.xml
+++ b/df.squad.xml
@@ -147,7 +147,7 @@
         <int32_t name="item" original-name='spec_item_id_requested' ref-target='item'/>
 
         <enum base-type='int16_t' type-name='item_type' name="item_type" original-name='type'/>
-        <int16_t name="item_subtype" original-name='sybtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
+        <int16_t name="item_subtype" original-name='subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <enum type-name='entity_material_category' name="material_class" original-name='civ_mat'/>
         <int16_t name='mattype' original-name='spec_mat' ref-target='material' aux-value='$$.matindex'/>
         <int32_t name='matindex' original-name='spec_matg'/>
diff --git a/df.unit.xml b/df.unit.xml
index 1a07a663d..25e04b232 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -1317,7 +1317,7 @@
         <enum-item name='WORKING'/>
     </enum-type>
 
-    <bitfield-type type-name='unit_flags1' original-name='unit_flag1' base-type='uint32_t'> bay12: UNITFLAG_*
+    <bitfield-type type-name='unit_flags1' original-name='unit_flag' base-type='uint32_t'> bay12: UNITFLAG_*
         <flag-bit name='move_state' original-name='CANMOVE'
                   comment='Can the dwarf move or are they waiting for their movement timer'/>
         <flag-bit name='inactive' original-name='DEAD'
@@ -1410,7 +1410,7 @@
     <bitfield-type type-name='unit_flags3' original-name='unit_flag3' base-type='uint32_t'> bay12: UNITFLAG3_*
         <flag-bit name='body_part_relsize_computed' original-name='RELSIZES_CALCULATED'/>
         <flag-bit name='size_modifier_computed' original-name='TOTAL_APP_SIZE_MOD_CALCULATED'/>
-        <flag-bit name='stuck_weapon_computed' original-name='STUCKIN_WOULD_FLAGS_CALCULATED' comment='cleared if removing StuckIn item to recompute wound flags.'/>
+        <flag-bit name='stuck_weapon_computed' original-name='STUCKIN_WOUND_FLAGS_CALCULATED' comment='cleared if removing StuckIn item to recompute wound flags.'/>
         <flag-bit name='compute_health' original-name='WOUND_CHECK_REQUIRED' comment='causes the health structure to be created or updated'/>
 
         <flag-bit name='announce_titan' original-name='UNANNOUNCED' comment='Announces creature like an FB or titan.'/>
@@ -2393,7 +2393,7 @@
         <int32_t name='wg_culture_reference_enid' ref-target='historical_entity'/>
     </struct-type>
 
-    <enum-type type-name='walker_goal_type' base-type='int16_t'> bay12: SRWalkerGoalType
+    <enum-type type-name='walker_goal_type' original-name='sr_walker_goal_type' base-type='int16_t'> bay12: SRWalkerGoalType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='STROLL'/>
         <enum-item name='GET_WATER'/>
@@ -2453,7 +2453,7 @@
         <int16_t name='path_length'/>
         <int16_t name='path_index'/>
         <int32_t name='group_id'/>
-        <bitfield base-type='uint32_t' type-name='sr_walker_flag' name='flags'/>
+        <bitfield base-type='uint32_t' type-name='sr_walker_flag' name='flags' original-name='flag'/>
     </struct-type>
 
     <struct-type type-name='unit_army_infost'>
@@ -2759,7 +2759,7 @@
 
             <uint32_t name='random_appearance_number'/>
 
-            <pointer type-name='unit' original-name='target' name='hunt_target'/>
+            <pointer type-name='unit' name='hunt_target' original-name='target'/>
             <bitfield type-name='unit_target_flags' name='target_flags' original-name='target_flag'/>
             <pointer type-name='building' name='destroy_target' original-name='btarget'/>
             <compound type-name='coord' name='btarget_construction_or_wall'/>
@@ -2790,21 +2790,21 @@
 
                 <stl-vector type-name='uint32_t' name='numbered_masks' original-name='bp_ord_flag'
                             comment='1 bit per instance of a numbered body part'/>
-                <stl-vector type-name='uint32_t' name='nonsolid_remaining' original-name='tl_amount' comment='0-100%'
+                <stl-vector type-name='int32_t' name='nonsolid_remaining' original-name='tl_amount' comment='0-100%'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.nonsolid_layers[$].refers-to'/>
 
                 <stl-vector type-name='body_layer_status' name='layer_status' original-name='tl_flag'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_wound_area' original-name='tl_max_hole'
+                <stl-vector type-name='int32_t' name='layer_wound_area' original-name='tl_max_hole'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
 
                 Surface percentages for cuts/fractures, dents and effects (such as
                 bruises, burns, frostbite, melting, freezing, necrosis, and blistering)
-                <stl-vector type-name='uint32_t' name='layer_cut_fraction' original-name='tl_fracture_sum' comment='0-10000'
+                <stl-vector type-name='int32_t' name='layer_cut_fraction' original-name='tl_fracture_sum' comment='0-10000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_dent_fraction' original-name='tl_deform_sum' comment='0-10000'
+                <stl-vector type-name='int32_t' name='layer_dent_fraction' original-name='tl_deform_sum' comment='0-10000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
-                <stl-vector type-name='uint32_t' name='layer_effect_fraction' original-name='tl_damage_sum' comment='0-1000000000'
+                <stl-vector type-name='int32_t' name='layer_effect_fraction' original-name='tl_damage_sum' comment='0-1000000000'
                             index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
             </compound>
 
@@ -2828,8 +2828,8 @@
                 <int32_t name='length_base' original-name='pre_layer_body_size_1D' comment='(size_base*10000)^0.333'/>
             </compound>
 
-            <uint32_t name='blood_max' original-name='bloodmax'/>
-            <uint32_t name='blood_count' original-name='blood'/>
+            <int32_t name='blood_max' original-name='bloodmax'/>
+            <int32_t name='blood_count' original-name='blood'/>
 
             <int32_t name='infection_level' original-name='overall_infection_load'
                       comment='GETS_INFECTIONS_FROM_ROT sets; DISEASE_RESISTANCE reduces; >=300 causes bleeding'/>
@@ -2891,9 +2891,9 @@
             <int16_t name='soldier_mood_countdown' original-name='soldiermoodtimer' init-value='300' comment='plus a random amount' />
             <enum base-type='int16_t' type-name='soldier_mood_type' name='soldier_mood' original-name='soldiermood' init-value='None'/>
 
-            <uint32_t name='pain' original-name='total_pain'/>
-            <uint32_t name='nausea' original-name='total_nausea'/>
-            <uint32_t name='dizziness' original-name='total_dizziness'/>
+            <int32_t name='pain' original-name='total_pain'/>
+            <int32_t name='nausea' original-name='total_nausea'/>
+            <int32_t name='dizziness' original-name='total_dizziness'/>
         </compound>
 
         <bitfield base-type='uint32_t' type-name='unit_wound_special_stats_flag' name='uwss_flag'/>
@@ -2916,38 +2916,38 @@
         <int8_t name='uwss_flash_color_f'/>
         <int8_t name='uwss_flash_color_b'/>
         <int8_t name='uwss_flash_color_br'/>
-        <uint32_t name='uwss_alt_period' since='v0.34.01'/>
-        <uint32_t name='uwss_alt_on_period' since='v0.34.01'/>
+        <int32_t name='uwss_alt_period' since='v0.34.01'/>
+        <int32_t name='uwss_alt_on_period' since='v0.34.01'/>
 
         <stl-vector type-name='int32_t' name='uwss_body_modifier'
                     index-refers-to='$$._global.caste.ref-target.body_appearance_modifiers[$]'/>
         <stl-vector type-name='int32_t' name='uwss_bp_modifer' since='v0.34.01' comment='guess!'
                     index-refers-to='$$._global.caste.ref-target.bp_appearance.modifier_idx[$].refers-to'/>
 
-        <uint32_t name='uwss_speed_add' since='v0.34.01'/>
-        <uint32_t name='uwss_speed_perc' since='v0.34.01' init-value='100'/>
+        <int32_t name='uwss_speed_add' since='v0.34.01'/>
+        <int32_t name='uwss_speed_perc' since='v0.34.01' init-value='100'/>
 
         <pointer type-name='curse_attr_change' name='uwss_att_change' since='v0.34.01'/>
-        <uint32_t name='uwss_skill_role_adjust' since='v0.34.01' init-value='100'/>
+        <int32_t name='uwss_skill_role_adjust' original-name='uwss_skill_roll_adjust' since='v0.34.01' init-value='100'/>
         <int32_t name='uwss_erratic_level' since='v0.42.01'/>
 
         <compound type-name='unit_usable_interactionst' name='usable_interaction'/>
 
         <compound name='counters2'> not a compound
-            <uint32_t name='paralysis' original-name='max_paralysis'/>
-            <uint32_t name='numbness' original-name='max_numbness'/>
-            <uint32_t name='fever' original-name='max_fever'/>
-            <uint32_t name='exhaustion' original-name='exertion'/>
+            <int32_t name='paralysis' original-name='max_paralysis'/>
+            <int32_t name='numbness' original-name='max_numbness'/>
+            <int32_t name='fever' original-name='max_fever'/>
+            <int32_t name='exhaustion' original-name='exertion'/>
 
-            <uint32_t name='hunger_timer' original-name='hunger'/>
-            <uint32_t name='thirst_timer' original-name='thirst'/>
-            <uint32_t name='sleepiness_timer' original-name='drowsiness'/>
+            <int32_t name='hunger_timer' original-name='hunger'/>
+            <int32_t name='thirst_timer' original-name='thirst'/>
+            <int32_t name='sleepiness_timer' original-name='drowsiness'/>
 
-            <uint32_t name='stomach_content' original-name='fullness'/>
-            <uint32_t name='stomach_food' original-name='fullness_energy_based'/>
-            <uint32_t name='vomit_timeout' original-name='vomit_fluid_loading' comment='blocks nausea causing vomit'/>
+            <int32_t name='stomach_content' original-name='fullness'/>
+            <int32_t name='stomach_food' original-name='fullness_energy_based'/>
+            <int32_t name='vomit_timeout' original-name='vomit_fluid_loading' comment='blocks nausea causing vomit'/>
 
-            <uint32_t name='stored_fat' original-name='energy_storage' comment='hunger leads to death only when 0'/>
+            <int32_t name='stored_fat' original-name='energy_storage' comment='hunger leads to death only when 0'/>
         </compound>
 
         <compound name='status'> not a compound
@@ -3012,7 +3012,7 @@
             <bitfield type-name='pathfinding_flags' name='add_path_flags' original-name='override_permit' comment='pathing flags to OR, set to None after move'/>
 
             <bitfield type-name='tile_designation' name='liquid_type' original-name='speed_liqtype'/>
-            <uint8_t name='liquid_depth' original-name='speed_liqvalue'/>
+            <int8_t name='liquid_depth' original-name='speed_liqvalue'/>
 
             <int32_t name='histeventcol_id' original-name='associated_hecid' ref-target='history_event_collection' comment='linked to an active invasion or kidnapping'/>
         </compound>
diff --git a/df.unit_reaction.xml b/df.unit_reaction.xml
index b66322368..6f27dcac6 100644
--- a/df.unit_reaction.xml
+++ b/df.unit_reaction.xml
@@ -15,7 +15,7 @@
         <enum-item name='I_AM_LED_AND_YOU_ARE_LCU'/>
         <enum-item name='I_AM_LCU_AND_YOU_ARE_CHAINED'/>
         <enum-item name='I_AM_LCU_AND_YOU_ARE_LED'/>
-        <enum-item name='SOMEBODY_IS_CRAZE'/>,
+        <enum-item name='SOMEBODY_IS_CRAZE' original-name='SOMEBODY_IS_CRAZED'/>
         <enum-item name='NOT_LIVING_IS_FINE'/>
         <enum-item name='LIVING_MUST_BE_KILLED'/>
         <enum-item name='EVIL_DEAD'/>
diff --git a/df.world.xml b/df.world.xml
index dc96e593f..b6ffd7af7 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -662,14 +662,14 @@
         </compound>
 
         <compound name='area_grasses' comment="grasses in world tiles around embark. Populated at embark"> not a compound
-            <compound type-name='coord2d_path' name='world_tiles' original-name='local_wilderpop' comment="local_wilderpop"/>
+            <compound type-name='coord2d_path' name='world_tiles' original-name='local_wilderpop'/>
             <stl-vector pointer-type='grass_selectionst' name='layer_grasses' original-name='grass_selection' comment="one per layer per world tile"/>
         </compound>
 
         <compound name='flow_engine'> not a compound
-            <int8_t name='rnd_16' comment='flow_direction'/>
-            <int16_t name='rnd_256' comment='flow_index'/>
-            <int16_t name='rnd_pos' comment='flow_index_count'/>
+            <int8_t name='rnd_16' original-name='flow_direction'/>
+            <int16_t name='rnd_256' original-name='flow_index'/>
+            <int16_t name='rnd_pos' original-name='flow_index_count'/>
             <static-array name='rnd_x' original-name='flow_bx' type-name='int16_t' count='16'/>
             <static-array name='rnd_y' original-name='flow_by' type-name='int16_t' count='16'/>
 
diff --git a/df.world_construction.xml b/df.world_construction.xml
index 3a197ade1..ffea983f7 100644
--- a/df.world_construction.xml
+++ b/df.world_construction.xml
@@ -30,7 +30,7 @@
     </class-type>
 
     <class-type type-name='world_construction_square_roadst' inherits-from='world_construction_square'>
-        <enum base-type='int16_t' type-name='item_type' original-name='i_type' name='item_type'/>
+        <enum base-type='int16_t' type-name='item_type' name='item_type' original-name='i_type'/>
         <int16_t name='item_subtype' original-name='i_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' original-name='i_sc1' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' original-name='i_sc2'/>
@@ -40,14 +40,14 @@
 
     <class-type type-name='world_construction_square_bridgest' inherits-from='world_construction_square'>
         <int32_t name='road_id' original-name='master_wcid' ref-target='world_construction'/>
-        <enum base-type='int16_t' type-name='item_type' original-name='i_type' name='item_type'/>
+        <enum base-type='int16_t' type-name='item_type' name='item_type' original-name='i_type'/>
         <int16_t name='item_subtype' original-name='i_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' original-name='i_sc1' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' original-name='i_s2'/>
     </class-type>
 
     <class-type type-name='world_construction_square_wallst' inherits-from='world_construction_square'>
-        <enum base-type='int16_t' type-name='item_type' original-name='i_type' name='item_type'/>
+        <enum base-type='int16_t' type-name='item_type' name='item_type' original-name='i_type'/>
         <int16_t name='item_subtype' original-name='i_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
         <int16_t name='mat_type' original-name='i_sc1' ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name='mat_index' original-name='i_sc2'/>