From 26cbbbd3f0906558a8510034b168cd70042fc228 Mon Sep 17 00:00:00 2001
From: "Lochner, Ellie N" <ellie.lochner@pnnl.gov>
Date: Sun, 4 Jun 2023 22:48:21 +0000
Subject: [PATCH] Pull request #282: enl/feature/chunk-rename

Merge in JGCRI/gcam-core from enl/feature/chunk-rename to master

Squashed commit of the following:

commit 141cfdd2bbe03d38f421280ca273a609a8cd9cd4
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sun Jun 4 16:13:09 2023 -0500

    Remove successive mutates

commit 39924b6d553cfb0729f1039616689b4f8f0935ce
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sun Jun 4 15:23:50 2023 -0500

    Rename macro chunks

commit 2a2158fc47f6114a3e713bfc2f72e632cf4502b0
Merge: cb5b30a31 2b555554c
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sun Jun 4 14:57:03 2023 -0500

    Merge branch 'master' into enl/feature/chunk-rename

commit cb5b30a312a319131c69e32213cd10610e28a223
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sun Jun 4 14:46:24 2023 -0500

    Add export line to script

commit 89656b4206be23a31fff8ba88f0c66816e535141
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sun Jun 4 11:33:20 2023 -0500

    Rename gcamdata chunks

commit beac6e8745667a04de25e265ab7349954a963134
Merge: d1ec8dc4d bdfb2c885
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sat Jun 3 15:29:34 2023 -0500

    Merge branch 'master' into enl/feature/chunk-rename

commit d1ec8dc4d0f5fea7df2d1387cdf57f8fe8d3771e
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon May 8 13:30:24 2023 -0500

    Small updates to chunk rename function

commit ba6cb95ec3af14986a92e399a9c4a39ce2a83769
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sat May 6 16:32:07 2023 -0500

    Add chunk rename function to data system

commit a7e4cd5e9997989835dbe646a6ee43a9c72492da
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Sat May 6 15:22:32 2023 -0500

    Add test that checks if chunks need to be renamed

commit 21848d08f4f04b869c208e8b398f358ba778d1fd
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Thu Jan 5 12:29:51 2023 -0600

    Update GCAM_DATA_MAP

commit 885f55cb8850337cdda99689a5d23830046313a5
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Thu Jan 5 09:26:32 2023 -0600

    gcamdata changes to get timeshift test to pass

commit eec7fc3660775d409f1c7d250223126beb476ed9
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Tue Nov 1 13:21:58 2022 -0500

    Updates to get tests to pass including removing consecutive mutates

commit 6b3c93726cfbe55315f72cceb77681940fda909a
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Wed Oct 26 11:35:16 2022 -0500

    Fix capitalization errors in constants

commit ea8c28f53ecc288631a743aa49a2aa10b7b733fe
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 22:08:34 2022 -0500

    Update xml script module names

commit 4d69d080e044c785b59c654519e1d0055a5de8a4
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 21:02:49 2022 -0500

    Rename xml chunks

commit ea4fad8398da5d9bb29dfd712879d53d9b2616d9
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 15:25:55 2022 -0500

    Update module names for gcamusa chunks

commit f969d2d49bf41496da1aaff2de03aa4c8faf2773
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 13:54:21 2022 -0500

    Rename gcamusa files with zgcamusa in front, and remove _USA for simplicity

commit f804dd092cf27208829071b077185a4437928457
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 13:52:53 2022 -0500

    Remove successive mutates from R chunks

commit a26cf19dfeefe38fff75abb334bbb521cf5b1870
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 10:08:12 2022 -0500

    Remove module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr from exported functions

commit 4c0ca482286ec12c9d028680d65b43936af30c5d
Author: enlochner <ellie.lochner@pnnl.gov>
Date:   Mon Oct 24 09:59:15 2022 -0500

    Documentation updates for file renaming

... and 6 more commits
---
 input/gcamdata/NAMESPACE                      |   2 -
 input/gcamdata/R/admin.R                      | 354 +++++++++---------
 input/gcamdata/R/constants.R                  |  12 +-
 input/gcamdata/R/module-helpers.R             |  91 +++++
 ...ing.R => zaglu_L100.0_LDS_preprocessing.R} |   4 +-
 ...=> zaglu_L100.FAO_SUA_PrimaryEquivalent.R} |  36 +-
 ...tion.R => zaglu_L100.FAO_SUA_connection.R} |   4 +-
 ... zaglu_L100.FAO_preprocessing_OtherData.R} |   8 +-
 ...try.R => zaglu_L100.GTAP_downscale_ctry.R} |   6 +-
 ...R => zaglu_L100.IMAGE_downscale_ctry_yr.R} |  12 +-
 ...=> zaglu_L100.regional_ag_an_for_prices.R} |  12 +-
 ..._FAO_R_C_Y.R => zaglu_L101.ag_FAO_R_C_Y.R} |   4 +-
 ...Y.R => zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R} |   5 +-
 ...eed_R_C_Y.R => zaglu_L108.ag_Feed_R_C_Y.R} |   4 +-
 ...L_R_C_Y.R => zaglu_L109.ag_an_ALL_R_C_Y.R} |   4 +-
 ...For_FAO_R_Y.R => zaglu_L110.For_FAO_R_Y.R} |   4 +-
 ...esbio_R_C.R => zaglu_L111.ag_resbio_R_C.R} |   4 +-
 ...R => zaglu_L112.ag_prodchange_R_C_Y_GLU.R} |   4 +-
 ...U.R => zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R} |  14 +-
 ...121.Carbon_LT.R => zaglu_L121.Carbon_LT.R} |   4 +-
 ...LU.R => zaglu_L122.LC_R_Cropland_Yh_GLU.R} |  63 ++--
 ....R => zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R} |   4 +-
 ...h_GLU.R => zaglu_L124.LC_R_UnMgd_Yh_GLU.R} |   4 +-
 ...unk_LB125.LC_tot.R => zaglu_L125.LC_tot.R} |   4 +-
 ...LB131.LV_R_GLU.R => zaglu_L131.LV_R_GLU.R} |   4 +-
 ...p.R => zaglu_L141.ag_Fert_IFA_ctry_crop.R} |   4 +-
 ...LU.R => zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R} |   4 +-
 ...R => zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R} |   4 +-
 ...irr.R => zaglu_L152.ag_GTAP_R_C_GLU_irr.R} |   4 +-
 ...LU_irr.R => zaglu_L161.ag_R_C_Y_GLU_irr.R} |   4 +-
 ... zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R} |   4 +-
 ...irr.R => zaglu_L163.bio_Yield_R_GLU_irr.R} |   4 +-
 ....R => zaglu_L165.ag_water_R_C_Y_GLU_irr.R} |   4 +-
 ... => zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R} |   4 +-
 ...t.R => zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R} |   4 +-
 ...lu_L2012.ag_For_Past_bio_input_irr_mgmt.R} |   0
 ..._L202.an_input.R => zaglu_L202.an_input.R} |   0
 ...nput.R => zaglu_L203.ag_an_demand_input.R} |   0
 ....R => zaglu_L2042.resbio_input_irr_mgmt.R} |   0
 ...zaglu_L2052.ag_prodchange_cost_irr_mgmt.R} |   0
 ..._mgmt.R => zaglu_L2062.ag_Fert_irr_mgmt.R} |   0
 ...mgmt.R => zaglu_L2072.ag_water_irr_mgmt.R} |   0
 ...nd_input_1.R => zaglu_L221.land_input_1.R} |   0
 ...nd_input_2.R => zaglu_L222.land_input_2.R} |   0
 ...3_irr.R => zaglu_L2231.land_input_3_irr.R} |   0
 ....R => zaglu_L2242.land_input_4_irr_mgmt.R} |   0
 ....R => zaglu_L2252.land_input_5_irr_mgmt.R} |   0
 ..._L240.ag_trade.R => zaglu_L240.ag_trade.R} |   0
 ...4_pasture.R => zaglu_L242.ssp34_pasture.R} |   0
 ...e_input.R => zaglu_L243.bio_trade_input.R} |   0
 ...GMT_xml.R => zaglu_xml_ag_Fert_IRR_MGMT.R} |   4 +-
 ...zaglu_xml_ag_For_Past_bio_base_IRR_MGMT.R} |   4 +-
 ...t_xml.R => zaglu_xml_ag_an_demand_input.R} |   4 +-
 ...GMT_xml.R => zaglu_xml_ag_cost_IRR_MGMT.R} |   4 +-
 ...=> zaglu_xml_ag_prodchange_ref_IRR_MGMT.R} |   4 +-
 ...> zaglu_xml_ag_prodchange_ssp1_IRR_MGMT.R} |   4 +-
 ...> zaglu_xml_ag_prodchange_ssp2_IRR_MGMT.R} |   4 +-
 ...> zaglu_xml_ag_prodchange_ssp3_IRR_MGMT.R} |   4 +-
 ...> zaglu_xml_ag_prodchange_ssp4_IRR_MGMT.R} |   4 +-
 ...> zaglu_xml_ag_prodchange_ssp5_IRR_MGMT.R} |   4 +-
 ...ch_ag_trade_xml.R => zaglu_xml_ag_trade.R} |   4 +-
 ....R => zaglu_xml_ag_water_input_IRR_MGMT.R} |   4 +-
 ...ch_an_input_xml.R => zaglu_xml_an_input.R} |   4 +-
 ..._bio_trade_xml.R => zaglu_xml_bio_trade.R} |   4 +-
 ..._food_SSP1_xml.R => zaglu_xml_food_SSP1.R} |   4 +-
 ...input_1_xml.R => zaglu_xml_land_input_1.R} |   4 +-
 ...input_2_xml.R => zaglu_xml_land_input_2.R} |   4 +-
 ...IRR_xml.R => zaglu_xml_land_input_3_IRR.R} |   4 +-
 ...ml.R => zaglu_xml_land_input_4_IRR_MGMT.R} |   4 +-
 ...ml.R => zaglu_xml_land_input_5_IRR_MGMT.R} |   4 +-
 ..._ssp34_xml.R => zaglu_xml_pasture_ssp34.R} |   4 +-
 ...l.R => zaglu_xml_protected_land_input_2.R} |   4 +-
 ...l.R => zaglu_xml_protected_land_input_3.R} |   4 +-
 ...ml.R => zaglu_xml_resbio_input_IRR_MGMT.R} |   4 +-
 ...trade_xml.R => zaglu_xml_ssp3_bio_trade.R} |   4 +-
 ...de_xml.R => zaglu_xml_ssp4_ag_bio_trade.R} |   4 +-
 ...tch_hector_xml.R => zclimate_xml_hector.R} |   4 +-
 ...tch_magicc_xml.R => zclimate_xml_magicc.R} |   4 +-
 ..._xml.R => zclimate_xml_no_climate_model.R} |   4 +-
 ....R => zemissions_L102.nonco2_ceds_R_S_Y.R} |   2 +-
 ... => zemissions_L112.ceds_ghg_en_R_S_T_Y.R} |   0
 ..._Y.R => zemissions_L114.bcoc_en_R_S_T_Y.R} |   0
 ...zemissions_L1211.nonco2_awb_R_S_T_Y_IRR.R} |   0
 ...=> zemissions_L1221.ghg_agr_R_S_T_Y_IRR.R} |   0
 ...Y.R => zemissions_L123.bcoc_awb_R_S_T_Y.R} |   0
 ..._S_T_Y.R => zemissions_L141.hfc_R_S_T_Y.R} |   0
 ..._S_T_Y.R => zemissions_L142.pfc_R_S_T_Y.R} |   0
 ..._S_T.R => zemissions_L151.ctrl_R_en_S_T.R} |   0
 ...unk_L152.MACC.R => zemissions_L152.MACC.R} |   0
 ...> zemissions_L161.nonghg_en_ssp_R_S_T_Y.R} |   0
 ...R => zemissions_L169.nonghg_NEI_scaling.R} |   6 +-
 ... => zemissions_L170.nonghg_ceds_scaling.R} |   2 +
 ...n_nonco2.R => zemissions_L201.en_nonco2.R} |   0
 ...g_nonco2.R => zemissions_L211.ag_nonco2.R} |   0
 ...IRR.R => zemissions_L2111.ag_nonco2_IRR.R} |   0
 ... => zemissions_L2112.ag_nonco2_IRR_MGMT.R} |   0
 ...onco2.R => zemissions_L212.unmgd_nonco2.R} |   0
 ...sector.R => zemissions_L231.proc_sector.R} |   0
 ..._nonco2.R => zemissions_L232.prc_nonco2.R} |   0
 ....R => zemissions_L241.en_newtech_nonco2.R} |   0
 ...unk_L241.fgas.R => zemissions_L241.fgas.R} |   0
 ...nco2.R => zemissions_L251.en_ssp_nonco2.R} |   0
 ...unk_L252.MACC.R => zemissions_L252.MACC.R} |   0
 ....R => zemissions_L253.emission_controls.R} |   0
 ...R => zemissions_L270.nonghg_NEI_to_GCAM.R} |   2 +
 ...SSP_xml.R => zemissions_xml_MACC_TC_SSP.R} |   4 +-
 ...issions_xml_all_aglu_emissions_IRR_MGMT.R} |   4 +-
 ... => zemissions_xml_all_energy_emissions.R} |   4 +-
 ....R => zemissions_xml_all_fgas_emissions.R} |   4 +-
 ...sions_xml_all_protected_unmgd_emissions.R} |   4 +-
 ...R => zemissions_xml_all_unmgd_emissions.R} |   4 +-
 ....R => zemissions_xml_delete_gdp_control.R} |   4 +-
 ...l.R => zemissions_xml_emission_controls.R} |   4 +-
 ...missions_xml_ind_urb_processing_sectors.R} |   4 +-
 ... zemissions_xml_ssp15_emissions_factors.R} |   4 +-
 ...> zemissions_xml_ssp2_emissions_factors.R} |   4 +-
 ... zemissions_xml_ssp34_emissions_factors.R} |   4 +-
 ....R => zenergy_L100.CDIAC_downscale_ctry.R} |   4 +-
 ...ry.R => zenergy_L100.IEA_downscale_ctry.R} |   4 +-
 ...en_bal_IEA.R => zenergy_L101.en_bal_IEA.R} |   4 +-
 ...n_bal_adj.R => zenergy_L1011.en_bal_adj.R} |   4 +-
 ...gy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R} |   4 +-
 ...n_bal_EFW.R => zenergy_L1012.en_bal_EFW.R} |   4 +-
 ..._CDIAC.R => zenergy_L102.en_emiss_CDIAC.R} |   4 +-
 ... => zenergy_L1092.iron_steel_GrossTrade.R} |  66 ++--
 ...os_Prod.R => zenergy_L111.rsrc_fos_Prod.R} |   4 +-
 .../R/{zchunk_LA112.U.R => zenergy_L112.U.R}  |   4 +-
 ...{zchunk_LA113.MSW.R => zenergy_L113.MSW.R} |   4 +-
 ...113.atb_cost.R => zenergy_L113.atb_cost.R} |   4 +-
 ...nd-energy.R => zenergy_L114.wind-energy.R} |   4 +-
 ...k_LA115.roofPV.R => zenergy_L115.roofPV.R} |   4 +-
 ...{zchunk_LA116.geo.R => zenergy_L116.geo.R} |   4 +-
 ...LA117.tradbio.R => zenergy_L117.tradbio.R} |   4 +-
 ...unk_LA118.hydro.R => zenergy_L118.hydro.R} |   4 +-
 ...unk_LA119.solar.R => zenergy_L119.solar.R} |   4 +-
 ...re_wind.R => zenergy_L120.offshore_wind.R} |   4 +-
 ...LA121.liquids.R => zenergy_L121.liquids.R} |   4 +-
 ...ning.R => zenergy_L122.gasproc_refining.R} |   4 +-
 ...ectricity.R => zenergy_L123.electricity.R} |   4 +-
 ....elec_tech.R => zenergy_L1231.elec_tech.R} |   4 +-
 ...elec.R => zenergy_L1232.desal_from_elec.R} |   4 +-
 ...chunk_LA124.heat.R => zenergy_L124.heat.R} |   4 +-
 ...125.hydrogen.R => zenergy_L125.hydrogen.R} |  26 +-
 ...ribution.R => zenergy_L126.distribution.R} |   4 +-
 ...k_LA131.enduse.R => zenergy_L131.enduse.R} |   4 +-
 ...132.industry.R => zenergy_L132.industry.R} |   4 +-
 ...LA1321.cement.R => zenergy_L1321.cement.R} |   4 +-
 ...unk_LB1322.Fert.R => zenergy_L1322.Fert.R} |   4 +-
 ...ron_steel.R => zenergy_L1323.iron_steel.R} |  28 +-
 ...24.Off_road.R => zenergy_L1324.Off_road.R} |   4 +-
 ...25.chemical.R => zenergy_L1325.chemical.R} |   4 +-
 ...26.aluminum.R => zenergy_L1326.aluminum.R} |   4 +-
 ...ding_agg.R => zenergy_L142.building_agg.R} |   4 +-
 ...k_LA143.HDDCDD.R => zenergy_L143.HDDCDD.R} |   4 +-
 ...et_en.R => zenergy_L144.building_det_en.R} |   4 +-
 ...lsp.R => zenergy_L144.building_det_flsp.R} |  10 +-
 ...tation.R => zenergy_L152.transportation.R} |   4 +-
 ...CD.R => zenergy_L154.transportation_UCD.R} |   4 +-
 ...161.Cstorage.R => zenergy_L161.Cstorage.R} |   4 +-
 ...{zchunk_LA162.dac.R => zenergy_L162.dac.R} |   4 +-
 ...L_R_C_Y.R => zenergy_L2011.ff_ALL_R_C_Y.R} |   4 +-
 ...hunk_L202.Ccoef.R => zenergy_L202.Ccoef.R} |   0
 ...0.resources.R => zenergy_L210.resources.R} |   0
 ...1.en_supply.R => zenergy_L221.en_supply.R} |   0
 ...ion.R => zenergy_L222.en_transformation.R} |   0
 ...ectricity.R => zenergy_L223.electricity.R} |   0
 ...d_update.R => zenergy_L2231.wind_update.R} |   0
 ...zchunk_L224.heat.R => zenergy_L224.heat.R} |   0
 ...225.hydrogen.R => zenergy_L225.hydrogen.R} |   0
 ...ution.R => zenergy_L226.en_distribution.R} |   0
 ...dustry.R => zenergy_L232.other_industry.R} |   0
 ..._L2321.cement.R => zenergy_L2321.cement.R} |   0
 ...hunk_L2322.Fert.R => zenergy_L2322.Fert.R} |   0
 ...ron_steel.R => zenergy_L2323.iron_steel.R} |   0
 ...24.Off_road.R => zenergy_L2324.Off_road.R} |   0
 ...25.chemical.R => zenergy_L2325.chemical.R} |   0
 ...26.aluminum.R => zenergy_L2326.aluminum.R} |   0
 ...rade.R => zenergy_L238.iron_steel_trade.R} |   0
 ...239.ff_trade.R => zenergy_L239.ff_trade.R} |   0
 ...lows.R => zenergy_L2391.gas_trade_flows.R} |   0
 ....gas_trade.R => zenergy_L2392.gas_trade.R} |   0
 ...ding_agg.R => zenergy_L242.building_agg.R} |   0
 ...ding_det.R => zenergy_L244.building_det.R} |   0
 ...tation.R => zenergy_L252.transportation.R} |   0
 ...CD.R => zenergy_L254.transportation_UCD.R} |   0
 ...261.Cstorage.R => zenergy_L261.Cstorage.R} |   0
 .../{zchunk_L262.dac.R => zenergy_L262.dac.R} |   0
 ...nk_L270.limits.R => zenergy_L270.limits.R} |   0
 ..._batch_Ccoef_xml.R => zenergy_xml_Ccoef.R} |   4 +-
 ..._Cstorage_xml.R => zenergy_xml_Cstorage.R} |   5 +-
 ...atch_HDDCDD_xml.R => zenergy_xml_HDDCDD.R} |   4 +-
 ..._Off_road_xml.R => zenergy_xml_Off_road.R} |   4 +-
 ...d_SSP_xml.R => zenergy_xml_Off_road_SSP.R} |   4 +-
 ..._aluminum_xml.R => zenergy_xml_aluminum.R} |   4 +-
 ...m_SSP_xml.R => zenergy_xml_aluminum_SSP.R} |   4 +-
 ...l.R => zenergy_xml_bio_externality_cost.R} |   4 +-
 ...g_SSP_xml.R => zenergy_xml_building_SSP.R} |   4 +-
 ...g_agg_xml.R => zenergy_xml_building_agg.R} |   4 +-
 ...g_det_xml.R => zenergy_xml_building_det.R} |   4 +-
 ...gh_xml.R => zenergy_xml_ccs_supply_high.R} |   4 +-
 ...low_xml.R => zenergy_xml_ccs_supply_low.R} |   4 +-
 ..._xml.R => zenergy_xml_ccs_supply_lowest.R} |   4 +-
 ...atch_cement_xml.R => zenergy_xml_cement.R} |   4 +-
 ...ent_SSP_xml.R => zenergy_xml_cement_SSP.R} |   4 +-
 ..._chemical_xml.R => zenergy_xml_chemical.R} |   4 +-
 ...l_SSP_xml.R => zenergy_xml_chemical_SSP.R} |   4 +-
 ...hunk_batch_dac_xml.R => zenergy_xml_dac.R} |   4 +-
 ...o_low_xml.R => zenergy_xml_elec_bio_low.R} |   4 +-
 ...ricity_xml.R => zenergy_xml_electricity.R} |   4 +-
 ...ch_en_Fert_xml.R => zenergy_xml_en_Fert.R} |   4 +-
 ...on_xml.R => zenergy_xml_en_distribution.R} |   4 +-
 ...n_supply_xml.R => zenergy_xml_en_supply.R} |   4 +-
 ..._xml.R => zenergy_xml_en_transformation.R} |   4 +-
 ....R => zenergy_xml_en_transformation_low.R} |   4 +-
 ...as_trade_xml.R => zenergy_xml_gas_trade.R} |   4 +-
 ...ch_geo_adv_xml.R => zenergy_xml_geo_adv.R} |   4 +-
 ...ch_geo_low_xml.R => zenergy_xml_geo_low.R} |   4 +-
 ...h_adv_xml.R => zenergy_xml_geo_tech_adv.R} |   4 +-
 ...nk_batch_heat_xml.R => zenergy_xml_heat.R} |   4 +-
 ..._ccs_xml.R => zenergy_xml_high_cost_ccs.R} |   4 +-
 ..._hydrogen_xml.R => zenergy_xml_hydrogen.R} |   4 +-
 ...n_steel_xml.R => zenergy_xml_iron_steel.R} |   4 +-
 ...SSP_xml.R => zenergy_xml_iron_steel_SSP.R} |   4 +-
 ...e_xml.R => zenergy_xml_iron_steel_trade.R} |   4 +-
 ...its_xml.R => zenergy_xml_liquids_limits.R} |   4 +-
 ...> zenergy_xml_negative_emissions_budget.R} |   4 +-
 ...cs_xml.R => zenergy_xml_no_offshore_ccs.R} |   4 +-
 ...ar_adv_xml.R => zenergy_xml_nuclear_adv.R} |   4 +-
 ...ar_low_xml.R => zenergy_xml_nuclear_low.R} |   4 +-
 ..._wind_xml.R => zenergy_xml_onshore_wind.R} |   4 +-
 ...try_xml.R => zenergy_xml_other_industry.R} |   4 +-
 ...xml.R => zenergy_xml_other_industry_SSP.R} |   4 +-
 ...esources_xml.R => zenergy_xml_resources.R} |   4 +-
 ..._SSP_xml.R => zenergy_xml_resources_SSP.R} |   4 +-
 ...olar_adv_xml.R => zenergy_xml_solar_adv.R} |   4 +-
 ...olar_low_xml.R => zenergy_xml_solar_low.R} |   4 +-
 ... => zenergy_xml_transportation_UCD_CORE.R} |   4 +-
 ...f_ccs_xml.R => zenergy_xml_turn_off_ccs.R} |   4 +-
 ..._wind_adv_xml.R => zenergy_xml_wind_adv.R} |   4 +-
 ..._wind_low_xml.R => zenergy_xml_wind_low.R} |   4 +-
 ...omics.R => zgcamusa_L100.Socioeconomics.R} |   4 +-
 ...01.EIA_SEDS.R => zgcamusa_L101.EIA_SEDS.R} |   4 +-
 ..._T_Y.R => zgcamusa_L101.nonghg_en_S_T_Y.R} |   4 +-
 ...A_S_T_Y.R => zgcamusa_L102.ghg_en_S_T_Y.R} |   4 +-
 ...A_S_T_Y.R => zgcamusa_L103.ghg_an_S_T_Y.R} |   4 +-
 ...ng_USA.R => zgcamusa_L103.water_mapping.R} |   4 +-
 ..._S_T_Y.R => zgcamusa_L104.bcoc_en_S_T_Y.R} |   4 +-
 ...A_S_T_Y.R => zgcamusa_L105.nh3_an_S_T_Y.R} |   4 +-
 ..._LA114.wind_USA.R => zgcamusa_L114.wind.R} |   4 +-
 ...ftopPV_USA.R => zgcamusa_L115.rooftopPV.R} |   4 +-
 ...A119.solar_USA.R => zgcamusa_L119.solar.R} |   4 +-
 ....R => zgcamusa_L120.offshore_wind_reeds.R} |   4 +-
 ...22.Refining.R => zgcamusa_L122.Refining.R} |   4 +-
 ...ctricity.R => zgcamusa_L123.Electricity.R} |   4 +-
 ...Elec_tech.R => zgcamusa_L1231.Elec_tech.R} |   4 +-
 ...ons.R => zgcamusa_L1232.Elec_subregions.R} |   4 +-
 ...ater_USA.R => zgcamusa_L1233.elec_water.R} |   4 +-
 ...SA.R => zgcamusa_L1234.elec_gridregions.R} |   4 +-
 ....R => zgcamusa_L1235.elec_load_segments.R} |   4 +-
 ...gcamusa_L1236.elec_load_segments_solver.R} |   4 +-
 ... => zgcamusa_L1239.elec_state_fractions.R} |   4 +-
 ...as_ElecTD.R => zgcamusa_L126.Gas_ElecTD.R} |   4 +-
 ...EFW_USA.R => zgcamusa_L131.enduse_noEFW.R} |   6 +-
 ...ndustry_USA.R => zgcamusa_L132.industry.R} |   8 +-
 ... => zgcamusa_L132.water_demand_industry.R} |   0
 ...1.cement_USA.R => zgcamusa_L1321.cement.R} |   4 +-
 ...nk_LA1322.Fert.R => zgcamusa_L1322.Fert.R} |   4 +-
 ...2005.R => zgcamusa_L133.ag_Costs_C_2005.R} |   4 +-
 ...uilding_USA.R => zgcamusa_L142.Building.R} |   4 +-
 ...43.HDDCDD_USA.R => zgcamusa_L143.HDDCDD.R} |   4 +-
 ...ommercial.R => zgcamusa_L144.Commercial.R} |   4 +-
 ...idential.R => zgcamusa_L144.Residential.R} |   4 +-
 ...=> zgcamusa_L145.water_demand_municipal.R} |   0
 ....Transport.R => zgcamusa_L154.Transport.R} |   4 +-
 ...storage_USA.R => zgcamusa_L161.Cstorage.R} |   4 +-
 ....R => zgcamusa_L164.ag_Costs_C_2005_irr.R} |   4 +-
 ...g_trn_USA.R => zgcamusa_L171.nonghg_trn.R} |  10 +-
 ...s_USA.R => zgcamusa_L201.socioeconomics.R} |   6 +-
 ...ater_td_USA.R => zgcamusa_L203.water_td.R} |   4 +-
 ...ources_USA.R => zgcamusa_L210.resources.R} |   4 +-
 ...SA.R => zgcamusa_L222.en_transformation.R} |   4 +-
 ...city_USA.R => zgcamusa_L223.electricity.R} |   4 +-
 ...wcoal_USA.R => zgcamusa_L2231.nonewcoal.R} |   4 +-
 ...SA.R => zgcamusa_L2232.electricity_FERC.R} |   4 +-
 ...R => zgcamusa_L2233.elec_segments_water.R} |   4 +-
 ...s_USA.R => zgcamusa_L2234.elec_segments.R} |   4 +-
 ....R => zgcamusa_L2235.elec_segments_FERC.R} |   4 +-
 ...R => zgcamusa_L2236.elecS_ghg_emissions.R} |   6 +-
 ...eeds_USA.R => zgcamusa_L2237.wind_reeds.R} |   4 +-
 ..._reeds_USA.R => zgcamusa_L2238.PV_reeds.R} |   4 +-
 ...reeds_USA.R => zgcamusa_L2239.CSP_reeds.R} |   4 +-
 ...ire_USA.R => zgcamusa_L2241.coal_retire.R} |   4 +-
 ...ydro_USA.R => zgcamusa_L2242.elec_hydro.R} |   4 +-
 ...nuclear_USA.R => zgcamusa_L2244.nuclear.R} |   4 +-
 ...SA.R => zgcamusa_L2245.geothermal_fixed.R} |   4 +-
 ...SA.R => zgcamusa_L2247.elecS_tech_costs.R} |   4 +-
 ...ydrogen_USA.R => zgcamusa_L225.hydrogen.R} |   4 +-
 ..._USA.R => zgcamusa_L226.en_distribution.R} |   4 +-
 ...SA.R => zgcamusa_L2261.regional_biomass.R} |   4 +-
 ...ctor_USA.R => zgcamusa_L231.proc_sector.R} |   6 +-
 ...ndustry_USA.R => zgcamusa_L232.industry.R} |   4 +-
 ... => zgcamusa_L232.water_demand_industry.R} |   0
 ...1.cement_USA.R => zgcamusa_L2321.cement.R} |   4 +-
 ...L2322.Fert_USA.R => zgcamusa_L2322.Fert.R} |   4 +-
 ...SA.R => zgcamusa_L2322.industry_vintage.R} |   4 +-
 ...uilding_USA.R => zgcamusa_L244.building.R} |   4 +-
 ...=> zgcamusa_L245.water_demand_municipal.R} |   0
 ...n_USA.R => zgcamusa_L254.transportation.R} |   4 +-
 ...e_USA.R => zgcamusa_L261.carbon_storage.R} |   4 +-
 ...unk_L262.dac_USA.R => zgcamusa_L262.dac.R} |   4 +-
 ...70.limits_USA.R => zgcamusa_L270.limits.R} |   4 +-
 ....ghg_trn_USA.R => zgcamusa_L271.ghg_trn.R} |   6 +-
 ...g_trn_USA.R => zgcamusa_L271.nonghg_trn.R} |   6 +-
 ...g_elc_USA.R => zgcamusa_L272.nonghg_elc.R} |   6 +-
 ...gcamusa_L2722.nonghg_elc_linear_control.R} |   6 +-
 ...USA.R => zgcamusa_L273.en_ghg_emissions.R} |   4 +-
 ..._USA.R => zgcamusa_L273.nonghg_refinery.R} |   6 +-
 ...g_bld_USA.R => zgcamusa_L274.nonghg_bld.R} |  13 +-
 ...USA.R => zgcamusa_L275.nonghg_indenergy.R} |   6 +-
 ..._USA.R => zgcamusa_L276.nonghg_othertrn.R} |   6 +-
 ....ghg_prc_USA.R => zgcamusa_L277.ghg_prc.R} |   4 +-
 ...g_prc_USA.R => zgcamusa_L277.nonghg_prc.R} |  18 +-
 ...rage_USA_xml.R => zgcamusa_xml_Cstorage.R} |   4 +-
 ...tch_Fert_USA_xml.R => zgcamusa_xml_Fert.R} |   4 +-
 ...SA_xml.R => zgcamusa_xml_HDDCDD_A2_GFDL.R} |   4 +-
 ...A_xml.R => zgcamusa_xml_HDDCDD_AEO_2015.R} |   4 +-
 ...A_xml.R => zgcamusa_xml_HDDCDD_constdds.R} |   4 +-
 ...USA_xml.R => zgcamusa_xml_bld_emissions.R} |   4 +-
 ...ding_USA_xml.R => zgcamusa_xml_building.R} |   4 +-
 ...cement_USA_xml.R => zgcamusa_xml_cement.R} |   4 +-
 ...ay_USA_xml.R => zgcamusa_xml_coal_delay.R} |   4 +-
 ...e_USA_xml.R => zgcamusa_xml_coal_retire.R} |   4 +-
 ...batch_dac_USA_xml.R => zgcamusa_xml_dac.R} |   4 +-
 ...USA_xml.R => zgcamusa_xml_elc_emissions.R} |   6 +-
 ...c_xml.R => zgcamusa_xml_elecS_costs_itc.R} |   4 +-
 ...c_xml.R => zgcamusa_xml_elecS_costs_ptc.R} |   4 +-
 ... zgcamusa_xml_elecS_ghg_emissions_water.R} |   6 +-
 ...ro_USA_xml.R => zgcamusa_xml_elec_hydro.R} |   4 +-
 ...USA_xml.R => zgcamusa_xml_elec_segments.R} |   4 +-
 ...l.R => zgcamusa_xml_elec_segments_water.R} |   4 +-
 ...electd_USA_xml.R => zgcamusa_xml_electd.R} |   4 +-
 ...y_USA_xml.R => zgcamusa_xml_electricity.R} |   4 +-
 ...ces_USA_xml.R => zgcamusa_xml_en_prices.R} |   4 +-
 ...xml.R => zgcamusa_xml_en_transformation.R} |   4 +-
 ..._xml.R => zgcamusa_xml_geothermal_fixed.R} |   4 +-
 ...USA_xml.R => zgcamusa_xml_ghg_emissions.R} |   6 +-
 ...ogen_USA_xml.R => zgcamusa_xml_hydrogen.R} |   4 +-
 ... => zgcamusa_xml_ind_urb_proc_emissions.R} |   6 +-
 ...zgcamusa_xml_ind_urb_processing_sectors.R} |   6 +-
 ...l.R => zgcamusa_xml_indenergy_emissions.R} |   4 +-
 ...stry_USA_xml.R => zgcamusa_xml_industry.R} |   4 +-
 ..._xml.R => zgcamusa_xml_industry_vintage.R} |   4 +-
 ...ml.R => zgcamusa_xml_liquids_limits_usa.R} |   4 +-
 ...amusa_xml_negative_emissions_budget_usa.R} |   4 +-
 ...oal_USA_xml.R => zgcamusa_xml_nonewcoal.R} |   4 +-
 ...clear_USA_xml.R => zgcamusa_xml_nuclear.R} |   4 +-
 ...ml.R => zgcamusa_xml_othertrn_emissions.R} |   6 +-
 ... zgcamusa_xml_refinery_nonghg_emissions.R} |   6 +-
 ..._xml.R => zgcamusa_xml_regional_biomass.R} |   4 +-
 ...ces_USA_xml.R => zgcamusa_xml_resources.R} |   4 +-
 ...SA_xml.R => zgcamusa_xml_socioeconomics.R} |   4 +-
 ...s_USA_xml.R => zgcamusa_xml_solar_reeds.R} |   4 +-
 ...l.R => zgcamusa_xml_transport_emissions.R} |   4 +-
 ...SA_xml.R => zgcamusa_xml_transportation.R} |   4 +-
 ...xml.R => zgcamusa_xml_trn_ghg_emissions.R} |   6 +-
 ...R => zgcamusa_xml_water_demand_industry.R} |   4 +-
 ... => zgcamusa_xml_water_demand_municipal.R} |   4 +-
 ...r_td_USA_xml.R => zgcamusa_xml_water_td.R} |   4 +-
 ...ds_USA_xml.R => zgcamusa_xml_wind_reeds.R} |   4 +-
 ...odeltime.R => zmodeltime_L200.modeltime.R} |   0
 ...ltime_xml.R => zmodeltime_xml_modeltime.R} |   4 +-
 ...L100.GDP_hist.R => zsocio_L100.GDP_hist.R} |   4 +-
 ...> zsocio_L100.Population_downscale_ctry.R} |   4 +-
 ....Population.R => zsocio_L101.Population.R} |   4 +-
 .../{zchunk_L102.GDP.R => zsocio_L102.GDP.R}  |  92 +----
 ...80.GDP_macro.R => zsocio_L180.GDP_macro.R} |   4 +-
 ...rios.R => zsocio_L201.Pop_GDP_scenarios.R} |   4 +-
 ...cio_L2323.iron_steel_Inc_Elas_scenarios.R} |  18 +-
 ...socio_L2324.Off_road_Inc_Elas_scenarios.R} |   4 +-
 ...socio_L2325.chemical_Inc_Elas_scenarios.R} |   4 +-
 ...socio_L2326.aluminum_Inc_Elas_scenarios.R} |  18 +-
 ...R => zsocio_L242.Bld_Inc_Elas_scenarios.R} |   4 +-
 ...R => zsocio_L252.Trn_Inc_Elas_scenarios.R} |   4 +-
 ...80.GDP_macro.R => zsocio_L280.GDP_macro.R} |  17 +-
 ...R => zsocio_L281.macro_account_tracking.R} |   4 +-
 ...on.R => zsocio_data_Maddison_population.R} |   4 +-
 ...tch_bld_agg_xml.R => zsocio_xml_bld_agg.R} |   4 +-
 ..._xml.R => zsocio_xml_socioeconomics_SSP.R} |   4 +-
 ...ml.R => zsocio_xml_socioeconomics_macro.R} |   4 +-
 ...ff.R => zwater_L100.water_supply_runoff.R} |   0
 ...=> zwater_L101.water_supply_groundwater.R} |   0
 ...R => zwater_L102.water_supply_unlimited.R} |   0
 ...ng.R => zwater_L103.water_basin_mapping.R} |   0
 ...y.R => zwater_L110.water_demand_primary.R} |   0
 ...Elec_water.R => zwater_L1233.Elec_water.R} |   0
 ... zwater_L132.water_demand_manufacturing.R} |   0
 ...R => zwater_L133.water_demand_livestock.R} |   0
 ...R => zwater_L145.water_demand_municipal.R} |   0
 ...alination.R => zwater_L171.desalination.R} |   0
 ...igation.R => zwater_L172.EFW_irrigation.R} |   0
 ...ring.R => zwater_L173.EFW_manufacturing.R} |   0
 ...unicipal.R => zwater_L174.EFW_municipal.R} |   0
 ...zwater_L201.water_resources_constrained.R} |   0
 ...> zwater_L202.water_resources_unlimited.R} |   0
 ...L203.water_td.R => zwater_L203.water_td.R} |   0
 ...y.R => zwater_L210.water_demand_primary.R} |   0
 ...ter.R => zwater_L2233.electricity_water.R} |   0
 ... zwater_L232.water_demand_manufacturing.R} |   0
 ...R => zwater_L233.water_demand_livestock.R} |   0
 ...R => zwater_L245.water_demand_municipal.R} |   0
 ..._coefs.R => zwater_L270.EFW_input_coefs.R} |   0
 ...alination.R => zwater_L271.desalination.R} |   0
 ...igation.R => zwater_L272.EFW_irrigation.R} |   0
 ...ring.R => zwater_L273.EFW_manufacturing.R} |   0
 ...unicipal.R => zwater_L274.EFW_municipal.R} |   0
 ...xml.R => zwater_xml_EFW_WWtrt_coefs_SSP.R} |   4 +-
 ...efs_xml.R => zwater_xml_EFW_input_coefs.R} |   4 +-
 ...tion_xml.R => zwater_xml_EFW_irrigation.R} |   4 +-
 ...g_xml.R => zwater_xml_EFW_manufacturing.R} |   4 +-
 ...cipal_xml.R => zwater_xml_EFW_municipal.R} |   4 +-
 ...nation_xml.R => zwater_xml_desalination.R} |   4 +-
 ...r_xml.R => zwater_xml_electricity_water.R} |   4 +-
 ...R => zwater_xml_electricity_water_coefs.R} |   4 +-
 ....R => zwater_xml_unlimited_water_supply.R} |   4 +-
 ...l.R => zwater_xml_water_demand_industry.R} |   4 +-
 ....R => zwater_xml_water_demand_livestock.R} |   4 +-
 ....R => zwater_xml_water_demand_municipal.R} |   4 +-
 ...ml.R => zwater_xml_water_demand_primary.R} |   4 +-
 ...=> zwater_xml_water_elec_liquids_limits.R} |   4 +-
 ... => zwater_xml_water_supply_constrained.R} |   4 +-
 ...=> zwater_xml_water_supply_uncalibrated.R} |   4 +-
 ...h_water_td_xml.R => zwater_xml_water_td.R} |   4 +-
 input/gcamdata/man/PREBUILT_DATA.Rd           |  24 --
 input/gcamdata/man/chunk_readylist.Rd         |  14 -
 input/gcamdata/man/join.gdp.ts.Rd             |  10 +-
 ...> module_aglu_L100.0_LDS_preprocessing.Rd} |  10 +-
 ...=> module_aglu_L100.FAO_downscale_ctry.Rd} |  10 +-
 ...> module_aglu_L100.GTAP_downscale_ctry.Rd} |  10 +-
 ...dule_aglu_L100.IMAGE_downscale_ctry_yr.Rd} |  10 +-
 ..._Y.Rd => module_aglu_L101.ag_FAO_R_C_Y.Rd} |  10 +-
 ..._Y.Rd => module_aglu_L105.an_FAO_R_C_Y.Rd} |  10 +-
 ...odule_aglu_L106.ag_an_NetExp_FAO_R_C_Y.Rd} |  10 +-
 ...module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y.Rd} |  10 +-
 ...Y.Rd => module_aglu_L108.ag_Feed_R_C_Y.Rd} |  10 +-
 ...Rd => module_aglu_L109.ag_an_ALL_R_C_Y.Rd} |  10 +-
 ....Rd => module_aglu_L1091.ag_GrossTrade.Rd} |  10 +-
 ...R_Y.Rd => module_aglu_L110.For_FAO_R_Y.Rd} |  10 +-
 ...C.Rd => module_aglu_L111.ag_resbio_R_C.Rd} |  10 +-
 ...dule_aglu_L112.ag_prodchange_R_C_Y_GLU.Rd} |  10 +-
 ...module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU.Rd} |  10 +-
 ...on_LT.Rd => module_aglu_L121.Carbon_LT.Rd} |  10 +-
 ... module_aglu_L122.LC_R_Cropland_Yh_GLU.Rd} |  10 +-
 ...odule_aglu_L123.LC_R_MgdPastFor_Yh_GLU.Rd} |  10 +-
 ... => module_aglu_L124.LC_R_UnMgd_Yh_GLU.Rd} |  10 +-
 ...5.LC_tot.Rd => module_aglu_L125.LC_tot.Rd} |  10 +-
 ..._R_GLU.Rd => module_aglu_L131.LV_R_GLU.Rd} |  10 +-
 ..._aglu_L132.ag_an_For_Prices_USA_C_2005.Rd} |  10 +-
 ...> module_aglu_L1321.regional_ag_prices.Rd} |  10 +-
 ...> module_aglu_L133.ag_Costs_USA_C_2005.Rd} |  10 +-
 ...module_aglu_L141.ag_Fert_IFA_ctry_crop.Rd} |  10 +-
 ... module_aglu_L142.ag_Fert_IO_R_C_Y_GLU.Rd} |  10 +-
 ...dule_aglu_L151.ag_MIRCA_ctry_C_GLU_irr.Rd} |  10 +-
 ...> module_aglu_L152.ag_GTAP_R_C_GLU_irr.Rd} |  10 +-
 ...d => module_aglu_L161.ag_R_C_Y_GLU_irr.Rd} |  10 +-
 ..._aglu_L162.ag_prodchange_R_C_Y_GLU_irr.Rd} |  10 +-
 ...> module_aglu_L163.bio_Yield_R_GLU_irr.Rd} |  10 +-
 ...dule_aglu_L164.ag_Costs_USA_C_2005_irr.Rd} |  10 +-
 ...odule_aglu_L165.ag_water_R_C_Y_GLU_irr.Rd} |  10 +-
 ...ule_aglu_L171.LC_R_Cropland_Yh_GLU_irr.Rd} |  10 +-
 ...module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt.Rd} |  10 +-
 ...lu_L2012.ag_For_Past_bio_input_irr_mgmt.Rd |   2 +-
 .../gcamdata/man/module_aglu_L202.an_input.Rd |   2 +-
 .../module_aglu_L203.ag_an_demand_input.Rd    |   2 +-
 ...module_aglu_L2042.resbio_input_irr_mgmt.Rd |   2 +-
 ..._aglu_L2052.ag_prodchange_cost_irr_mgmt.Rd |   2 +-
 .../man/module_aglu_L2062.ag_Fert_irr_mgmt.Rd |   2 +-
 .../module_aglu_L2072.ag_water_irr_mgmt.Rd    |   2 +-
 .../man/module_aglu_L221.land_input_1.Rd      |   2 +-
 .../man/module_aglu_L222.land_input_2.Rd      |   2 +-
 .../man/module_aglu_L2231.land_input_3_irr.Rd |   2 +-
 ...module_aglu_L2242.land_input_4_irr_mgmt.Rd |   2 +-
 ...module_aglu_L2252.land_input_5_irr_mgmt.Rd |   2 +-
 .../gcamdata/man/module_aglu_L240.ag_trade.Rd |   2 +-
 .../man/module_aglu_L242.ssp34_pasture.Rd     |   2 +-
 .../man/module_aglu_L243.bio_trade_input.Rd   |   2 +-
 .../module_aglu_batch_ag_Fert_IRR_MGMT_xml.Rd |   2 +-
 ...batch_ag_For_Past_bio_base_IRR_MGMT_xml.Rd |   3 +-
 ...odule_aglu_batch_ag_an_demand_input_xml.Rd |   2 +-
 .../module_aglu_batch_ag_cost_IRR_MGMT_xml.Rd |   2 +-
 ...lu_batch_ag_prodchange_ref_IRR_MGMT_xml.Rd |   2 +-
 ...u_batch_ag_prodchange_ssp1_IRR_MGMT_xml.Rd |   2 +-
 ...u_batch_ag_prodchange_ssp2_IRR_MGMT_xml.Rd |   2 +-
 ...u_batch_ag_prodchange_ssp3_IRR_MGMT_xml.Rd |   2 +-
 ...u_batch_ag_prodchange_ssp4_IRR_MGMT_xml.Rd |   2 +-
 ...u_batch_ag_prodchange_ssp5_IRR_MGMT_xml.Rd |   2 +-
 .../man/module_aglu_batch_ag_trade_xml.Rd     |   2 +-
 ..._aglu_batch_ag_water_input_IRR_MGMT_xml.Rd |   2 +-
 .../man/module_aglu_batch_an_input_xml.Rd     |   2 +-
 .../man/module_aglu_batch_bio_trade_xml.Rd    |   2 +-
 .../man/module_aglu_batch_food_SSP1_xml.Rd    |   2 +-
 .../man/module_aglu_batch_land_input_1_xml.Rd |   2 +-
 .../man/module_aglu_batch_land_input_2_xml.Rd |   2 +-
 .../module_aglu_batch_land_input_3_IRR_xml.Rd |   2 +-
 ...le_aglu_batch_land_input_4_IRR_MGMT_xml.Rd |   2 +-
 ...le_aglu_batch_land_input_5_IRR_MGMT_xml.Rd |   2 +-
 .../module_aglu_batch_pasture_ssp34_xml.Rd    |   2 +-
 ...e_aglu_batch_protected_land_input_2_xml.Rd |   2 +-
 ...e_aglu_batch_protected_land_input_3_xml.Rd |   2 +-
 ...le_aglu_batch_resbio_input_IRR_MGMT_xml.Rd |   2 +-
 .../module_aglu_batch_ssp3_bio_trade_xml.Rd   |   2 +-
 ...module_aglu_batch_ssp4_ag_bio_trade_xml.Rd |   2 +-
 ...=> module_aglu_data_FAO_BilateralTrade.Rd} |  10 +-
 ...ule_climate_batch_no_climate_model_xml.Rd} |  10 +-
 .../module_climate_xml_batch_hector_xml.Rd    |   2 +-
 .../module_climate_xml_batch_magicc_xml.Rd    |   2 +-
 ...dule_emissions_L101.nonghg_en_USA_S_T_Y.Rd |   2 +-
 .../module_emissions_L102.ghg_en_USA_S_T_Y.Rd |   2 +-
 ...module_emissions_L102.nonco2_ceds_R_S_Y.Rd |   2 +-
 .../module_emissions_L103.ghg_an_USA_S_T_Y.Rd |   2 +-
 ...module_emissions_L104.bcoc_en_USA_S_T_Y.Rd |   2 +-
 .../module_emissions_L105.nh3_an_USA_S_T_Y.Rd |   2 +-
 ...dule_emissions_L112.ceds_ghg_en_R_S_T_Y.Rd |   2 +-
 .../module_emissions_L114.bcoc_en_R_S_T_Y.Rd  |   2 +-
 ..._emissions_L1211.nonco2_awb_R_S_T_Y_IRR.Rd |   2 +-
 ...ule_emissions_L1221.ghg_agr_R_S_T_Y_IRR.Rd |   2 +-
 .../module_emissions_L123.bcoc_awb_R_S_T_Y.Rd |   2 +-
 .../man/module_emissions_L141.hfc_R_S_T_Y.Rd  |   2 +-
 .../man/module_emissions_L142.pfc_R_S_T_Y.Rd  |   2 +-
 .../module_emissions_L151.ctrl_R_en_S_T.Rd    |   2 +-
 .../man/module_emissions_L152.MACC.Rd         |   2 +-
 ...le_emissions_L161.nonghg_en_ssp_R_S_T_Y.Rd |   2 +-
 .../man/module_emissions_L201.en_nonco2.Rd    |   2 +-
 .../man/module_emissions_L211.ag_nonco2.Rd    |   2 +-
 .../module_emissions_L2111.ag_nonco2_IRR.Rd   |   2 +-
 ...dule_emissions_L2112.ag_nonco2_IRR_MGMT.Rd |   2 +-
 .../man/module_emissions_L212.unmgd_nonco2.Rd |   2 +-
 .../man/module_emissions_L231.proc_sector.Rd  |   2 +-
 .../man/module_emissions_L232.prc_nonco2.Rd   |   2 +-
 ...module_emissions_L241.en_newtech_nonco2.Rd |   2 +-
 .../man/module_emissions_L241.fgas.Rd         |   2 +-
 .../module_emissions_L251.en_ssp_nonco2.Rd    |   2 +-
 .../man/module_emissions_L252.MACC.Rd         |   2 +-
 ...module_emissions_L253.emission_controls.Rd |   2 +-
 .../module_emissions_batch_MACC_TC_SSP_xml.Rd |   2 +-
 ...s_batch_all_aglu_emissions_IRR_MGMT_xml.Rd |   3 +-
 ...missions_batch_all_energy_emissions_xml.Rd |   2 +-
 ..._emissions_batch_all_fgas_emissions_xml.Rd |   2 +-
 ...batch_all_protected_unmgd_emissions_xml.Rd |   2 +-
 ...emissions_batch_all_unmgd_emissions_xml.Rd |   2 +-
 ..._emissions_batch_delete_gdp_control_xml.Rd |   2 +-
 ...e_emissions_batch_emission_controls_xml.Rd |   2 +-
 ...ns_batch_ind_urb_processing_sectors_xml.Rd |   2 +-
 ...sions_batch_ssp15_emissions_factors_xml.Rd |   2 +-
 ...ssions_batch_ssp2_emissions_factors_xml.Rd |   2 +-
 ...sions_batch_ssp34_emissions_factors_xml.Rd |   2 +-
 ...odule_energy_L100.CDIAC_downscale_ctry.Rd} |  10 +-
 ... module_energy_L100.IEA_downscale_ctry.Rd} |  10 +-
 ...EA.Rd => module_energy_L101.en_bal_IEA.Rd} |  10 +-
 ...j.Rd => module_energy_L1011.en_bal_adj.Rd} |  10 +-
 ...d => module_energy_L1011.ff_GrossTrade.Rd} |  10 +-
 ...W.Rd => module_energy_L1012.en_bal_EFW.Rd} |  10 +-
 ...d => module_energy_L102.en_emiss_CDIAC.Rd} |  10 +-
 ...Rd => module_energy_L111.rsrc_fos_Prod.Rd} |  10 +-
 ...rgy_LA112.U.Rd => module_energy_L112.U.Rd} |  10 +-
 ...LA113.MSW.Rd => module_energy_L113.MSW.Rd} |  10 +-
 ...cost.Rd => module_energy_L113.atb_cost.Rd} |  10 +-
 ...114.wind.Rd => module_energy_L114.wind.Rd} |  10 +-
 ...roofPV.Rd => module_energy_L115.roofPV.Rd} |  10 +-
 ...LA116.geo.Rd => module_energy_L116.geo.Rd} |  10 +-
 ...adbio.Rd => module_energy_L117.tradbio.Rd} |  10 +-
 ...8.hydro.Rd => module_energy_L118.hydro.Rd} |  10 +-
 ...9.solar.Rd => module_energy_L119.solar.Rd} |  10 +-
 ...Rd => module_energy_L120.offshore_wind.Rd} |  10 +-
 ...quids.Rd => module_energy_L121.liquids.Rd} |  10 +-
 ...=> module_energy_L122.gasproc_refining.Rd} |  10 +-
 ...y.Rd => module_energy_L123.electricity.Rd} |  10 +-
 ...ch.Rd => module_energy_L1231.elec_tech.Rd} |  10 +-
 ...=> module_energy_L1232.desal_from_elec.Rd} |  10 +-
 ...124.heat.Rd => module_energy_L124.heat.Rd} |  10 +-
 ...ogen.Rd => module_energy_L125.hydrogen.Rd} |  10 +-
 ....Rd => module_energy_L126.distribution.Rd} |  10 +-
 ...enduse.Rd => module_energy_L131.enduse.Rd} |  10 +-
 ...stry.Rd => module_energy_L132.industry.Rd} |  10 +-
 ...ement.Rd => module_energy_L1321.cement.Rd} |  10 +-
 ...22.Fert.Rd => module_energy_L1322.Fert.Rd} |  10 +-
 ...l.Rd => module_energy_L1323.iron_steel.Rd} |  10 +-
 ...oad.Rd => module_energy_L1324.Off_road.Rd} |  10 +-
 ...cal.Rd => module_energy_L1325.chemical.Rd} |  10 +-
 ...num.Rd => module_energy_L1326.aluminum.Rd} |  10 +-
 ....Rd => module_energy_L142.building_agg.Rd} |  10 +-
 ...HDDCDD.Rd => module_energy_L143.HDDCDD.Rd} |  10 +-
 ... => module_energy_L144.building_det_en.Rd} |  10 +-
 ...> module_energy_L144.building_det_flsp.Rd} |  10 +-
 ...d => module_energy_L152.transportation.Rd} |  10 +-
 ... module_energy_L154.transportation_UCD.Rd} |  10 +-
 ...rage.Rd => module_energy_L161.Cstorage.Rd} |  10 +-
 ...LA162.dac.Rd => module_energy_L162.dac.Rd} |  10 +-
 ...Rd => module_energy_L2011.ff_ALL_R_C_Y.Rd} |  10 +-
 .../gcamdata/man/module_energy_L202.Ccoef.Rd  |   2 +-
 .../man/module_energy_L210.resources.Rd       |   2 +-
 .../man/module_energy_L221.en_supply.Rd       |   2 +-
 .../module_energy_L222.en_transformation.Rd   |   2 +-
 .../man/module_energy_L223.electricity.Rd     |   2 +-
 .../man/module_energy_L2231.wind_update.Rd    |   2 +-
 input/gcamdata/man/module_energy_L224.heat.Rd |   2 +-
 .../man/module_energy_L225.hydrogen.Rd        |   2 +-
 .../man/module_energy_L226.en_distribution.Rd |   2 +-
 .../man/module_energy_L232.other_industry.Rd  |   2 +-
 .../man/module_energy_L2321.cement.Rd         |   2 +-
 .../gcamdata/man/module_energy_L2322.Fert.Rd  |   2 +-
 .../man/module_energy_L2323.iron_steel.Rd     |   2 +-
 .../man/module_energy_L2324.Off_road.Rd       |   2 +-
 .../man/module_energy_L2325.chemical.Rd       |   2 +-
 .../man/module_energy_L2326.aluminum.Rd       |   2 +-
 .../man/module_energy_L239.ff_trade.Rd        |   2 +-
 .../man/module_energy_L242.building_agg.Rd    |   2 +-
 .../man/module_energy_L244.building_det.Rd    |   2 +-
 .../man/module_energy_L252.transportation.Rd  |   2 +-
 .../module_energy_L254.transportation_UCD.Rd  |   2 +-
 .../man/module_energy_L261.Cstorage.Rd        |   2 +-
 input/gcamdata/man/module_energy_L262.dac.Rd  |   2 +-
 .../gcamdata/man/module_energy_L270.limits.Rd |   2 +-
 .../man/module_energy_batch_Ccoef_xml.Rd      |   2 +-
 .../man/module_energy_batch_Cstorage_xml.Rd   |   2 +-
 .../man/module_energy_batch_HDDCDD_xml.Rd     |   2 +-
 ...e_energy_batch_Off_road_incelas_SSP_xml.Rd |   2 +-
 .../man/module_energy_batch_Off_road_xml.Rd   |   2 +-
 ...e_energy_batch_aluminum_incelas_SSP_xml.Rd |   2 +-
 .../man/module_energy_batch_aluminum_xml.Rd   |   2 +-
 ...module_energy_batch_bio_externality_xml.Rd |   2 +-
 .../module_energy_batch_building_SSP_xml.Rd   |   2 +-
 .../module_energy_batch_building_agg_xml.Rd   |   2 +-
 .../module_energy_batch_building_det_xml.Rd   |   2 +-
 ...module_energy_batch_ccs_supply_high_xml.Rd |   2 +-
 .../module_energy_batch_ccs_supply_low_xml.Rd |   2 +-
 ...dule_energy_batch_ccs_supply_lowest_xml.Rd |   2 +-
 ...ule_energy_batch_cement_incelas_SSP_xml.Rd |   2 +-
 .../man/module_energy_batch_cement_xml.Rd     |   2 +-
 ...e_energy_batch_chemical_incelas_SSP_xml.Rd |   2 +-
 .../man/module_energy_batch_chemical_xml.Rd   |   2 +-
 .../man/module_energy_batch_dac_xml.Rd        |   2 +-
 .../module_energy_batch_elec_bio_low_xml.Rd   |   2 +-
 .../module_energy_batch_electricity_xml.Rd    |   2 +-
 .../man/module_energy_batch_en_Fert_xml.Rd    |   2 +-
 ...module_energy_batch_en_distribution_xml.Rd |   2 +-
 .../man/module_energy_batch_en_supply_xml.Rd  |   2 +-
 ..._energy_batch_en_transformation_low_xml.Rd |   2 +-
 ...dule_energy_batch_en_transformation_xml.Rd |   2 +-
 .../man/module_energy_batch_geo_adv_xml.Rd    |   2 +-
 .../man/module_energy_batch_geo_low_xml.Rd    |   2 +-
 .../module_energy_batch_geo_tech_adv_xml.Rd   |   2 +-
 .../man/module_energy_batch_heat_xml.Rd       |   2 +-
 .../module_energy_batch_high_cost_ccs_xml.Rd  |   2 +-
 .../man/module_energy_batch_hydrogen_xml.Rd   |   2 +-
 ...energy_batch_iron_steel_incelas_SSP_xml.Rd |   2 +-
 .../man/module_energy_batch_iron_steel_xml.Rd |   2 +-
 .../module_energy_batch_liquids_limits_xml.Rd |   2 +-
 ...rgy_batch_negative_emissions_budget_xml.Rd |   2 +-
 ...module_energy_batch_no_offshore_ccs_xml.Rd |   2 +-
 .../module_energy_batch_nuclear_adv_xml.Rd    |   2 +-
 .../module_energy_batch_nuclear_low_xml.Rd    |   2 +-
 .../module_energy_batch_onshore_wind_xml.Rd   |   2 +-
 ...gy_batch_other_industry_incelas_SSP_xml.Rd |   2 +-
 .../module_energy_batch_other_industry_xml.Rd |   2 +-
 .../module_energy_batch_resources_SSP_xml.Rd  |   2 +-
 .../man/module_energy_batch_resources_xml.Rd  |   2 +-
 .../man/module_energy_batch_solar_adv_xml.Rd  |   2 +-
 .../man/module_energy_batch_solar_low_xml.Rd  |   2 +-
 ...nergy_batch_transportation_UCD_CORE_xml.Rd |   2 +-
 .../man/module_energy_batch_wind_adv_xml.Rd   |   2 +-
 .../man/module_energy_batch_wind_low_xml.Rd   |   2 +-
 ... => module_gcamusa_L100.Socioeconomics.Rd} |  10 +-
 ...EDS.Rd => module_gcamusa_L101.EIA_SEDS.Rd} |  10 +-
 .../module_gcamusa_L103.water_mapping_USA.Rd  |   2 +-
 ...14.wind.Rd => module_gcamusa_L114.wind.Rd} |  10 +-
 ...PV.Rd => module_gcamusa_L115.rooftopPV.Rd} |  10 +-
 ....solar.Rd => module_gcamusa_L119.solar.Rd} |  10 +-
 ...e_gcamusa_L120.offshore_wind_reeds_USA.Rd} |  10 +-
 ...ing.Rd => module_gcamusa_L122.refining.Rd} |  10 +-
 ....Rd => module_gcamusa_L123.Electricity.Rd} |  10 +-
 ...h.Rd => module_gcamusa_L1231.Elec_tech.Rd} |  10 +-
 ...> module_gcamusa_L1232.Elec_subregions.Rd} |  10 +-
 ...=> module_gcamusa_L1233.elec_water_USA.Rd} |  10 +-
 ...ule_gcamusa_L1234.elec_gridregions_USA.Rd} |  10 +-
 ...e_gcamusa_L1235.elec_load_segments_USA.Rd} |  10 +-
 ...sa_L1236.elec_load_segments_solver_USA.Rd} |  10 +-
 ...gcamusa_L1239.elec_state_fractions_USA.Rd} |  10 +-
 ...D.Rd => module_gcamusa_L126.Gas_ElecTD.Rd} |  10 +-
 ...> module_gcamusa_L131.enduse_noEFW_USA.Rd} |  12 +-
 ...Rd => module_gcamusa_L132.industry_USA.Rd} |  10 +-
 ...dule_gcamusa_L132.water_demand_industry.Rd |   2 +-
 ...ment.Rd => module_gcamusa_L1321.cement.Rd} |  10 +-
 ...2.Fert.Rd => module_gcamusa_L1322.Fert.Rd} |  10 +-
 ...Rd => module_gcamusa_L142.Building_USA.Rd} |  10 +-
 ...DDCDD.Rd => module_gcamusa_L143.HDDCDD.Rd} |  10 +-
 ...l.Rd => module_gcamusa_L144.Commercial.Rd} |  10 +-
 ....Rd => module_gcamusa_L144.Residential.Rd} |  10 +-
 ...ule_gcamusa_L145.water_demand_municipal.Rd |   2 +-
 ...rt.Rd => module_gcamusa_L154.Transport.Rd} |  10 +-
 ...age.Rd => module_gcamusa_L161.Cstorage.Rd} |  10 +-
 .../man/module_gcamusa_L171.nonghg_trn_USA.Rd |   2 +-
 .../module_gcamusa_L201.socioeconomics_USA.Rd |   2 +-
 .../man/module_gcamusa_L203.water_td_USA.Rd   |   2 +-
 .../man/module_gcamusa_L210.resources_USA.Rd  |   2 +-
 ...dule_gcamusa_L222.en_transformation_USA.Rd |   2 +-
 .../module_gcamusa_L223.electricity_USA.Rd    |   2 +-
 .../man/module_gcamusa_L2231.nonewcoal_USA.Rd |   2 +-
 ...dule_gcamusa_L2232.electricity_FERC_USA.Rd |   2 +-
 ..._gcamusa_L2233.elec_segments_water_USA.Rd} |  10 +-
 .../module_gcamusa_L2234.elec_segments_USA.Rd |   2 +-
 ...le_gcamusa_L2235.elec_segments_FERC_USA.Rd |   2 +-
 ...e_gcamusa_L2236.elecS_ghg_emissions_USA.Rd |   2 +-
 .../module_gcamusa_L2237.wind_reeds_USA.Rd    |   2 +-
 .../man/module_gcamusa_L2238.PV_reeds_USA.Rd  |   2 +-
 .../man/module_gcamusa_L2239.CSP_reeds_USA.Rd |   2 +-
 .../module_gcamusa_L2241.coal_retire_USA.Rd   |   2 +-
 .../module_gcamusa_L2242.elec_hydro_USA.Rd    |   2 +-
 .../man/module_gcamusa_L2244.nuclear_USA.Rd   |   2 +-
 ...dule_gcamusa_L2245.geothermal_fixed_USA.Rd |   2 +-
 ...dule_gcamusa_L2247.elecS_tech_costs_USA.Rd |   2 +-
 .../man/module_gcamusa_L225.hydrogen_USA.Rd   |   2 +-
 ...module_gcamusa_L226.en_distribution_USA.Rd |   2 +-
 ...dule_gcamusa_L2261.regional_biomass_USA.Rd |   2 +-
 .../module_gcamusa_L231.proc_sector_USA.Rd    |   2 +-
 .../man/module_gcamusa_L232.industry_USA.Rd   |   2 +-
 ...dule_gcamusa_L232.water_demand_industry.Rd |   2 +-
 .../man/module_gcamusa_L2321.cement_USA.Rd    |   2 +-
 .../man/module_gcamusa_L2322.Fert_USA.Rd      |   2 +-
 ...dule_gcamusa_L2322.industry_vintage_USA.Rd |   2 +-
 .../man/module_gcamusa_L244.building_USA.Rd   |   2 +-
 ...ule_gcamusa_L245.water_demand_municipal.Rd |   2 +-
 .../module_gcamusa_L254.transportation_USA.Rd |   2 +-
 .../module_gcamusa_L261.carbon_storage_USA.Rd |   2 +-
 ..._USA.Rd => module_gcamusa_L262.dac_USA.Rd} |  10 +-
 .../man/module_gcamusa_L270.limits_USA.Rd     |   2 +-
 .../man/module_gcamusa_L271.ghg_trn_USA.Rd    |   2 +-
 .../man/module_gcamusa_L271.nonghg_trn_USA.Rd |   2 +-
 .../man/module_gcamusa_L272.elc_nonghg_USA.Rd |   2 +-
 ...usa_L2722.nonghg_elc_linear_control_USA.Rd |   2 +-
 ...odule_gcamusa_L273.en_ghg_emissions_USA.Rd |   2 +-
 ...module_gcamusa_L273.nonghg_refinery_USA.Rd |   2 +-
 .../man/module_gcamusa_L274.nonghg_bld_USA.Rd |   2 +-
 ...odule_gcamusa_L275.indenergy_nonghg_USA.Rd |   2 +-
 ...module_gcamusa_L276.nonghg_othertrn_USA.Rd |   2 +-
 .../man/module_gcamusa_L277.nonghg_prc_USA.Rd |   2 +-
 .../module_gcamusa_batch_Cstorage_USA_xml.Rd  |   2 +-
 .../man/module_gcamusa_batch_Fert_USA_xml.Rd  |   2 +-
 ...le_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml.Rd |   2 +-
 ...e_gcamusa_batch_HDDCDD_AEO_2015_USA_xml.Rd |   2 +-
 ...e_gcamusa_batch_HDDCDD_constdds_USA_xml.Rd |   2 +-
 ...ule_gcamusa_batch_bld_emissions_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_building_USA_xml.Rd  |   2 +-
 .../module_gcamusa_batch_cement_USA_xml.Rd    |   2 +-
 ...module_gcamusa_batch_coal_delay_USA_xml.Rd |   2 +-
 ...odule_gcamusa_batch_coal_retire_USA_xml.Rd |   2 +-
 .../man/module_gcamusa_batch_dac_USA_xml.Rd   |   2 +-
 ...ule_gcamusa_batch_elc_emissions_USA_xml.Rd |   2 +-
 ...e_gcamusa_batch_elecS_costs_USA_itc_xml.Rd |   2 +-
 ...e_gcamusa_batch_elecS_costs_USA_ptc_xml.Rd |   2 +-
 ...batch_elecS_ghg_emissions_water_USA_xml.Rd |   2 +-
 ...module_gcamusa_batch_elec_hydro_USA_xml.Rd |   2 +-
 ...ule_gcamusa_batch_elec_segments_USA_xml.Rd |   2 +-
 ...amusa_batch_elec_segments_water_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_electd_USA_xml.Rd    |   2 +-
 ...odule_gcamusa_batch_electricity_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_en_prices_USA_xml.Rd |   2 +-
 ...gcamusa_batch_en_transformation_USA_xml.Rd |   2 +-
 ..._gcamusa_batch_geothermal_fixed_USA_xml.Rd |   2 +-
 ...ule_gcamusa_batch_ghg_emissions_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_hydrogen_USA_xml.Rd  |   2 +-
 ...sa_batch_ind_urb_proc_emissions_USA_xml.Rd |   2 +-
 ...atch_ind_urb_processing_sectors_USA_xml.Rd |   2 +-
 ...amusa_batch_indenergy_emissions_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_industry_USA_xml.Rd  |   2 +-
 ..._gcamusa_batch_industry_vintage_USA_xml.Rd |   2 +-
 ...le_gcamusa_batch_liquids_limits_usa_xml.Rd |   2 +-
 ...batch_negative_emissions_budget_usa_xml.Rd |   2 +-
 .../module_gcamusa_batch_nonewcoal_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_nuclear_USA_xml.Rd   |   2 +-
 ...camusa_batch_othertrn_emissions_USA_xml.Rd |   2 +-
 ...batch_refinery_nonghg_emissions_USA_xml.Rd |   2 +-
 ..._gcamusa_batch_regional_biomass_USA_xml.Rd |   2 +-
 .../module_gcamusa_batch_resources_USA_xml.Rd |   2 +-
 ...le_gcamusa_batch_socioeconomics_USA_xml.Rd |   2 +-
 ...odule_gcamusa_batch_solar_reeds_USA_xml.Rd |   2 +-
 ...amusa_batch_transport_emissions_USA_xml.Rd |   2 +-
 ...le_gcamusa_batch_transportation_USA_xml.Rd |   2 +-
 ...gcamusa_batch_trn_ghg_emissions_USA_xml.Rd |   2 +-
 ...usa_batch_water_demand_industry_USA_xml.Rd |   2 +-
 ...camusa_batch_water_demand_municipal_xml.Rd |   2 +-
 .../module_gcamusa_batch_water_td_USA_xml.Rd  |   2 +-
 ...module_gcamusa_batch_wind_reeds_USA_xml.Rd |   2 +-
 .../man/module_modeltime_L200.modeltime.Rd    |   2 +-
 .../module_modeltime_batch_modeltime_xml.Rd   |   2 +-
 ..._hist.Rd => module_socio_L100.GDP_hist.Rd} |  10 +-
 ...e_socio_L100.Population_downscale_ctry.Rd} |  10 +-
 ...ion.Rd => module_socio_L101.Population.Rd} |  10 +-
 ...s_L102.GDP.Rd => module_socio_L102.GDP.Rd} |  10 +-
 ...=> module_socio_L201.Pop_GDP_scenarios.Rd} |  10 +-
 ...io_L2323.iron_steel_Inc_Elas_scenarios.Rd} |  10 +-
 ...ocio_L2324.Off_road_Inc_Elas_scenarios.Rd} |  10 +-
 ...ocio_L2325.chemical_Inc_Elas_scenarios.Rd} |  10 +-
 ...ocio_L2326.aluminum_Inc_Elas_scenarios.Rd} |  10 +-
 ...dule_socio_L242.Bld_Inc_Elas_scenarios.Rd} |  10 +-
 ...dule_socio_L252.Trn_Inc_Elas_scenarios.Rd} |  10 +-
 .../man/module_socio_batch_SSP_xml.Rd         |   2 +-
 .../man/module_socio_batch_bld_agg_xml.Rd     |   2 +-
 ... module_socio_data_Maddison_population.Rd} |  10 +-
 .../module_water_L100.water_supply_runoff.Rd  |   2 +-
 ...ule_water_L101.water_supply_groundwater.Rd |   2 +-
 ...odule_water_L102.water_supply_unlimited.Rd |   2 +-
 .../module_water_L103.water_basin_mapping.Rd  |   2 +-
 .../module_water_L110.water_demand_primary.Rd |   2 +-
 .../man/module_water_L1233.Elec_water.Rd      |   2 +-
 ...e_water_L132.water_demand_manufacturing.Rd |   2 +-
 ...odule_water_L133.water_demand_livestock.Rd |   2 +-
 ...odule_water_L145.water_demand_municipal.Rd |   2 +-
 .../man/module_water_L171.desalination.Rd     |   2 +-
 .../man/module_water_L172.EFW_irrigation.Rd   |   2 +-
 .../module_water_L173.EFW_manufacturing.Rd    |   2 +-
 .../man/module_water_L174.EFW_municipal.Rd    |   2 +-
 ..._water_L201.water_resources_constrained.Rd |   2 +-
 ...le_water_L202.water_resources_unlimited.Rd |   2 +-
 .../man/module_water_L203.water_td.Rd         |   2 +-
 .../module_water_L210.water_demand_primary.Rd |   2 +-
 .../module_water_L2233.electricity_water.Rd   |   2 +-
 ...e_water_L232.water_demand_manufacturing.Rd |   2 +-
 ...odule_water_L233.water_demand_livestock.Rd |   2 +-
 ...odule_water_L245.water_demand_municipal.Rd |   2 +-
 .../man/module_water_L270.EFW_input_coefs.Rd  |   2 +-
 .../man/module_water_L271.desalination.Rd     |   2 +-
 .../man/module_water_L272.EFW_irrigation.Rd   |   2 +-
 .../module_water_L273.EFW_manufacturing.Rd    |   2 +-
 .../man/module_water_L274.EFW_municipal.Rd    |   2 +-
 ...ule_water_batch_EFW_WWtrt_coefs_SSP_xml.Rd |   2 +-
 .../module_water_batch_EFW_input_coefs_xml.Rd |   2 +-
 .../module_water_batch_EFW_irrigation_xml.Rd  |   2 +-
 ...odule_water_batch_EFW_manufacturing_xml.Rd |   2 +-
 .../module_water_batch_EFW_municipal_xml.Rd   |   2 +-
 .../module_water_batch_desalination_xml.Rd    |   2 +-
 ...water_batch_electricity_water_coefs_xml.Rd |   2 +-
 ...odule_water_batch_electricity_water_xml.Rd |   2 +-
 ..._water_batch_unlimited_water_supply_xml.Rd |   2 +-
 ...e_water_batch_water_demand_industry_xml.Rd |   2 +-
 ..._water_batch_water_demand_livestock_xml.Rd |   2 +-
 ..._water_batch_water_demand_municipal_xml.Rd |   2 +-
 ...le_water_batch_water_demand_primary_xml.Rd |   2 +-
 ...ter_batch_water_elec_liquids_limits_xml.Rd |   2 +-
 ...ater_batch_water_supply_constrained_xml.Rd |   2 +-
 ...ter_batch_water_supply_uncalibrated_xml.Rd |   2 +-
 .../man/module_water_batch_water_td_xml.Rd    |   2 +-
 input/gcamdata/man/prebuilt_data.Rd           |  24 --
 .../tests/testthat/test_chunk_readylist.R     |  67 ----
 input/gcamdata/tests/testthat/test_chunks.R   |   9 +
 input/gcamdata/tests/testthat/test_dstrace.R  |   2 +-
 855 files changed, 2062 insertions(+), 2110 deletions(-)
 rename input/gcamdata/R/{zchunk_LA100.0_LDS_preprocessing.R => zaglu_L100.0_LDS_preprocessing.R} (99%)
 rename input/gcamdata/R/{zchunk_LA100.FAO_SUA_PrimaryEquivalent.R => zaglu_L100.FAO_SUA_PrimaryEquivalent.R} (98%)
 rename input/gcamdata/R/{zchunk_LA100.FAO_SUA_connection.R => zaglu_L100.FAO_SUA_connection.R} (99%)
 rename input/gcamdata/R/{zchunk_LA100.FAO_preprocessing_OtherData.R => zaglu_L100.FAO_preprocessing_OtherData.R} (98%)
 rename input/gcamdata/R/{zchunk_LA100.GTAP_downscale_ctry.R => zaglu_L100.GTAP_downscale_ctry.R} (98%)
 rename input/gcamdata/R/{zchunk_LA100.IMAGE_downscale_ctry_yr.R => zaglu_L100.IMAGE_downscale_ctry_yr.R} (97%)
 rename input/gcamdata/R/{zchunk_LA100.regional_ag_an_for_prices.R => zaglu_L100.regional_ag_an_for_prices.R} (97%)
 rename input/gcamdata/R/{zchunk_LA101.ag_FAO_R_C_Y.R => zaglu_L101.ag_FAO_R_C_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R => zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R} (98%)
 rename input/gcamdata/R/{zchunk_LA108.ag_Feed_R_C_Y.R => zaglu_L108.ag_Feed_R_C_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_LB109.ag_an_ALL_R_C_Y.R => zaglu_L109.ag_an_ALL_R_C_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_LB110.For_FAO_R_Y.R => zaglu_L110.For_FAO_R_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_LB111.ag_resbio_R_C.R => zaglu_L111.ag_resbio_R_C.R} (97%)
 rename input/gcamdata/R/{zchunk_LB112.ag_prodchange_R_C_Y_GLU.R => zaglu_L112.ag_prodchange_R_C_Y_GLU.R} (99%)
 rename input/gcamdata/R/{zchunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R => zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R} (98%)
 rename input/gcamdata/R/{zchunk_LB121.Carbon_LT.R => zaglu_L121.Carbon_LT.R} (99%)
 rename input/gcamdata/R/{zchunk_LB122.LC_R_Cropland_Yh_GLU.R => zaglu_L122.LC_R_Cropland_Yh_GLU.R} (93%)
 rename input/gcamdata/R/{zchunk_LB123.LC_R_MgdPastFor_Yh_GLU.R => zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R} (99%)
 rename input/gcamdata/R/{zchunk_LB124.LC_R_UnMgd_Yh_GLU.R => zaglu_L124.LC_R_UnMgd_Yh_GLU.R} (99%)
 rename input/gcamdata/R/{zchunk_LB125.LC_tot.R => zaglu_L125.LC_tot.R} (99%)
 rename input/gcamdata/R/{zchunk_LB131.LV_R_GLU.R => zaglu_L131.LV_R_GLU.R} (97%)
 rename input/gcamdata/R/{zchunk_LB141.ag_Fert_IFA_ctry_crop.R => zaglu_L141.ag_Fert_IFA_ctry_crop.R} (99%)
 rename input/gcamdata/R/{zchunk_LB142.ag_Fert_IO_R_C_Y_GLU.R => zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R} (99%)
 rename input/gcamdata/R/{zchunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R => zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R} (99%)
 rename input/gcamdata/R/{zchunk_LB152.ag_GTAP_R_C_GLU_irr.R => zaglu_L152.ag_GTAP_R_C_GLU_irr.R} (98%)
 rename input/gcamdata/R/{zchunk_LB161.ag_R_C_Y_GLU_irr.R => zaglu_L161.ag_R_C_Y_GLU_irr.R} (99%)
 rename input/gcamdata/R/{zchunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R => zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R} (99%)
 rename input/gcamdata/R/{zchunk_LB163.bio_Yield_R_GLU_irr.R => zaglu_L163.bio_Yield_R_GLU_irr.R} (99%)
 rename input/gcamdata/R/{zchunk_LB165.ag_water_R_C_Y_GLU_irr.R => zaglu_L165.ag_water_R_C_Y_GLU_irr.R} (99%)
 rename input/gcamdata/R/{zchunk_LB171.LC_R_Cropland_Yh_GLU_irr.R => zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R} (98%)
 rename input/gcamdata/R/{zchunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R => zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R} (98%)
 rename input/gcamdata/R/{zchunk_L2012.ag_For_Past_bio_input_irr_mgmt.R => zaglu_L2012.ag_For_Past_bio_input_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L202.an_input.R => zaglu_L202.an_input.R} (100%)
 rename input/gcamdata/R/{zchunk_L203.ag_an_demand_input.R => zaglu_L203.ag_an_demand_input.R} (100%)
 rename input/gcamdata/R/{zchunk_L2042.resbio_input_irr_mgmt.R => zaglu_L2042.resbio_input_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L2052.ag_prodchange_cost_irr_mgmt.R => zaglu_L2052.ag_prodchange_cost_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L2062.ag_Fert_irr_mgmt.R => zaglu_L2062.ag_Fert_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L2072.ag_water_irr_mgmt.R => zaglu_L2072.ag_water_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L221.land_input_1.R => zaglu_L221.land_input_1.R} (100%)
 rename input/gcamdata/R/{zchunk_L222.land_input_2.R => zaglu_L222.land_input_2.R} (100%)
 rename input/gcamdata/R/{zchunk_L2231.land_input_3_irr.R => zaglu_L2231.land_input_3_irr.R} (100%)
 rename input/gcamdata/R/{zchunk_L2242.land_input_4_irr_mgmt.R => zaglu_L2242.land_input_4_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L2252.land_input_5_irr_mgmt.R => zaglu_L2252.land_input_5_irr_mgmt.R} (100%)
 rename input/gcamdata/R/{zchunk_L240.ag_trade.R => zaglu_L240.ag_trade.R} (100%)
 rename input/gcamdata/R/{zchunk_L242.ssp34_pasture.R => zaglu_L242.ssp34_pasture.R} (100%)
 rename input/gcamdata/R/{zchunk_L243.bio_trade_input.R => zaglu_L243.bio_trade_input.R} (100%)
 rename input/gcamdata/R/{zchunk_batch_ag_Fert_IRR_MGMT_xml.R => zaglu_xml_ag_Fert_IRR_MGMT.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R => zaglu_xml_ag_For_Past_bio_base_IRR_MGMT.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_ag_an_demand_input_xml.R => zaglu_xml_ag_an_demand_input.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_ag_cost_IRR_MGMT_xml.R => zaglu_xml_ag_cost_IRR_MGMT.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ref_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ref_IRR_MGMT.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ssp1_IRR_MGMT.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ssp2_IRR_MGMT.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ssp3_IRR_MGMT.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ssp4_IRR_MGMT.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R => zaglu_xml_ag_prodchange_ssp5_IRR_MGMT.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ag_trade_xml.R => zaglu_xml_ag_trade.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_ag_water_input_IRR_MGMT_xml.R => zaglu_xml_ag_water_input_IRR_MGMT.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_an_input_xml.R => zaglu_xml_an_input.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_bio_trade_xml.R => zaglu_xml_bio_trade.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_food_SSP1_xml.R => zaglu_xml_food_SSP1.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_land_input_1_xml.R => zaglu_xml_land_input_1.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_land_input_2_xml.R => zaglu_xml_land_input_2.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_land_input_3_IRR_xml.R => zaglu_xml_land_input_3_IRR.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_land_input_4_IRR_MGMT_xml.R => zaglu_xml_land_input_4_IRR_MGMT.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_land_input_5_IRR_MGMT_xml.R => zaglu_xml_land_input_5_IRR_MGMT.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_pasture_ssp34_xml.R => zaglu_xml_pasture_ssp34.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_protected_land_input_2_xml.R => zaglu_xml_protected_land_input_2.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_protected_land_input_3_xml.R => zaglu_xml_protected_land_input_3.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_resbio_input_IRR_MGMT_xml.R => zaglu_xml_resbio_input_IRR_MGMT.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_ssp3_bio_trade_xml.R => zaglu_xml_ssp3_bio_trade.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_ssp4_ag_bio_trade_xml.R => zaglu_xml_ssp4_ag_bio_trade.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_hector_xml.R => zclimate_xml_hector.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_magicc_xml.R => zclimate_xml_magicc.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_no_climate_model_xml.R => zclimate_xml_no_climate_model.R} (93%)
 rename input/gcamdata/R/{zchunk_L102.nonco2_ceds_R_S_Y.R => zemissions_L102.nonco2_ceds_R_S_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_L112.ceds_ghg_en_R_S_T_Y.R => zemissions_L112.ceds_ghg_en_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L114.bcoc_en_R_S_T_Y.R => zemissions_L114.bcoc_en_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L1211.nonco2_awb_R_S_T_Y_IRR.R => zemissions_L1211.nonco2_awb_R_S_T_Y_IRR.R} (100%)
 rename input/gcamdata/R/{zchunk_L1221.ghg_agr_R_S_T_Y_IRR.R => zemissions_L1221.ghg_agr_R_S_T_Y_IRR.R} (100%)
 rename input/gcamdata/R/{zchunk_L123.bcoc_awb_R_S_T_Y.R => zemissions_L123.bcoc_awb_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L141.hfc_R_S_T_Y.R => zemissions_L141.hfc_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L142.pfc_R_S_T_Y.R => zemissions_L142.pfc_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L151.ctrl_R_en_S_T.R => zemissions_L151.ctrl_R_en_S_T.R} (100%)
 rename input/gcamdata/R/{zchunk_L152.MACC.R => zemissions_L152.MACC.R} (100%)
 rename input/gcamdata/R/{zchunk_L161.nonghg_en_ssp_R_S_T_Y.R => zemissions_L161.nonghg_en_ssp_R_S_T_Y.R} (100%)
 rename input/gcamdata/R/{zchunk_L169.nonghg_NEI_scaling.R => zemissions_L169.nonghg_NEI_scaling.R} (99%)
 rename input/gcamdata/R/{zchunk_L170.nonghg_ceds_scaling.R => zemissions_L170.nonghg_ceds_scaling.R} (99%)
 rename input/gcamdata/R/{zchunk_L201.en_nonco2.R => zemissions_L201.en_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L211.ag_nonco2.R => zemissions_L211.ag_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L2111.ag_nonco2_IRR.R => zemissions_L2111.ag_nonco2_IRR.R} (100%)
 rename input/gcamdata/R/{zchunk_L2112.ag_nonco2_IRR_MGMT.R => zemissions_L2112.ag_nonco2_IRR_MGMT.R} (100%)
 rename input/gcamdata/R/{zchunk_L212.unmgd_nonco2.R => zemissions_L212.unmgd_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L231.proc_sector.R => zemissions_L231.proc_sector.R} (100%)
 rename input/gcamdata/R/{zchunk_L232.prc_nonco2.R => zemissions_L232.prc_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L241.en_newtech_nonco2.R => zemissions_L241.en_newtech_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L241.fgas.R => zemissions_L241.fgas.R} (100%)
 rename input/gcamdata/R/{zchunk_L251.en_ssp_nonco2.R => zemissions_L251.en_ssp_nonco2.R} (100%)
 rename input/gcamdata/R/{zchunk_L252.MACC.R => zemissions_L252.MACC.R} (100%)
 rename input/gcamdata/R/{zchunk_L253.emission_controls.R => zemissions_L253.emission_controls.R} (100%)
 rename input/gcamdata/R/{zchunk_L270.nonghg_NEI_to_GCAM.R => zemissions_L270.nonghg_NEI_to_GCAM.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_MACC_TC_SSP_xml.R => zemissions_xml_MACC_TC_SSP.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R => zemissions_xml_all_aglu_emissions_IRR_MGMT.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_all_energy_emissions_xml.R => zemissions_xml_all_energy_emissions.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_all_fgas_emissions_xml.R => zemissions_xml_all_fgas_emissions.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_all_protected_unmgd_emissions_xml.R => zemissions_xml_all_protected_unmgd_emissions.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_all_unmgd_emissions_xml.R => zemissions_xml_all_unmgd_emissions.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_delete_gdp_control_xml.R => zemissions_xml_delete_gdp_control.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_emission_controls_xml.R => zemissions_xml_emission_controls.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_ind_urb_processing_sectors.R => zemissions_xml_ind_urb_processing_sectors.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_ssp15_emissions_factors_xml.R => zemissions_xml_ssp15_emissions_factors.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_ssp2_emissions_factors_xml.R => zemissions_xml_ssp2_emissions_factors.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_ssp34_emissions_factors_xml.R => zemissions_xml_ssp34_emissions_factors.R} (93%)
 rename input/gcamdata/R/{zchunk_LA100.CDIAC_downscale_ctry.R => zenergy_L100.CDIAC_downscale_ctry.R} (98%)
 rename input/gcamdata/R/{zchunk_LA100.IEA_downscale_ctry.R => zenergy_L100.IEA_downscale_ctry.R} (99%)
 rename input/gcamdata/R/{zchunk_LA101.en_bal_IEA.R => zenergy_L101.en_bal_IEA.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1011.en_bal_adj.R => zenergy_L1011.en_bal_adj.R} (99%)
 rename input/gcamdata/R/{zchunk_LB1011.fossilFuel_GrossTrade_EJ_R_C_Y.R => zenergy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1012.en_bal_EFW.R => zenergy_L1012.en_bal_EFW.R} (99%)
 rename input/gcamdata/R/{zchunk_LA102.en_emiss_CDIAC.R => zenergy_L102.en_emiss_CDIAC.R} (98%)
 rename input/gcamdata/R/{zchunk_LB1092.iron_steel_GrossTrade.R => zenergy_L1092.iron_steel_GrossTrade.R} (83%)
 rename input/gcamdata/R/{zchunk_LA111.rsrc_fos_Prod.R => zenergy_L111.rsrc_fos_Prod.R} (99%)
 rename input/gcamdata/R/{zchunk_LA112.U.R => zenergy_L112.U.R} (96%)
 rename input/gcamdata/R/{zchunk_LA113.MSW.R => zenergy_L113.MSW.R} (98%)
 rename input/gcamdata/R/{zchunk_LA113.atb_cost.R => zenergy_L113.atb_cost.R} (99%)
 rename input/gcamdata/R/{zchunk_LA114.wind-energy.R => zenergy_L114.wind-energy.R} (99%)
 rename input/gcamdata/R/{zchunk_LA115.roofPV.R => zenergy_L115.roofPV.R} (97%)
 rename input/gcamdata/R/{zchunk_LA116.geo.R => zenergy_L116.geo.R} (98%)
 rename input/gcamdata/R/{zchunk_LA117.tradbio.R => zenergy_L117.tradbio.R} (97%)
 rename input/gcamdata/R/{zchunk_LA118.hydro.R => zenergy_L118.hydro.R} (99%)
 rename input/gcamdata/R/{zchunk_LA119.solar.R => zenergy_L119.solar.R} (98%)
 rename input/gcamdata/R/{zchunk_LA120.offshore_wind.R => zenergy_L120.offshore_wind.R} (99%)
 rename input/gcamdata/R/{zchunk_LA121.liquids.R => zenergy_L121.liquids.R} (99%)
 rename input/gcamdata/R/{zchunk_LA122.gasproc_refining.R => zenergy_L122.gasproc_refining.R} (99%)
 rename input/gcamdata/R/{zchunk_LA123.electricity.R => zenergy_L123.electricity.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1231.elec_tech.R => zenergy_L1231.elec_tech.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1232.desal_from_elec.R => zenergy_L1232.desal_from_elec.R} (97%)
 rename input/gcamdata/R/{zchunk_LA124.heat.R => zenergy_L124.heat.R} (99%)
 rename input/gcamdata/R/{zchunk_LA125.hydrogen.R => zenergy_L125.hydrogen.R} (96%)
 rename input/gcamdata/R/{zchunk_LA126.distribution.R => zenergy_L126.distribution.R} (99%)
 rename input/gcamdata/R/{zchunk_LA131.enduse.R => zenergy_L131.enduse.R} (99%)
 rename input/gcamdata/R/{zchunk_LA132.industry.R => zenergy_L132.industry.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1321.cement.R => zenergy_L1321.cement.R} (99%)
 rename input/gcamdata/R/{zchunk_LB1322.Fert.R => zenergy_L1322.Fert.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1323.iron_steel.R => zenergy_L1323.iron_steel.R} (95%)
 rename input/gcamdata/R/{zchunk_LA1324.Off_road.R => zenergy_L1324.Off_road.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1325.chemical.R => zenergy_L1325.chemical.R} (99%)
 rename input/gcamdata/R/{zchunk_LA1326.aluminum.R => zenergy_L1326.aluminum.R} (99%)
 rename input/gcamdata/R/{zchunk_LA142.building_agg.R => zenergy_L142.building_agg.R} (98%)
 rename input/gcamdata/R/{zchunk_LA143.HDDCDD.R => zenergy_L143.HDDCDD.R} (99%)
 rename input/gcamdata/R/{zchunk_LA144.building_det_en.R => zenergy_L144.building_det_en.R} (99%)
 rename input/gcamdata/R/{zchunk_LA144.building_det_flsp.R => zenergy_L144.building_det_flsp.R} (99%)
 rename input/gcamdata/R/{zchunk_LA152.transportation.R => zenergy_L152.transportation.R} (96%)
 rename input/gcamdata/R/{zchunk_LA154.transportation_UCD.R => zenergy_L154.transportation_UCD.R} (99%)
 rename input/gcamdata/R/{zchunk_LA161.Cstorage.R => zenergy_L161.Cstorage.R} (98%)
 rename input/gcamdata/R/{zchunk_LA162.dac.R => zenergy_L162.dac.R} (96%)
 rename input/gcamdata/R/{zchunk_LB2011.ff_ALL_R_C_Y.R => zenergy_L2011.ff_ALL_R_C_Y.R} (98%)
 rename input/gcamdata/R/{zchunk_L202.Ccoef.R => zenergy_L202.Ccoef.R} (100%)
 rename input/gcamdata/R/{zchunk_L210.resources.R => zenergy_L210.resources.R} (100%)
 rename input/gcamdata/R/{zchunk_L221.en_supply.R => zenergy_L221.en_supply.R} (100%)
 rename input/gcamdata/R/{zchunk_L222.en_transformation.R => zenergy_L222.en_transformation.R} (100%)
 rename input/gcamdata/R/{zchunk_L223.electricity.R => zenergy_L223.electricity.R} (100%)
 rename input/gcamdata/R/{zchunk_L2231.wind_update.R => zenergy_L2231.wind_update.R} (100%)
 rename input/gcamdata/R/{zchunk_L224.heat.R => zenergy_L224.heat.R} (100%)
 rename input/gcamdata/R/{zchunk_L225.hydrogen.R => zenergy_L225.hydrogen.R} (100%)
 rename input/gcamdata/R/{zchunk_L226.en_distribution.R => zenergy_L226.en_distribution.R} (100%)
 rename input/gcamdata/R/{zchunk_L232.other_industry.R => zenergy_L232.other_industry.R} (100%)
 rename input/gcamdata/R/{zchunk_L2321.cement.R => zenergy_L2321.cement.R} (100%)
 rename input/gcamdata/R/{zchunk_L2322.Fert.R => zenergy_L2322.Fert.R} (100%)
 rename input/gcamdata/R/{zchunk_L2323.iron_steel.R => zenergy_L2323.iron_steel.R} (100%)
 rename input/gcamdata/R/{zchunk_L2324.Off_road.R => zenergy_L2324.Off_road.R} (100%)
 rename input/gcamdata/R/{zchunk_L2325.chemical.R => zenergy_L2325.chemical.R} (100%)
 rename input/gcamdata/R/{zchunk_L2326.aluminum.R => zenergy_L2326.aluminum.R} (100%)
 rename input/gcamdata/R/{zchunk_L238.iron_steel_trade.R => zenergy_L238.iron_steel_trade.R} (100%)
 rename input/gcamdata/R/{zchunk_L239.ff_trade.R => zenergy_L239.ff_trade.R} (100%)
 rename input/gcamdata/R/{zchunk_L2391.gas_trade_flows.R => zenergy_L2391.gas_trade_flows.R} (100%)
 rename input/gcamdata/R/{zchunk_L2392.gas_trade.R => zenergy_L2392.gas_trade.R} (100%)
 rename input/gcamdata/R/{zchunk_L242.building_agg.R => zenergy_L242.building_agg.R} (100%)
 rename input/gcamdata/R/{zchunk_L244.building_det.R => zenergy_L244.building_det.R} (100%)
 rename input/gcamdata/R/{zchunk_L252.transportation.R => zenergy_L252.transportation.R} (100%)
 rename input/gcamdata/R/{zchunk_L254.transportation_UCD.R => zenergy_L254.transportation_UCD.R} (100%)
 rename input/gcamdata/R/{zchunk_L261.Cstorage.R => zenergy_L261.Cstorage.R} (100%)
 rename input/gcamdata/R/{zchunk_L262.dac.R => zenergy_L262.dac.R} (100%)
 rename input/gcamdata/R/{zchunk_L270.limits.R => zenergy_L270.limits.R} (100%)
 rename input/gcamdata/R/{zchunk_batch_Ccoef_xml.R => zenergy_xml_Ccoef.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_Cstorage_xml.R => zenergy_xml_Cstorage.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_HDDCDD_xml.R => zenergy_xml_HDDCDD.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_Off_road_xml.R => zenergy_xml_Off_road.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_Off_road_SSP_xml.R => zenergy_xml_Off_road_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_aluminum_xml.R => zenergy_xml_aluminum.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_aluminum_SSP_xml.R => zenergy_xml_aluminum_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_bio_externality_cost_xml.R => zenergy_xml_bio_externality_cost.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_building_SSP_xml.R => zenergy_xml_building_SSP.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_building_agg_xml.R => zenergy_xml_building_agg.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_building_det_xml.R => zenergy_xml_building_det.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_ccs_supply_high_xml.R => zenergy_xml_ccs_supply_high.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ccs_supply_low_xml.R => zenergy_xml_ccs_supply_low.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_ccs_supply_lowest_xml.R => zenergy_xml_ccs_supply_lowest.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_cement_xml.R => zenergy_xml_cement.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_cement_SSP_xml.R => zenergy_xml_cement_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_chemical_xml.R => zenergy_xml_chemical.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_chemical_SSP_xml.R => zenergy_xml_chemical_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_dac_xml.R => zenergy_xml_dac.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_elec_bio_low_xml.R => zenergy_xml_elec_bio_low.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_electricity_xml.R => zenergy_xml_electricity.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_en_Fert_xml.R => zenergy_xml_en_Fert.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_en_distribution_xml.R => zenergy_xml_en_distribution.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_en_supply_xml.R => zenergy_xml_en_supply.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_en_transformation_xml.R => zenergy_xml_en_transformation.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_en_transformation_low_xml.R => zenergy_xml_en_transformation_low.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_gas_trade_xml.R => zenergy_xml_gas_trade.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_geo_adv_xml.R => zenergy_xml_geo_adv.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_geo_low_xml.R => zenergy_xml_geo_low.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_geo_tech_adv_xml.R => zenergy_xml_geo_tech_adv.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_heat_xml.R => zenergy_xml_heat.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_high_cost_ccs_xml.R => zenergy_xml_high_cost_ccs.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_hydrogen_xml.R => zenergy_xml_hydrogen.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_iron_steel_xml.R => zenergy_xml_iron_steel.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_iron_steel_SSP_xml.R => zenergy_xml_iron_steel_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_iron_steel_trade_xml.R => zenergy_xml_iron_steel_trade.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_liquids_limits_xml.R => zenergy_xml_liquids_limits.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_negative_emissions_budget_xml.R => zenergy_xml_negative_emissions_budget.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_no_offshore_ccs_xml.R => zenergy_xml_no_offshore_ccs.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_nuclear_adv_xml.R => zenergy_xml_nuclear_adv.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_nuclear_low_xml.R => zenergy_xml_nuclear_low.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_onshore_wind_xml.R => zenergy_xml_onshore_wind.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_other_industry_xml.R => zenergy_xml_other_industry.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_other_industry_SSP_xml.R => zenergy_xml_other_industry_SSP.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_resources_xml.R => zenergy_xml_resources.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_resources_SSP_xml.R => zenergy_xml_resources_SSP.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_solar_adv_xml.R => zenergy_xml_solar_adv.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_solar_low_xml.R => zenergy_xml_solar_low.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_transportation_UCD_CORE_xml.R => zenergy_xml_transportation_UCD_CORE.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_turn_off_ccs_xml.R => zenergy_xml_turn_off_ccs.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_wind_adv_xml.R => zenergy_xml_wind_adv.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_wind_low_xml.R => zenergy_xml_wind_low.R} (93%)
 rename input/gcamdata/R/{zchunk_LA100.Socioeconomics.R => zgcamusa_L100.Socioeconomics.R} (99%)
 rename input/gcamdata/R/{zchunk_LA101.EIA_SEDS.R => zgcamusa_L101.EIA_SEDS.R} (98%)
 rename input/gcamdata/R/{zchunk_L101.nonghg_en_USA_S_T_Y.R => zgcamusa_L101.nonghg_en_S_T_Y.R} (99%)
 rename input/gcamdata/R/{zchunk_L102.ghg_en_USA_S_T_Y.R => zgcamusa_L102.ghg_en_S_T_Y.R} (98%)
 rename input/gcamdata/R/{zchunk_L103.ghg_an_USA_S_T_Y.R => zgcamusa_L103.ghg_an_S_T_Y.R} (97%)
 rename input/gcamdata/R/{zchunk_L103.water_mapping_USA.R => zgcamusa_L103.water_mapping.R} (98%)
 rename input/gcamdata/R/{zchunk_L104.bcoc_en_USA_S_T_Y.R => zgcamusa_L104.bcoc_en_S_T_Y.R} (98%)
 rename input/gcamdata/R/{zchunk_L105.nh3_an_USA_S_T_Y.R => zgcamusa_L105.nh3_an_S_T_Y.R} (97%)
 rename input/gcamdata/R/{zchunk_LA114.wind_USA.R => zgcamusa_L114.wind.R} (98%)
 rename input/gcamdata/R/{zchunk_LA115.rooftopPV_USA.R => zgcamusa_L115.rooftopPV.R} (98%)
 rename input/gcamdata/R/{zchunk_LA119.solar_USA.R => zgcamusa_L119.solar.R} (98%)
 rename input/gcamdata/R/{zchunk_LA120.offshore_wind_reeds_USA.R => zgcamusa_L120.offshore_wind_reeds.R} (99%)
 rename input/gcamdata/R/{zchunk_LA122.Refining.R => zgcamusa_L122.Refining.R} (98%)
 rename input/gcamdata/R/{zchunk_LB123.Electricity.R => zgcamusa_L123.Electricity.R} (99%)
 rename input/gcamdata/R/{zchunk_LB1231.Elec_tech.R => zgcamusa_L1231.Elec_tech.R} (98%)
 rename input/gcamdata/R/{zchunk_LB1232.Elec_subregions.R => zgcamusa_L1232.Elec_subregions.R} (95%)
 rename input/gcamdata/R/{zchunk_LB1233.elec_water_USA.R => zgcamusa_L1233.elec_water.R} (99%)
 mode change 100755 => 100644
 rename input/gcamdata/R/{zchunk_LB1234.elec_gridregions_USA.R => zgcamusa_L1234.elec_gridregions.R} (96%)
 rename input/gcamdata/R/{zchunk_LB1235.elec_load_segments_USA.R => zgcamusa_L1235.elec_load_segments.R} (99%)
 rename input/gcamdata/R/{zchunk_LB1236.elec_load_segments_solver_USA.R => zgcamusa_L1236.elec_load_segments_solver.R} (99%)
 rename input/gcamdata/R/{zchunk_LB1239.elec_state_fractions_USA.R => zgcamusa_L1239.elec_state_fractions.R} (97%)
 rename input/gcamdata/R/{zchunk_LB126.Gas_ElecTD.R => zgcamusa_L126.Gas_ElecTD.R} (98%)
 rename input/gcamdata/R/{zchunk_LA131.enduse_noEFW_USA.R => zgcamusa_L131.enduse_noEFW.R} (96%)
 rename input/gcamdata/R/{zchunk_LA132.industry_USA.R => zgcamusa_L132.industry.R} (98%)
 rename input/gcamdata/R/{zchunk_L132.water_demand_industry_USA.R => zgcamusa_L132.water_demand_industry.R} (100%)
 rename input/gcamdata/R/{zchunk_LA1321.cement_USA.R => zgcamusa_L1321.cement.R} (98%)
 rename input/gcamdata/R/{zchunk_LA1322.Fert.R => zgcamusa_L1322.Fert.R} (98%)
 rename input/gcamdata/R/{zchunk_LB133.ag_Costs_USA_C_2005.R => zgcamusa_L133.ag_Costs_C_2005.R} (99%)
 rename input/gcamdata/R/{zchunk_LA142.Building_USA.R => zgcamusa_L142.Building.R} (98%)
 rename input/gcamdata/R/{zchunk_LA143.HDDCDD_USA.R => zgcamusa_L143.HDDCDD.R} (99%)
 rename input/gcamdata/R/{zchunk_LA144.Commercial.R => zgcamusa_L144.Commercial.R} (99%)
 rename input/gcamdata/R/{zchunk_LA144.Residential.R => zgcamusa_L144.Residential.R} (99%)
 rename input/gcamdata/R/{zchunk_L145.water_demand_municipal_USA.R => zgcamusa_L145.water_demand_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_LA154.Transport.R => zgcamusa_L154.Transport.R} (99%)
 rename input/gcamdata/R/{zchunk_LA161.Cstorage_USA.R => zgcamusa_L161.Cstorage.R} (97%)
 rename input/gcamdata/R/{zchunk_LB164.ag_Costs_USA_C_2005_irr.R => zgcamusa_L164.ag_Costs_C_2005_irr.R} (98%)
 rename input/gcamdata/R/{zchunk_L171.nonghg_trn_USA.R => zgcamusa_L171.nonghg_trn.R} (99%)
 rename input/gcamdata/R/{zchunk_L201.socioeconomics_USA.R => zgcamusa_L201.socioeconomics.R} (97%)
 rename input/gcamdata/R/{zchunk_L203.water_td_USA.R => zgcamusa_L203.water_td.R} (99%)
 rename input/gcamdata/R/{zchunk_L210.resources_USA.R => zgcamusa_L210.resources.R} (99%)
 rename input/gcamdata/R/{zchunk_L222.en_transformation_USA.R => zgcamusa_L222.en_transformation.R} (99%)
 rename input/gcamdata/R/{zchunk_L223.electricity_USA.R => zgcamusa_L223.electricity.R} (99%)
 rename input/gcamdata/R/{zchunk_L2231.nonewcoal_USA.R => zgcamusa_L2231.nonewcoal.R} (98%)
 rename input/gcamdata/R/{zchunk_L2232.electricity_FERC_USA.R => zgcamusa_L2232.electricity_FERC.R} (99%)
 rename input/gcamdata/R/{zchunk_LA2233.elec_segments_water_USA.R => zgcamusa_L2233.elec_segments_water.R} (99%)
 rename input/gcamdata/R/{zchunk_L2234.elec_segments_USA.R => zgcamusa_L2234.elec_segments.R} (99%)
 rename input/gcamdata/R/{zchunk_L2235.elec_segments_FERC_USA.R => zgcamusa_L2235.elec_segments_FERC.R} (99%)
 rename input/gcamdata/R/{zchunk_L2236.elecS_ghg_emissions_USA.R => zgcamusa_L2236.elecS_ghg_emissions.R} (98%)
 mode change 100755 => 100644
 rename input/gcamdata/R/{zchunk_L2237.wind_reeds_USA.R => zgcamusa_L2237.wind_reeds.R} (99%)
 rename input/gcamdata/R/{zchunk_L2238.PV_reeds_USA.R => zgcamusa_L2238.PV_reeds.R} (99%)
 rename input/gcamdata/R/{zchunk_L2239.CSP_reeds_USA.R => zgcamusa_L2239.CSP_reeds.R} (99%)
 rename input/gcamdata/R/{zchunk_L2241.coal_retire_USA.R => zgcamusa_L2241.coal_retire.R} (99%)
 rename input/gcamdata/R/{zchunk_L2242.elec_hydro_USA.R => zgcamusa_L2242.elec_hydro.R} (98%)
 rename input/gcamdata/R/{zchunk_L2244.nuclear_USA.R => zgcamusa_L2244.nuclear.R} (98%)
 rename input/gcamdata/R/{zchunk_L2245.geothermal_fixed_USA.R => zgcamusa_L2245.geothermal_fixed.R} (98%)
 rename input/gcamdata/R/{zchunk_L2247.elecS_tech_costs_USA.R => zgcamusa_L2247.elecS_tech_costs.R} (99%)
 rename input/gcamdata/R/{zchunk_L225.hydrogen_USA.R => zgcamusa_L225.hydrogen.R} (98%)
 rename input/gcamdata/R/{zchunk_L226.en_distribution_USA.R => zgcamusa_L226.en_distribution.R} (99%)
 rename input/gcamdata/R/{zchunk_L2261.regional_biomass_USA.R => zgcamusa_L2261.regional_biomass.R} (99%)
 rename input/gcamdata/R/{zchunk_L231.proc_sector_USA.R => zgcamusa_L231.proc_sector.R} (99%)
 rename input/gcamdata/R/{zchunk_L232.industry_USA.R => zgcamusa_L232.industry.R} (99%)
 rename input/gcamdata/R/{zchunk_L232.water_demand_industry_USA.R => zgcamusa_L232.water_demand_industry.R} (100%)
 rename input/gcamdata/R/{zchunk_L2321.cement_USA.R => zgcamusa_L2321.cement.R} (99%)
 rename input/gcamdata/R/{zchunk_L2322.Fert_USA.R => zgcamusa_L2322.Fert.R} (99%)
 rename input/gcamdata/R/{zchunk_L2322.industry_vintage_USA.R => zgcamusa_L2322.industry_vintage.R} (97%)
 rename input/gcamdata/R/{zchunk_L244.building_USA.R => zgcamusa_L244.building.R} (99%)
 rename input/gcamdata/R/{zchunk_L245.water_demand_municipal_USA.R => zgcamusa_L245.water_demand_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_L254.transportation_USA.R => zgcamusa_L254.transportation.R} (99%)
 rename input/gcamdata/R/{zchunk_L261.carbon_storage_USA.R => zgcamusa_L261.carbon_storage.R} (99%)
 rename input/gcamdata/R/{zchunk_L262.dac_USA.R => zgcamusa_L262.dac.R} (99%)
 rename input/gcamdata/R/{zchunk_L270.limits_USA.R => zgcamusa_L270.limits.R} (98%)
 rename input/gcamdata/R/{zchunk_L271.ghg_trn_USA.R => zgcamusa_L271.ghg_trn.R} (96%)
 rename input/gcamdata/R/{zchunk_L271.nonghg_trn_USA.R => zgcamusa_L271.nonghg_trn.R} (99%)
 rename input/gcamdata/R/{zchunk_L272.nonghg_elc_USA.R => zgcamusa_L272.nonghg_elc.R} (99%)
 rename input/gcamdata/R/{zchunk_L2722.nonghg_elc_linear_control_USA.R => zgcamusa_L2722.nonghg_elc_linear_control.R} (98%)
 rename input/gcamdata/R/{zchunk_L273.en_ghg_emissions_USA.R => zgcamusa_L273.en_ghg_emissions.R} (99%)
 mode change 100755 => 100644
 rename input/gcamdata/R/{zchunk_L273.nonghg_refinery_USA.R => zgcamusa_L273.nonghg_refinery.R} (97%)
 rename input/gcamdata/R/{zchunk_L274.nonghg_bld_USA.R => zgcamusa_L274.nonghg_bld.R} (96%)
 rename input/gcamdata/R/{zchunk_L275.nonghg_indenergy_USA.R => zgcamusa_L275.nonghg_indenergy.R} (98%)
 rename input/gcamdata/R/{zchunk_L276.nonghg_othertrn_USA.R => zgcamusa_L276.nonghg_othertrn.R} (99%)
 rename input/gcamdata/R/{zchunk_L277.ghg_prc_USA.R => zgcamusa_L277.ghg_prc.R} (98%)
 rename input/gcamdata/R/{zchunk_L277.nonghg_prc_USA.R => zgcamusa_L277.nonghg_prc.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_Cstorage_USA_xml.R => zgcamusa_xml_Cstorage.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_Fert_USA_xml.R => zgcamusa_xml_Fert.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_HDDCDD_A2_GFDL_USA_xml.R => zgcamusa_xml_HDDCDD_A2_GFDL.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_HDDCDD_AEO_2015_USA_xml.R => zgcamusa_xml_HDDCDD_AEO_2015.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_HDDCDD_constdds_USA_xml.R => zgcamusa_xml_HDDCDD_constdds.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_bld_emissions_USA_xml.R => zgcamusa_xml_bld_emissions.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_building_USA_xml.R => zgcamusa_xml_building.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_cement_USA_xml.R => zgcamusa_xml_cement.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_coal_delay_USA_xml.R => zgcamusa_xml_coal_delay.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_coal_retire_USA_xml.R => zgcamusa_xml_coal_retire.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_dac_USA_xml.R => zgcamusa_xml_dac.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_elc_emissions_USA_xml.R => zgcamusa_xml_elc_emissions.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_elecS_costs_USA_itc_xml.R => zgcamusa_xml_elecS_costs_itc.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_elecS_costs_USA_ptc_xml.R => zgcamusa_xml_elecS_costs_ptc.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_elecS_ghg_emissions_water_USA_xml.R => zgcamusa_xml_elecS_ghg_emissions_water.R} (91%)
 mode change 100755 => 100644
 rename input/gcamdata/R/{zchunk_batch_elec_hydro_USA_xml.R => zgcamusa_xml_elec_hydro.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_elec_segments_USA_xml.R => zgcamusa_xml_elec_segments.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_elec_segments_water_USA_xml.R => zgcamusa_xml_elec_segments_water.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_electd_USA_xml.R => zgcamusa_xml_electd.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_electricity_USA_xml.R => zgcamusa_xml_electricity.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_en_prices_USA_xml.R => zgcamusa_xml_en_prices.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_en_transformation_USA_xml.R => zgcamusa_xml_en_transformation.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_geothermal_fixed_USA_xml.R => zgcamusa_xml_geothermal_fixed.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_ghg_emissions_USA_xml.R => zgcamusa_xml_ghg_emissions.R} (94%)
 mode change 100755 => 100644
 rename input/gcamdata/R/{zchunk_batch_hydrogen_USA_xml.R => zgcamusa_xml_hydrogen.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_ind_urb_proc_emissions_USA_xml.R => zgcamusa_xml_ind_urb_proc_emissions.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_ind_urb_processing_sectors_USA_xml.R => zgcamusa_xml_ind_urb_processing_sectors.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_indenergy_emissions_USA_xml.R => zgcamusa_xml_indenergy_emissions.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_industry_USA_xml.R => zgcamusa_xml_industry.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_industry_vintage_USA_xml.R => zgcamusa_xml_industry_vintage.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_liquids_limits_usa_xml.R => zgcamusa_xml_liquids_limits_usa.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_negative_emissions_budget_usa_xml.R => zgcamusa_xml_negative_emissions_budget_usa.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_nonewcoal_USA_xml.R => zgcamusa_xml_nonewcoal.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_nuclear_USA_xml.R => zgcamusa_xml_nuclear.R} (93%)
 rename input/gcamdata/R/{zchunk_batch_othertrn_emissions_USA_xml.R => zgcamusa_xml_othertrn_emissions.R} (87%)
 rename input/gcamdata/R/{zchunk_batch_refinery_nonghg_emissions_USA_xml.R => zgcamusa_xml_refinery_nonghg_emissions.R} (87%)
 rename input/gcamdata/R/{zchunk_batch_regional_biomass_USA_xml.R => zgcamusa_xml_regional_biomass.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_resources_USA_xml.R => zgcamusa_xml_resources.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_socioeconomics_USA_xml.R => zgcamusa_xml_socioeconomics.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_solar_reeds_USA_xml.R => zgcamusa_xml_solar_reeds.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_transport_emissions_USA_xml.R => zgcamusa_xml_transport_emissions.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_transportation_USA_xml.R => zgcamusa_xml_transportation.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_trn_ghg_emissions_USA_xml.R => zgcamusa_xml_trn_ghg_emissions.R} (87%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_industry_USA_xml.R => zgcamusa_xml_water_demand_industry.R} (89%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_municipal_USA_xml.R => zgcamusa_xml_water_demand_municipal.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_water_td_USA_xml.R => zgcamusa_xml_water_td.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_wind_reeds_USA_xml.R => zgcamusa_xml_wind_reeds.R} (96%)
 rename input/gcamdata/R/{zchunk_L200.modeltime.R => zmodeltime_L200.modeltime.R} (100%)
 rename input/gcamdata/R/{zchunk_batch_modeltime_xml.R => zmodeltime_xml_modeltime.R} (92%)
 rename input/gcamdata/R/{zchunk_L100.GDP_hist.R => zsocio_L100.GDP_hist.R} (96%)
 rename input/gcamdata/R/{zchunk_L100.Population_downscale_ctry.R => zsocio_L100.Population_downscale_ctry.R} (99%)
 rename input/gcamdata/R/{zchunk_L101.Population.R => zsocio_L101.Population.R} (98%)
 rename input/gcamdata/R/{zchunk_L102.GDP.R => zsocio_L102.GDP.R} (84%)
 rename input/gcamdata/R/{zchunk_L180.GDP_macro.R => zsocio_L180.GDP_macro.R} (99%)
 rename input/gcamdata/R/{zchunk_L201.Pop_GDP_scenarios.R => zsocio_L201.Pop_GDP_scenarios.R} (98%)
 rename input/gcamdata/R/{zchunk_L2323.iron_steel_Inc_Elas_scenarios.R => zsocio_L2323.iron_steel_Inc_Elas_scenarios.R} (94%)
 rename input/gcamdata/R/{zchunk_L2324.Off_road_Inc_Elas_scenarios.R => zsocio_L2324.Off_road_Inc_Elas_scenarios.R} (98%)
 rename input/gcamdata/R/{zchunk_L2325.chemical_Inc_Elas_scenarios.R => zsocio_L2325.chemical_Inc_Elas_scenarios.R} (98%)
 rename input/gcamdata/R/{zchunk_L2326.aluminum_Inc_Elas_scenarios.R => zsocio_L2326.aluminum_Inc_Elas_scenarios.R} (94%)
 rename input/gcamdata/R/{zchunk_L242.Bld_Inc_Elas_scenarios.R => zsocio_L242.Bld_Inc_Elas_scenarios.R} (98%)
 rename input/gcamdata/R/{zchunk_L252.Trn_Inc_Elas_scenarios.R => zsocio_L252.Trn_Inc_Elas_scenarios.R} (98%)
 rename input/gcamdata/R/{zchunk_L280.GDP_macro.R => zsocio_L280.GDP_macro.R} (98%)
 rename input/gcamdata/R/{zchunk_L281.macro_account_tracking.R => zsocio_L281.macro_account_tracking.R} (99%)
 rename input/gcamdata/R/{zchunk_data_Maddison_population.R => zsocio_data_Maddison_population.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_bld_agg_xml.R => zsocio_xml_bld_agg.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_socioeconomics_SSP_xml.R => zsocio_xml_socioeconomics_SSP.R} (98%)
 rename input/gcamdata/R/{zchunk_batch_socioeconomics_macro_xml.R => zsocio_xml_socioeconomics_macro.R} (96%)
 rename input/gcamdata/R/{zchunk_L100.water_supply_runoff.R => zwater_L100.water_supply_runoff.R} (100%)
 rename input/gcamdata/R/{zchunk_L101.water_supply_groundwater.R => zwater_L101.water_supply_groundwater.R} (100%)
 rename input/gcamdata/R/{zchunk_L102.water_supply_unlimited.R => zwater_L102.water_supply_unlimited.R} (100%)
 rename input/gcamdata/R/{zchunk_L103.water_basin_mapping.R => zwater_L103.water_basin_mapping.R} (100%)
 rename input/gcamdata/R/{zchunk_L110.water_demand_primary.R => zwater_L110.water_demand_primary.R} (100%)
 rename input/gcamdata/R/{zchunk_L1233.Elec_water.R => zwater_L1233.Elec_water.R} (100%)
 rename input/gcamdata/R/{zchunk_L132.water_demand_manufacturing.R => zwater_L132.water_demand_manufacturing.R} (100%)
 rename input/gcamdata/R/{zchunk_L133.water_demand_livestock.R => zwater_L133.water_demand_livestock.R} (100%)
 rename input/gcamdata/R/{zchunk_L145.water_demand_municipal.R => zwater_L145.water_demand_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_L171.desalination.R => zwater_L171.desalination.R} (100%)
 rename input/gcamdata/R/{zchunk_L172.EFW_irrigation.R => zwater_L172.EFW_irrigation.R} (100%)
 rename input/gcamdata/R/{zchunk_L173.EFW_manufacturing.R => zwater_L173.EFW_manufacturing.R} (100%)
 rename input/gcamdata/R/{zchunk_L174.EFW_municipal.R => zwater_L174.EFW_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_L201.water_resources_constrained.R => zwater_L201.water_resources_constrained.R} (100%)
 rename input/gcamdata/R/{zchunk_L202.water_resources_unlimited.R => zwater_L202.water_resources_unlimited.R} (100%)
 rename input/gcamdata/R/{zchunk_L203.water_td.R => zwater_L203.water_td.R} (100%)
 rename input/gcamdata/R/{zchunk_L210.water_demand_primary.R => zwater_L210.water_demand_primary.R} (100%)
 rename input/gcamdata/R/{zchunk_L2233.electricity_water.R => zwater_L2233.electricity_water.R} (100%)
 rename input/gcamdata/R/{zchunk_L232.water_demand_manufacturing.R => zwater_L232.water_demand_manufacturing.R} (100%)
 rename input/gcamdata/R/{zchunk_L233.water_demand_livestock.R => zwater_L233.water_demand_livestock.R} (100%)
 rename input/gcamdata/R/{zchunk_L245.water_demand_municipal.R => zwater_L245.water_demand_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_L270.EFW_input_coefs.R => zwater_L270.EFW_input_coefs.R} (100%)
 rename input/gcamdata/R/{zchunk_L271.desalination.R => zwater_L271.desalination.R} (100%)
 rename input/gcamdata/R/{zchunk_L272.EFW_irrigation.R => zwater_L272.EFW_irrigation.R} (100%)
 rename input/gcamdata/R/{zchunk_L273.EFW_manufacturing.R => zwater_L273.EFW_manufacturing.R} (100%)
 rename input/gcamdata/R/{zchunk_L274.EFW_municipal.R => zwater_L274.EFW_municipal.R} (100%)
 rename input/gcamdata/R/{zchunk_batch_EFW_WWtrt_coefs_SSP_xml.R => zwater_xml_EFW_WWtrt_coefs_SSP.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_EFW_input_coefs_xml.R => zwater_xml_EFW_input_coefs.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_EFW_irrigation_xml.R => zwater_xml_EFW_irrigation.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_EFW_manufacturing_xml.R => zwater_xml_EFW_manufacturing.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_EFW_municipal_xml.R => zwater_xml_EFW_municipal.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_desalination_xml.R => zwater_xml_desalination.R} (97%)
 rename input/gcamdata/R/{zchunk_batch_electricity_water_xml.R => zwater_xml_electricity_water.R} (99%)
 rename input/gcamdata/R/{zchunk_batch_electricity_water_coefs_xml.R => zwater_xml_electricity_water_coefs.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_unlimited_water_supply_xml.R => zwater_xml_unlimited_water_supply.R} (94%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_industry_xml.R => zwater_xml_water_demand_industry.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_livestock_xml.R => zwater_xml_water_demand_livestock.R} (90%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_municipal_xml.R => zwater_xml_water_demand_municipal.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_water_demand_primary_xml.R => zwater_xml_water_demand_primary.R} (91%)
 rename input/gcamdata/R/{zchunk_batch_water_elec_liquids_limits_xml.R => zwater_xml_water_elec_liquids_limits.R} (92%)
 rename input/gcamdata/R/{zchunk_batch_water_supply_constrained_xml.R => zwater_xml_water_supply_constrained.R} (96%)
 rename input/gcamdata/R/{zchunk_batch_water_supply_uncalibrated_xml.R => zwater_xml_water_supply_uncalibrated.R} (95%)
 rename input/gcamdata/R/{zchunk_batch_water_td_xml.R => zwater_xml_water_td.R} (97%)
 delete mode 100644 input/gcamdata/man/PREBUILT_DATA.Rd
 delete mode 100644 input/gcamdata/man/chunk_readylist.Rd
 rename input/gcamdata/man/{module_aglu_LA100.0_LDS_preprocessing.Rd => module_aglu_L100.0_LDS_preprocessing.Rd} (80%)
 rename input/gcamdata/man/{module_aglu_LA100.FAO_downscale_ctry.Rd => module_aglu_L100.FAO_downscale_ctry.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LA100.GTAP_downscale_ctry.Rd => module_aglu_L100.GTAP_downscale_ctry.Rd} (73%)
 rename input/gcamdata/man/{module_aglu_LA100.IMAGE_downscale_ctry_yr.Rd => module_aglu_L100.IMAGE_downscale_ctry_yr.Rd} (74%)
 rename input/gcamdata/man/{module_aglu_LA101.ag_FAO_R_C_Y.Rd => module_aglu_L101.ag_FAO_R_C_Y.Rd} (85%)
 rename input/gcamdata/man/{module_aglu_LA105.an_FAO_R_C_Y.Rd => module_aglu_L105.an_FAO_R_C_Y.Rd} (80%)
 rename input/gcamdata/man/{module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y.Rd => module_aglu_L106.ag_an_NetExp_FAO_R_C_Y.Rd} (76%)
 rename input/gcamdata/man/{module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y.Rd => module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LA108.ag_Feed_R_C_Y.Rd => module_aglu_L108.ag_Feed_R_C_Y.Rd} (82%)
 rename input/gcamdata/man/{module_aglu_LB109.ag_an_ALL_R_C_Y.Rd => module_aglu_L109.ag_an_ALL_R_C_Y.Rd} (78%)
 rename input/gcamdata/man/{module_aglu_LB1091.ag_GrossTrade.Rd => module_aglu_L1091.ag_GrossTrade.Rd} (75%)
 rename input/gcamdata/man/{module_aglu_LB110.For_FAO_R_Y.Rd => module_aglu_L110.For_FAO_R_Y.Rd} (81%)
 rename input/gcamdata/man/{module_aglu_LB111.ag_resbio_R_C.Rd => module_aglu_L111.ag_resbio_R_C.Rd} (75%)
 rename input/gcamdata/man/{module_aglu_LB112.ag_prodchange_R_C_Y_GLU.Rd => module_aglu_L112.ag_prodchange_R_C_Y_GLU.Rd} (79%)
 rename input/gcamdata/man/{module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU.Rd => module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU.Rd} (79%)
 rename input/gcamdata/man/{module_aglu_LB121.Carbon_LT.Rd => module_aglu_L121.Carbon_LT.Rd} (80%)
 rename input/gcamdata/man/{module_aglu_LB122.LC_R_Cropland_Yh_GLU.Rd => module_aglu_L122.LC_R_Cropland_Yh_GLU.Rd} (88%)
 rename input/gcamdata/man/{module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU.Rd => module_aglu_L123.LC_R_MgdPastFor_Yh_GLU.Rd} (81%)
 rename input/gcamdata/man/{module_aglu_LB124.LC_R_UnMgd_Yh_GLU.Rd => module_aglu_L124.LC_R_UnMgd_Yh_GLU.Rd} (88%)
 rename input/gcamdata/man/{module_aglu_LB125.LC_tot.Rd => module_aglu_L125.LC_tot.Rd} (84%)
 rename input/gcamdata/man/{module_aglu_LB131.LV_R_GLU.Rd => module_aglu_L131.LV_R_GLU.Rd} (75%)
 rename input/gcamdata/man/{module_aglu_LB132.ag_an_For_Prices_USA_C_2005.Rd => module_aglu_L132.ag_an_For_Prices_USA_C_2005.Rd} (71%)
 rename input/gcamdata/man/{module_aglu_LB1321.regional_ag_prices.Rd => module_aglu_L1321.regional_ag_prices.Rd} (74%)
 rename input/gcamdata/man/{module_aglu_LB133.ag_Costs_USA_C_2005.Rd => module_aglu_L133.ag_Costs_USA_C_2005.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LB141.ag_Fert_IFA_ctry_crop.Rd => module_aglu_L141.ag_Fert_IFA_ctry_crop.Rd} (79%)
 rename input/gcamdata/man/{module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU.Rd => module_aglu_L142.ag_Fert_IO_R_C_Y_GLU.Rd} (79%)
 rename input/gcamdata/man/{module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr.Rd => module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr.Rd} (79%)
 rename input/gcamdata/man/{module_aglu_LB152.ag_GTAP_R_C_GLU_irr.Rd => module_aglu_L152.ag_GTAP_R_C_GLU_irr.Rd} (77%)
 rename input/gcamdata/man/{module_aglu_LB161.ag_R_C_Y_GLU_irr.Rd => module_aglu_L161.ag_R_C_Y_GLU_irr.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr.Rd => module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LB163.bio_Yield_R_GLU_irr.Rd => module_aglu_L163.bio_Yield_R_GLU_irr.Rd} (84%)
 rename input/gcamdata/man/{module_aglu_LB164.ag_Costs_USA_C_2005_irr.Rd => module_aglu_L164.ag_Costs_USA_C_2005_irr.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LB165.ag_water_R_C_Y_GLU_irr.Rd => module_aglu_L165.ag_water_R_C_Y_GLU_irr.Rd} (83%)
 rename input/gcamdata/man/{module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr.Rd => module_aglu_L171.LC_R_Cropland_Yh_GLU_irr.Rd} (78%)
 rename input/gcamdata/man/{module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt.Rd => module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt.Rd} (83%)
 rename input/gcamdata/man/{module_data_FAO_BilateralTrade.Rd => module_aglu_data_FAO_BilateralTrade.Rd} (73%)
 rename input/gcamdata/man/{module_batch_no_climate_model_xml.Rd => module_climate_batch_no_climate_model_xml.Rd} (62%)
 rename input/gcamdata/man/{module_energy_LA100.CDIAC_downscale_ctry.Rd => module_energy_L100.CDIAC_downscale_ctry.Rd} (73%)
 rename input/gcamdata/man/{module_energy_LA100.IEA_downscale_ctry.Rd => module_energy_L100.IEA_downscale_ctry.Rd} (83%)
 rename input/gcamdata/man/{module_energy_LA101.en_bal_IEA.Rd => module_energy_L101.en_bal_IEA.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA1011.en_bal_adj.Rd => module_energy_L1011.en_bal_adj.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LB1011.ff_GrossTrade.Rd => module_energy_L1011.ff_GrossTrade.Rd} (77%)
 rename input/gcamdata/man/{module_energy_LA1012.en_bal_EFW.Rd => module_energy_L1012.en_bal_EFW.Rd} (78%)
 rename input/gcamdata/man/{module_energy_LA102.en_emiss_CDIAC.Rd => module_energy_L102.en_emiss_CDIAC.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA111.rsrc_fos_Prod.Rd => module_energy_L111.rsrc_fos_Prod.Rd} (82%)
 rename input/gcamdata/man/{module_energy_LA112.U.Rd => module_energy_L112.U.Rd} (77%)
 rename input/gcamdata/man/{module_energy_LA113.MSW.Rd => module_energy_L113.MSW.Rd} (75%)
 rename input/gcamdata/man/{module_energy_LA113.atb_cost.Rd => module_energy_L113.atb_cost.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA114.wind.Rd => module_energy_L114.wind.Rd} (85%)
 rename input/gcamdata/man/{module_energy_LA115.roofPV.Rd => module_energy_L115.roofPV.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA116.geo.Rd => module_energy_L116.geo.Rd} (86%)
 rename input/gcamdata/man/{module_energy_LA117.tradbio.Rd => module_energy_L117.tradbio.Rd} (78%)
 rename input/gcamdata/man/{module_energy_LA118.hydro.Rd => module_energy_L118.hydro.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LA119.solar.Rd => module_energy_L119.solar.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA120.offshore_wind.Rd => module_energy_L120.offshore_wind.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA121.liquids.Rd => module_energy_L121.liquids.Rd} (85%)
 rename input/gcamdata/man/{module_energy_LA122.gasproc_refining.Rd => module_energy_L122.gasproc_refining.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LA123.electricity.Rd => module_energy_L123.electricity.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA1231.elec_tech.Rd => module_energy_L1231.elec_tech.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LA1232.desal_from_elec.Rd => module_energy_L1232.desal_from_elec.Rd} (75%)
 rename input/gcamdata/man/{module_energy_LA124.heat.Rd => module_energy_L124.heat.Rd} (83%)
 rename input/gcamdata/man/{module_energy_LA125.hydrogen.Rd => module_energy_L125.hydrogen.Rd} (78%)
 rename input/gcamdata/man/{module_energy_LA126.distribution.Rd => module_energy_L126.distribution.Rd} (85%)
 rename input/gcamdata/man/{module_energy_LA131.enduse.Rd => module_energy_L131.enduse.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA132.industry.Rd => module_energy_L132.industry.Rd} (81%)
 rename input/gcamdata/man/{module_energy_LA1321.cement.Rd => module_energy_L1321.cement.Rd} (86%)
 rename input/gcamdata/man/{module_energy_LB1322.Fert.Rd => module_energy_L1322.Fert.Rd} (86%)
 rename input/gcamdata/man/{module_energy_LA1323.iron_steel.Rd => module_energy_L1323.iron_steel.Rd} (85%)
 rename input/gcamdata/man/{module_energy_LA1324.Off_road.Rd => module_energy_L1324.Off_road.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LA1325.chemical.Rd => module_energy_L1325.chemical.Rd} (79%)
 rename input/gcamdata/man/{module_energy_LA1326.aluminum.Rd => module_energy_L1326.aluminum.Rd} (80%)
 rename input/gcamdata/man/{module_energy_LA142.building_agg.Rd => module_energy_L142.building_agg.Rd} (78%)
 rename input/gcamdata/man/{module_energy_LA143.HDDCDD.Rd => module_energy_L143.HDDCDD.Rd} (78%)
 rename input/gcamdata/man/{module_energy_LA144.building_det_en.Rd => module_energy_L144.building_det_en.Rd} (77%)
 rename input/gcamdata/man/{module_energy_LA144.building_det_flsp.Rd => module_energy_L144.building_det_flsp.Rd} (82%)
 rename input/gcamdata/man/{module_energy_LA152.transportation.Rd => module_energy_L152.transportation.Rd} (73%)
 rename input/gcamdata/man/{module_energy_LA154.transportation_UCD.Rd => module_energy_L154.transportation_UCD.Rd} (81%)
 rename input/gcamdata/man/{module_energy_LA161.Cstorage.Rd => module_energy_L161.Cstorage.Rd} (74%)
 rename input/gcamdata/man/{module_energy_LA162.dac.Rd => module_energy_L162.dac.Rd} (77%)
 rename input/gcamdata/man/{module_energy_LB2011.ff_ALL_R_C_Y.Rd => module_energy_L2011.ff_ALL_R_C_Y.Rd} (76%)
 rename input/gcamdata/man/{module_gcamusa_LA100.Socioeconomics.Rd => module_gcamusa_L100.Socioeconomics.Rd} (72%)
 rename input/gcamdata/man/{module_gcamusa_LA101.EIA_SEDS.Rd => module_gcamusa_L101.EIA_SEDS.Rd} (82%)
 rename input/gcamdata/man/{module_gcamusa_LA114.wind.Rd => module_gcamusa_L114.wind.Rd} (75%)
 rename input/gcamdata/man/{module_gcamusa_LA115.rooftopPV.Rd => module_gcamusa_L115.rooftopPV.Rd} (75%)
 rename input/gcamdata/man/{module_gcamusa_LA119.solar.Rd => module_gcamusa_L119.solar.Rd} (78%)
 rename input/gcamdata/man/{module_gcamusa_LA120.offshore_wind_reeds_USA.Rd => module_gcamusa_L120.offshore_wind_reeds_USA.Rd} (77%)
 rename input/gcamdata/man/{module_gcamusa_LA122.refining.Rd => module_gcamusa_L122.refining.Rd} (77%)
 rename input/gcamdata/man/{module_gcamusa_LB123.Electricity.Rd => module_gcamusa_L123.Electricity.Rd} (79%)
 rename input/gcamdata/man/{module_gcamusa_LB1231.Elec_tech.Rd => module_gcamusa_L1231.Elec_tech.Rd} (75%)
 rename input/gcamdata/man/{module_gcamusa_LB1232.Elec_subregions.Rd => module_gcamusa_L1232.Elec_subregions.Rd} (72%)
 rename input/gcamdata/man/{module_gcamusa_LB1233.elec_water_USA.Rd => module_gcamusa_L1233.elec_water_USA.Rd} (75%)
 rename input/gcamdata/man/{module_gcamusa_LB1234.elec_gridregions_USA.Rd => module_gcamusa_L1234.elec_gridregions_USA.Rd} (72%)
 rename input/gcamdata/man/{module_gcamusa_LB1235.elec_load_segments_USA.Rd => module_gcamusa_L1235.elec_load_segments_USA.Rd} (76%)
 rename input/gcamdata/man/{module_gcamusa_LB1236.elec_load_segments_solver_USA.Rd => module_gcamusa_L1236.elec_load_segments_solver_USA.Rd} (72%)
 rename input/gcamdata/man/{module_gcamusa_LB1239.elec_state_fractions_USA.Rd => module_gcamusa_L1239.elec_state_fractions_USA.Rd} (74%)
 rename input/gcamdata/man/{module_gcamusa_LB126.Gas_ElecTD.Rd => module_gcamusa_L126.Gas_ElecTD.Rd} (81%)
 rename input/gcamdata/man/{module_gcamusa_LA131.enduse_noEFW_USA.Rd => module_gcamusa_L131.enduse_noEFW_USA.Rd} (65%)
 rename input/gcamdata/man/{module_gcamusa_LA132.industry_USA.Rd => module_gcamusa_L132.industry_USA.Rd} (79%)
 rename input/gcamdata/man/{module_gcamusa_LA1321.cement.Rd => module_gcamusa_L1321.cement.Rd} (82%)
 rename input/gcamdata/man/{module_gcamusa_LA1322.Fert.Rd => module_gcamusa_L1322.Fert.Rd} (80%)
 rename input/gcamdata/man/{module_gcamusa_LA142.Building_USA.Rd => module_gcamusa_L142.Building_USA.Rd} (75%)
 rename input/gcamdata/man/{module_gcamusa_LA143.HDDCDD.Rd => module_gcamusa_L143.HDDCDD.Rd} (78%)
 rename input/gcamdata/man/{module_gcamusa_LA144.Commercial.Rd => module_gcamusa_L144.Commercial.Rd} (76%)
 rename input/gcamdata/man/{module_gcamusa_LA144.Residential.Rd => module_gcamusa_L144.Residential.Rd} (77%)
 rename input/gcamdata/man/{module_gcamusa_LA154.Transport.Rd => module_gcamusa_L154.Transport.Rd} (80%)
 rename input/gcamdata/man/{module_gcamusa_LA161.Cstorage.Rd => module_gcamusa_L161.Cstorage.Rd} (73%)
 rename input/gcamdata/man/{module_gcamusa_LA2233.elec_segments_water_USA.Rd => module_gcamusa_L2233.elec_segments_water_USA.Rd} (91%)
 rename input/gcamdata/man/{module_gcamdata_L262.dac_USA.Rd => module_gcamusa_L262.dac_USA.Rd} (88%)
 rename input/gcamdata/man/{module_socioeconomics_L100.GDP_hist.Rd => module_socio_L100.GDP_hist.Rd} (78%)
 rename input/gcamdata/man/{module_socioeconomics_L100.Population_downscale_ctry.Rd => module_socio_L100.Population_downscale_ctry.Rd} (73%)
 rename input/gcamdata/man/{module_socioeconomics_L101.Population.Rd => module_socio_L101.Population.Rd} (76%)
 rename input/gcamdata/man/{module_socioeconomics_L102.GDP.Rd => module_socio_L102.GDP.Rd} (86%)
 rename input/gcamdata/man/{module_socioeconomics_L201.Pop_GDP_scenarios.Rd => module_socio_L201.Pop_GDP_scenarios.Rd} (83%)
 rename input/gcamdata/man/{module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios.Rd => module_socio_L2323.iron_steel_Inc_Elas_scenarios.Rd} (71%)
 rename input/gcamdata/man/{module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios.Rd => module_socio_L2324.Off_road_Inc_Elas_scenarios.Rd} (71%)
 rename input/gcamdata/man/{module_socioeconomics_L2325.chemical_Inc_Elas_scenarios.Rd => module_socio_L2325.chemical_Inc_Elas_scenarios.Rd} (71%)
 rename input/gcamdata/man/{module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios.Rd => module_socio_L2326.aluminum_Inc_Elas_scenarios.Rd} (71%)
 rename input/gcamdata/man/{module_socioeconomics_L242.Bld_Inc_Elas_scenarios.Rd => module_socio_L242.Bld_Inc_Elas_scenarios.Rd} (73%)
 rename input/gcamdata/man/{module_socioeconomics_L252.Trn_Inc_Elas_scenarios.Rd => module_socio_L252.Trn_Inc_Elas_scenarios.Rd} (72%)
 rename input/gcamdata/man/{module_data_Maddison_population.Rd => module_socio_data_Maddison_population.Rd} (73%)
 delete mode 100644 input/gcamdata/man/prebuilt_data.Rd
 delete mode 100644 input/gcamdata/tests/testthat/test_chunk_readylist.R

diff --git a/input/gcamdata/NAMESPACE b/input/gcamdata/NAMESPACE
index 3cee1bbc34..25e6c3632e 100644
--- a/input/gcamdata/NAMESPACE
+++ b/input/gcamdata/NAMESPACE
@@ -11,7 +11,6 @@ export(approx_fun_constant)
 export(change_iso_code)
 export(chunk_inputs)
 export(chunk_outputs)
-export(chunk_readylist)
 export(cmp_xml_files)
 export(create_xml)
 export(driver)
@@ -26,7 +25,6 @@ export(info)
 export(inputs_of)
 export(left_join_error_no_match)
 export(load_from_cache)
-export(module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr)
 export(outputs_of)
 export(parse_csv_header)
 export(protect_integer_cols)
diff --git a/input/gcamdata/R/admin.R b/input/gcamdata/R/admin.R
index ab303116bf..838684f53e 100644
--- a/input/gcamdata/R/admin.R
+++ b/input/gcamdata/R/admin.R
@@ -1,188 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
 
-#' chunk_readylist
-#'
-#' @return Returns a list of disabled chunks: their lines of code, inputs and available inputs, dependencies
-#' @importFrom dplyr filter group_by left_join mutate right_join select summarise
-#' @importFrom tidyr gather spread
-#' @export
-chunk_readylist <- function() {
-  disabled <- output <- name <- available <- from_file <- module <- chunk <-
-    filename <- . <- NULL             # silence notes in package check
-  chunklist <- find_chunks(include_disabled = TRUE)
-  ci <- chunk_inputs(chunklist$name)
-  co <- chunk_outputs(chunklist$name)
-
-  filter(chunklist, !disabled) %>%
-    left_join(co, by = "name") %>%
-    select(output) %>%
-    mutate(available = TRUE) ->
-    enabled_outputs
-
-  # 'Ready list' is disabled chunks all of whose inputs are supplied by an enabled chunk
-  chunklist %>%
-    filter(disabled) %>%
-    left_join(ci, by = "name") %>%
-    select(-name) %>%
-    left_join(enabled_outputs, by = c("input" = "output")) %>%
-    mutate(available = if_else(is.na(available) & !from_file, FALSE, TRUE)) %>%
-    group_by(module, chunk, disabled) %>%
-    summarise(n_inputs = length(available),
-              n_avail = sum(available),
-              all_avail = all(available),
-              n_deps = count_downstream_dependencies(chunk[1], chunklist, ci, co)[["deps"]],
-              n_deps_total = count_downstream_dependencies(chunk[1], chunklist, ci, co, TRUE)[["deps"]]) ->
-    readylist
-
-  # Add number of code lines
-  admin.LINEDATA %>%
-    mutate(chunk = gsub("chunk_", "", filename) %>%
-             gsub("\\.R$", "_DISABLED", .)) %>%
-    select(-filename) %>%
-    right_join(readylist, by = "chunk")
-}
-
-
-# internal function, used by chunk_readylist above
-count_downstream_dependencies <- function(chunkname, chunklist, ci, co, recurse = FALSE, excludes = NA) {
-  name <- chunk <- output <- NULL       # silence notes in package check
-  chunklist %>%
-    select(name, chunk) %>%
-    right_join(co, by = "name") %>%
-    filter(chunk == chunkname) %>%
-    select(output) %>%
-    inner_join(ci, by = c("output" = "input")) %>%
-    left_join(chunklist, by = "name") ->
-    outputlist
-
-  depnames <- unique(outputlist$name)
-  deps <- length(dplyr::setdiff(depnames, excludes))
-
-  if(recurse) {
-    for(i in unique(outputlist$chunk)) {
-      x <- count_downstream_dependencies(i, chunklist, ci, co,
-                                         recurse = recurse,
-                                         excludes = depnames)
-      deps <- deps + x$deps
-      depnames <- c(depnames, x$depnames)
-    }
-  }
-
-  list("deps" = deps, "depnames" = depnames)
-}
-
-
-# This list of file line counts is generated by `chunk-generator.R`
-# Just pasted in here for use by chunk_readylist above
-admin.LINEDATA <- structure(list(
-  filename = c("chunk_LA100.0_LDS_preprocessing.R",
-               "chunk_LA100.FAO_downscale_ctry.R", "chunk_LA100.GTAP_downscale_ctry.R",
-               "chunk_LA100.IMAGE_downscale_ctry_yr.R", "chunk_LA101.ag_FAO_R_C_Y.R",
-               "chunk_LA102.ag_LDS_R_C_GLU.R", "chunk_LA103.ag_R_C_Y_GLU.R",
-               "chunk_LA105.an_FAO_R_C_Y.R", "chunk_LA106.ag_an_NetExp_FAO_R_C_Y.R",
-               "chunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R", "chunk_LA108.ag_Feed_R_C_Y.R",
-               "chunk_LB109.ag_an_ALL_R_C_Y.R", "chunk_LB110.For_FAO_R_Y.R",
-               "chunk_LB111.ag_resbio_R_C.R", "chunk_LB112.ag_prodchange_R_C_Y_GLU.R",
-               "chunk_LB113.bio_Yield_R_GLU.R", "chunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R",
-               "chunk_LB121.Carbon_LT.R", "chunk_LB122.LC_R_Cropland_Yh_GLU.R",
-               "chunk_LB123.LC_R_MgdPastFor_Yh_GLU.R", "chunk_LB124.LC_R_UnMgd_Yh_GLU.R",
-               "chunk_LB125.LC_tot.R", "chunk_LB131.LV_R_GLU.R", "chunk_LB132.ag_an_For_Prices_USA_C_2005.R",
-               "chunk_LB133.ag_Costs_USA_C_2005.R", "chunk_LB134.Diet_Rfao.R",
-               "chunk_LB141.ag_Fert_IFA_ctry_crop.R", "chunk_LB142.ag_Fert_IO_R_C_Y_GLU.R",
-               "chunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R", "chunk_LB152.ag_GTAP_R_C_GLU_irr.R",
-               "chunk_LB161.ag_R_C_Y_GLU_irr.R", "chunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R",
-               "chunk_LB163.bio_Yield_R_GLU_irr.R", "chunk_LB164.ag_Costs_USA_C_2005_irr.R",
-               "chunk_LB165.ag_water_R_C_Y_GLU_irr.R", "chunk_LB171.LC_R_Cropland_Yh_GLU_irr.R",
-               "chunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R", "chunk_L201.ag_For_Past_bio_input.R",
-               "chunk_L2011.ag_For_Past_bio_input_irr.R", "chunk_L2012.ag_For_Past_bio_input_irr_mgmt.R",
-               "chunk_L202.an_input.R", "chunk_L203.demand_input.R", "chunk_L204.resbio_input.R",
-               "chunk_L2041.resbio_input_irr.R", "chunk_L2042.resbio_input_irr_mgmt.R",
-               "chunk_L205.ag_prodchange_cost_input.R", "chunk_L2051.ag_prodchange_cost_input_irr.R",
-               "chunk_L2052.ag_prodchange_cost_irr_mgmt.R", "chunk_L206.ag_Fert.R",
-               "chunk_L2061.ag_Fert_irr.R", "chunk_L2062.ag_Fert_irr_mgmt.R",
-               "chunk_L2071.ag_water_irr.R", "chunk_L2072.ag_water_irr_mgmt.R",
-               "chunk_L221.land_input_1.R", "chunk_L222.land_input_2.R", "chunk_L223.land_input_3.R",
-               "chunk_L2231.land_input_3_irr.R", "chunk_L2241.land_input_4_irr.R",
-               "chunk_L2242.land_input_4_irr_mgmt.R", "chunk_L2252.land_input_5_irr_mgmt.R",
-               "chunk_L241.trade_input.R", "chunk_L242.ssp34_pasture.R", "chunk_L243.bio_trade_input.R",
-               "chunk_L101.nonghg_en_USA_S_T_Y.R", "chunk_L102.ghg_en_USA_S_T_Y.R",
-               "chunk_L103.ghg_an_USA_S_T_Y.R", "chunk_L104.bcoc_en_USA_S_T_Y.R",
-               "chunk_L105.nh3_an_USA_S_T_Y.R", "chunk_L111.nonghg_en_R_S_T_Y.R",
-               "chunk_L112.ghg_en_R_S_T_Y.R", "chunk_L113.ghg_an_R_S_T_Y.R",
-               "chunk_L114.bcoc_en_R_S_T_Y.R", "chunk_L115.nh3_an_R_S_T_Y.R",
-               "chunk_L121.nonco2_awb_R_S_T_Y.R", "chunk_L1211.nonco2_awb_R_S_T_Y_IRR.R",
-               "chunk_L122.ghg_agr_R_S_T_Y.R", "chunk_L1221.ghg_agr_R_S_T_Y_IRR.R",
-               "chunk_L123.bcoc_awb_R_S_T_Y.R", "chunk_L124.nonco2_unmgd_R_S_T_Y.R",
-               "chunk_L125.bcoc_unmgd_R_S_T_Y.R", "chunk_L131.nonco2_proc_R_S_T_Y.R",
-               "chunk_L141.hfc_R_S_T_Y.R", "chunk_L142.pfc_R_S_T_Y.R", "chunk_L151.ctrl_R_en_S_T.R",
-               "chunk_L152.MACC.R", "chunk_L161.nonghg_en_ssp_R_S_T_Y.R", "chunk_L201.en_nonco2.R",
-               "chunk_L211.ag_nonco2.R", "chunk_L2111.ag_nonco2_IRR.R", "chunk_L2112.ag_nonco2_IRR_MGMT.R",
-               "chunk_L212.unmgd_nonco2.R", "chunk_L231.proc_sector.R", "chunk_L232.prc_nonco2.R",
-               "chunk_L241.en_newtech_nonco2.R", "chunk_L241.fgas.R", "chunk_L251.en_ssp_nonco2.R",
-               "chunk_L252.MACC.R", "chunk_L2521.MACC_IRR.R", "chunk_L2522.ag_MACC_IRR_MGMT.R",
-               "chunk_LA100.CDIAC_downscale_ctry.R", "chunk_LA100.IEA_downscale_ctry.R",
-               "chunk_LA101.en_bal_IEA.R", "chunk_LA1011.en_bal_adj.R", "chunk_LA102.en_emiss_CDIAC.R",
-               "chunk_LA111.rsrc_fos_Prod.R", "chunk_LA112.U.R", "chunk_LA113.MSW.R",
-               "chunk_LA114.wind.R", "chunk_LA115.roofPV.R", "chunk_LA116.geo.R",
-               "chunk_LA117.tradbio.R", "chunk_LA118.hydro.R", "chunk_LA119.solar.R",
-               "chunk_LA121.oil.R", "chunk_LA122.gasproc_refining.R", "chunk_LA123.electricity.R",
-               "chunk_LA1231.elec_tech.R", "chunk_LA124.heat.R", "chunk_LA126.distribution.R",
-               "chunk_LA131.enduse.R", "chunk_LA132.industry.R", "chunk_LA1321.cement.R",
-               "chunk_LA142.building_agg.R", "chunk_LA143.HDDCDD.R", "chunk_LA144.building_det_en.R",
-               "chunk_LA144.building_det_flsp.R", "chunk_LA152.transportation.R",
-               "chunk_LA154.transportation_UCD.R", "chunk_LA161.Cstorage.R",
-               "chunk_LB1322.Fert.R", "chunk_L202.Ccoef.R", "chunk_L210.resources.R",
-               "chunk_L221.en_supply.R", "chunk_L222.en_transformation.R", "chunk_L223.electricity.R",
-               "chunk_L224.heat.R", "chunk_L225.hydrogen.R", "chunk_L226.en_distribution.R",
-               "chunk_L232.industry.R", "chunk_L2321.cement.R", "chunk_L2322.Fert.R",
-               "chunk_L242.building_agg.R", "chunk_L244.building_det.R", "chunk_L252.transportation.R",
-               "chunk_L254.transportation_UCD.R", "chunk_L261.Cstorage.R", "chunk_LA100.Socioeconomics.R",
-               "chunk_LA101.EIA_SEDS.R", "chunk_LA114.Wind.R", "chunk_LA115.RooftopPV.R",
-               "chunk_LA119.Solar.R", "chunk_LA122.Refining.R", "chunk_LA132.Industry.R",
-               "chunk_LA1321.Cement.R", "chunk_LA1322.Fert.R", "chunk_LA142.Building.R",
-               "chunk_LA144.Commercial.R", "chunk_LA144.Residential.R", "chunk_LA154.Transport.R",
-               "chunk_LB123.Electricity.R", "chunk_LB1231.Elec_tech.R", "chunk_LB1232.Elec_subregions.R",
-               "chunk_LB1233.Elec_water.R", "chunk_LB126.Gas_ElecTD.R", "chunk_L201.socioeconomics_USA.R",
-               "chunk_L210.resources_USA.R", "chunk_L222.en_transformation_USA.R",
-               "chunk_L223.electricity_USA.R", "chunk_L2232.electricity_FERC_USA.R",
-               "chunk_L225.hydrogen_USA.R", "chunk_L226.en_distribution_USA.R",
-               "chunk_L232.industry_USA.R", "chunk_L2321.cement_USA.R", "chunk_L2322.Fert_USA.R",
-               "chunk_L244.building_USA.R", "chunk_L254.transportation_USA.R",
-               "chunk_L261.carbon_storage_USA.R", "chunk_L200.modeltime.R",
-               "chunk_L100.GDP_hist.R", "chunk_L100.Population_downscale_ctry.R",
-               "chunk_L101.Population.R", "chunk_L102.GDP.R", "chunk_L201.Pop_GDP_scenarios.R",
-               "chunk_L242.Bld_Inc_Elas_scenarios.R", "chunk_L252.Trn_Inc_Elas_scenarios.R",
-               "chunk_L102.water.supply.unlimited.R", "chunk_L110.water.demand.primary.R",
-               "chunk_L1233.Elec_water.R", "chunk_L132.water.demand.manufacturing.R",
-               "chunk_L133.water.demand.livestock.R", "chunk_L145.water.demand.municipal.R",
-               "chunk_L202.water.resources.unlimited.R", "chunk_L203.water.mapping.R",
-               "chunk_L210.water.demand.primary.R", "chunk_L2233.electricity_water.R",
-               "chunk_L232.water.demand.manufacturing.R", "chunk_L233.water.demand.livestock.R",
-               "chunk_L245.water.demand.municipal.R"),
-  lines = c(86L, 238L,
-            74L, 59L, 139L, 63L, 110L, 139L, 140L, 94L, 186L, 155L, 89L,
-            69L, 199L, 81L, 119L, 115L, 237L, 231L, 108L, 88L, 59L, 165L,
-            135L, 361L, 148L, 154L, 143L, 78L, 131L, 220L, 108L, 95L, 308L,
-            90L, 350L, 268L, 170L, 140L, 413L, 552L, 137L, 67L, 69L, 185L,
-            166L, 94L, 120L, 93L, 62L, 226L, 64L, 152L, 189L, 402L, 72L,
-            283L, 59L, 172L, 119L, 98L, 236L, 265L, 79L, 72L, 83L, 82L, 177L,
-            130L, 102L, 124L, 98L, 126L, 71L, 188L, 49L, 78L, 221L, 157L,
-            131L, 156L, 104L, 82L, 98L, 330L, 207L, 150L, 109L, 99L, 269L,
-            233L, 79L, 134L, 141L, 113L, 256L, 90L, 85L, 93L, 185L, 164L,
-            122L, 98L, 154L, 56L, 73L, 138L, 75L, 113L, 60L, 128L, 114L,
-            99L, 211L, 89L, 127L, 117L, 96L, 119L, 109L, 236L, 69L, 137L,
-            377L, 193L, 44L, 366L, 73L, 290L, 79L, 381L, 350L, 277L, 591L,
-            221L, 149L, 197L, 430L, 294L, 270L, 231L, 698L, 180L, 474L, 179L,
-            89L, 73L, 69L, 142L, 58L, 167L, 159L, 66L, 66L, 89L, 319L, 366L,
-            103L, 131L, 72L, 47L, 181L, 237L, 85L, 164L, 268L, 511L, 304L,
-            37L, 228L, 236L, 197L, 214L, 541L, 243L, 140L, 87L, 49L, 139L,
-            101L, 263L, 158L, 78L, 77L, 58L, 57L, 210L, 64L, 88L, 92L, 65L,
-            109L, 58L, 539L, 54L, 53L, 144L)),
-  .Names = c("filename", "lines"),
-  row.names = c(NA, -198L), class = c("tbl_df", "tbl", "data.frame"))
-
-# ---------------
 # Following functions are extremely specific administrative ones
 # Don't worry about covering them in tests
 
@@ -284,4 +102,176 @@ add_column_types_header_line <- function(overwrite = FALSE) {
   }
 }
 
+#' rename_gcamdata_chunks
+#'
+#' Renames gcamdata chunks to new format, including getting rid of LA/LBs, cleaning up module
+#' names, and replacing "batch" with "xml". Also renames function within scripts
+#'
+#' @return Nothing
+#' @author ENL 2023
+rename_gcamdata_chunks <- function() {
+
+  # Part 1: Rename files
+  # Get list of available modules
+  devtools::load_all()
+  module_options <- c("zaglu", "zemissions", "zsocio", "zenergy", "zgcamusa",
+                      "zwater", "zclimate", "zmodeltime")
+
+  # Get list of files to rename
+  # All scripts in R/ that contain "zchunk"
+  files_to_rename <- data.frame(orig_file_name = list.files("R/", full.names = TRUE)) %>%
+    filter(grepl("zchunk", orig_file_name))
+
+  # Read 3rd line of each file which should contain module name
+  # This avoids doing any manual sector matching
+  first_three_lines <- lapply(files_to_rename$orig_file_name, readLines, 3)
+  files_to_rename$third_line <- lapply(first_three_lines, `[[`, 3)
+
+  # Error if third line isn't module name. Need to manually fix these
+  files_to_rename %>% filter(!grepl("#' module_", third_line)) -> third_line_wrong
+  if(nrow(third_line_wrong) != 0){
+    stop("Third line isn't module name in ", third_line_wrong$orig_file_name, ". Needs to be fixed manually")
+  }
+
+  # Get module names from column read in above to use during rename
+  files_to_rename %>%
+    mutate(mod_type = sub(".*#' module_", "", third_line), # Extract text after "module_"
+           mod_type = sub("\\_.*", "", mod_type), # Extract text before first "_". This should be module name
+           mod_type = paste0("z", mod_type)) %>% # Put "z" in front of module to keep files ordered
+    select(-third_line) -> files_w_mods
+
+  # If there are "socioeconomics" sectors, change them to "socio"
+  # Change all files with USA in name to module "gcamusa"
+  files_w_mods %>%
+    mutate(mod_type = gsub("socioeconomics", "socio", mod_type),
+           mod_type = if_else(grepl("USA", orig_file_name), "zgcamusa", mod_type)) -> files_w_mods_fixed
+
+  # Error if module not in list of available modules. Need to manually fix these
+  files_w_mods_fixed %>% filter(!mod_type %in% module_options) -> not_in_available_mods
+  if(nrow(not_in_available_mods) != 0){
+    stop("Module not available for ", not_in_available_mods$orig_file_name, ". Needs to be fixed manually")
+  }
+
+  # Get new names for files
+  # Replace LA and LB with L
+  # Get rid of appended _USA since we already specify with zgcamusa
+  # Get rid of "batch" and move xml to after module name
+  files_w_mods_fixed %>%
+    mutate(new_file = paste0("R/", mod_type, "_", sub("^.*?_", "", orig_file_name)),
+           new_file = gsub("LA|LB", "L", new_file),
+           new_file = gsub("_USA", "", new_file),
+           new_file = gsub("_xml", "", new_file),
+           new_file = gsub("batch", "xml", new_file)) %>%
+    select(-mod_type)-> name_map
+
+  # Check for duplicate file names in entire R folder
+  data.frame(files = list.files("R/", full.names = TRUE)) %>%
+    rbind(data.frame(files = name_map$new_file)) %>%
+    group_by(files) %>%
+    filter(dplyr::n()>1) -> duplicates
+  # Error if there are, since we can't write two files with same name
+  if(nrow(duplicates > 0)){
+    stop("Duplicate file names: ", unique(duplicates$files) ," Fix this before continuing")
+  }
+
+  # Do the rename and let users know:
+  file.rename(name_map$orig_file_name, name_map$new_file)
+  if(nrow(name_map)>0){  message(nrow(name_map), " file(s) renamed") }
+
+  # Part 2: Fix content of files, including file name
+  # Note: Only fixing content of files that we updated names of above
+  files_w_mods %>%
+    left_join(name_map, by = c("orig_file_name")) -> updated_files
+
+  # Replace "socioeconomics" with "socio" in function names
+  updated_files %>%
+    filter(grepl("zsocioeconomics", mod_type)) -> socio_chunks
+
+  for(name in socio_chunks$new_file){
+    #Read file
+    tx  <- readLines(name)
+    #Replace "module_socioeconomics" with "module_socio"
+    tx_rpl <- gsub(pattern = "module_socioeconomics", replace = "module_socio", tx)
+    # Save file with new text
+    writeLines(tx_rpl, con=name)
+  }
+  # If we updated any chunks let user know
+  if(nrow(socio_chunks > 0)){
+    message("Replaced ", nrow(socio_chunks), " socioeconomics function name(s) with \"socio\"")
+  }
+
+  # Get rid of "_USA" and only include module_gcamusa in function names
+  # Have to be careful to only change overall function name and not any outputs
+  updated_files %>%
+    filter(mod_type == "zgcamusa") -> gcamusa_chunks
+
+  for(name in gcamusa_chunks$new_file){
+    #Read file and get the line numbers that need updating
+    tx  <- readLines(name)
+    tx_rpl <- tx
+    lines_to_update <- which(grepl("module_.*USA", tx))
+    #Remove _USA in function name and replace any module name with "gcamusa"
+    for(i in lines_to_update){
+      tx_rpl[i] <- gsub("_USA", "", tx_rpl[i])
+      tx_rpl[i] <- gsub(sub("\\_.*", "", sub(".*module_", "", tx_rpl[i])), "gcamusa", tx_rpl[i])
+    }
+    # Save file with new text
+    writeLines(tx_rpl, con=name)
+  }
+
+  # If we updated any chunks let user know
+  if(nrow(gcamusa_chunks > 0)){
+    message("Updated function name in ", nrow(gcamusa_chunks), " gcamusa chunk(s)")
+  }
+
+  # Replace "batch" with "XML" in function name
+  updated_files %>%
+    filter(grepl("_xml_", new_file)) -> xml_chunks
+
+  for(name in xml_chunks$new_file){
+    tx  <- readLines(name)
+    tx_rpl <- tx
+    #Remove _USA in module function name
+    lines_to_update <-which(grepl("module_.*batch", tx_rpl))
+    for(i in lines_to_update){
+      tx_rpl[i] <- gsub("_batch", "", tx_rpl[i])
+    }
+    writeLines(tx_rpl, con=name)
+  }
+
+  # If we updated any chunks let user know
+  if(nrow(xml_chunks > 0)){
+    message("Updated function name in ", nrow(xml_chunks), " XML chunk(s)")
+  }
+
+  # Get rid of all LA's and LB's in chunks since these have no meaning
+  updated_files %>%
+    filter(grepl("LA|LB", orig_file_name)) -> LALB_files
+
+  for(name in LALB_files$new_file){
+    tx  <- readLines(name)
+    # Get name of original file to check if LA or LB
+    orig_name <- LALB_files[which(LALB_files$new_file == name), 1]
+    if(grepl("LA", orig_name)){
+      # For the LA's the world DECLARE also has an "LA"
+      # Workaround: grab the integer following the "LA" and search and replace LA + integer
+      # Also prevent changing the "original file" note by searching for strings starting with _
+      number <- substr(sub(".*LA", "", orig_name),1,1)
+      # Get replace text for LAs
+      tx_rpl <- gsub(pattern = paste0("_LA", number), replace = paste0("_L", number), x = tx)
+    }
+    else{
+      # Get replace text for LB's
+      tx_rpl <- gsub(pattern = "_LB", replace = "_L", x = tx)
+    }
+    # Save file with new text
+    writeLines(tx_rpl, con=name)
+  }
+
+  # If we updated any chunks let user know
+  if(nrow(LALB_files > 0)){
+    message("Removed LA or LB in ", nrow(LALB_files), " function name(s)")
+  }
+} # end rename_gcamdata_chunks
+
 # nocov end
diff --git a/input/gcamdata/R/constants.R b/input/gcamdata/R/constants.R
index 29b443861a..8127d2278a 100644
--- a/input/gcamdata/R/constants.R
+++ b/input/gcamdata/R/constants.R
@@ -818,7 +818,7 @@ emissions.ZERO_EM_TECH  <- c("electricity", "Electric", "BEV","FCEV","district h
 emissions.HIGH_EM_FACTOR_THRESHOLD <- 1000  # All emission factors above this threshold are replaced with the global median of emission factors.
 emissions.GFED_NODATA <- c("ala","bes","blm","ggy","jey","maf","xad","xko","xnc")  # GFED LULC dataset does not contaian data for these isos. These get filtered out so we can use the left_join_error_no_match.
 emissions.UNMGD_LAND_AVG_YRS <- 30 # Years for climatological average for the GFED LULC data.
-emissions.CEDS_scale    <- "usa" # iso's that will be scaled to CEDS emissions
+emissions.CEDS_SCALE    <- "usa" # iso's that will be scaled to CEDS emissions
 emissions.CH4.GWP.AR4 <- 25 # used for EPA non-CO2 scaling, the 2019 EPA non-CO2 report uses AR4 GWPs
 emissions.N2O.GWP.AR4 <- 298 # used for EPA non-CO2 scaling, the 2019 EPA non-CO2 report uses AR4 GWPs
 
@@ -1066,7 +1066,7 @@ gcamusa.TRN_MARKAL_EMISSION_YEARS <- seq(2005,2050, 5)
 gcamusa.TRN_EMISSION_YEARS <- seq(2005,2100, 5)
 
 # emission factor timestep
-gcamusa.TRN_EF_timestep <- 5
+gcamusa.TRN_EF_TIMESTEP <- 5
 
 # GCAM-USA StubTranTech missing lifetime
 gcamusa.STUBTRANTECH_LIFETIME_2045V <- 25 # lifetime for missing vehicles vintages 2045 and earlier
@@ -1084,10 +1084,10 @@ gcamusa.INTL_SHIP_PM_RATIO <- 0.92 # this is the ratio of PM2.5 to PM10 for inte
 gcamusa.IND_PROC_EM_NEI_GCAM_SECTORS <- c("industry_processes", "solvents")
 gcamusa.URB_PROC_EM_NEI_GCAM_SECTORS <- c("landfills", "wastewater", "waste_incineration")
 gcamusa.CEMENT_NEI_GCAM_SECTORS <- c("cement")
-gcamusa.NONGHG_PROC_SECTORS.missing_pollutants <- c("PM2.5", "PM10", "NH3")
-gcamusa.NONGHG_PROC_SECTORS.missing_subsectors <- c("wastewater")
-gcamusa.NONGHG_PROC_SECTORS.gdp_max_reduction <- 30
-gcamusa.NONGHG_PROC_SECTORS.gdp_steepness <- 3.5
+gcamusa.NONGHG_PROC_SECTORS.MISSING_POLLUTANTS <- c("PM2.5", "PM10", "NH3")
+gcamusa.NONGHG_PROC_SECTORS.MISSING_SUBSECTORS <- c("wastewater")
+gcamusa.NONGHG_PROC_SECTORS.GDP_MAX_REDUCTION <- 30
+gcamusa.NONGHG_PROC_SECTORS.GDP_STEEPNESS <- 3.5
 
 gcamusa.PROC_DEFAULT_SECTOR <- "industrial processes"
 gcamusa.PROC_DEFAULT_S_T <- "other industrial processes"
diff --git a/input/gcamdata/R/module-helpers.R b/input/gcamdata/R/module-helpers.R
index 770d97b548..8c1c445561 100644
--- a/input/gcamdata/R/module-helpers.R
+++ b/input/gcamdata/R/module-helpers.R
@@ -1166,3 +1166,94 @@ compute_BC_OC_elc <- function(df, BC_OC_assumptions) {
   return (df)
 
 }
+
+
+#' join.gdp.ts
+#'
+#' Join past GDP time series to future.
+#'
+#' When we have to join two GDP time series, we usually find that they don't
+#' match up at year of overlap (the "base year").  What we do in these cases is
+#' we compute, for the later time series, ratios of GDPs in the future years to
+#' those in the base year.  We then multiply the future ratios by the past base
+#' year value.  That future time series can then be grafted onto the past
+#' without leaving a seam.
+#'
+#' In practice, the past is often a single time series, while the future is
+#' often a collection of scenarios.  Therefore, we assume that the past time
+#' series has no scenario column.  If the future does not have a scenario
+#' column, it is given a dummy one, which is dropped before the new table is
+#' returned.  Note that we look for lower-case 'scenario' for this.
+#'
+#' The base year is calculated automatically.  It is the maximum of the years
+#' that overlap between the two data sets.
+#'
+#' We also have to know how to group the data for calculating the gdp ratios.
+#' Normally this will be either by country ('iso') or by GCAM region
+#' ('GCAM_region_ID').  The choice of which is passed in as the 'grouping'
+#' argument.
+#'
+#' Finally, although we have discussed this function in terms of joining two GDP
+#' time series, in the future time series we use only the ratios of GDP to base
+#' year GDP.  Therefore, any time series with the correct ratios will work.  For
+#' example, if we have a time series of growth rates, we can convert those to
+#' ratios using \code{\link[base]{cumprod}} and pass those ratios as the future
+#' time series.  For similar reasons, even if the two time series have different
+#' units (e.g., different dollar-years or PPP vs. MER), they can still be
+#' joined.  The units of the output time series will be the same as the units of
+#' \code{past}.
+#'
+#' @param past Tibble with the past time series (year, gdp, and grouping).
+#' @param future Tibble with the future data (year, gdp, scenario, and
+#' grouping).
+#' @param grouping Name of the grouping column (generally either 'iso' or
+#' 'GCAM_region_ID', but could be anything
+#' @return Time series with the past and future joined as described in details.
+join.gdp.ts <- function(past, future, grouping) {
+
+  year <- gdp <- base.gdp <- gdp.ratio <- . <- scenario <-
+    NULL                            # silence notes on package check.
+
+  if(! 'scenario' %in% names(future)) {
+    ## This saves us having to make a bunch of exceptions below when we
+    ## include 'scenario' among the columns to join by.
+    future$scenario <- 'scen'
+    drop.scenario <- TRUE
+  }
+  else {
+    drop.scenario <- FALSE
+  }
+
+  ## Find the base year
+  base.year <- max(intersect(past$year, future$year))
+  assert_that(is.finite(base.year))
+
+  ## Base year gdp from the future dataset
+  baseyear.future.gdp <- filter(future, year == base.year) %>%
+    rename(base.gdp = gdp) %>%
+    select(-year)
+
+  gdp.future.ratio <- filter(future, year > base.year) %>%
+    left_join_error_no_match(baseyear.future.gdp, by = c('scenario', grouping)) %>%
+    mutate(gdp.ratio = gdp / base.gdp) %>%
+    select('scenario', grouping, 'year', 'gdp.ratio')
+
+  ## add the scenario column to the past
+  gdp.past <- tidyr::crossing(past, scenario = unique(gdp.future.ratio[['scenario']]))
+  baseyear.past.gdp <- filter(gdp.past, year == base.year) %>%
+    rename(base.gdp = gdp) %>%
+    select(-year)
+
+  rslt <- left_join(baseyear.past.gdp, gdp.future.ratio,
+                    by = c('scenario', grouping)) %>%
+    mutate(gdp = base.gdp * gdp.ratio) %>%
+    select('scenario', grouping, 'year', 'gdp') %>%
+    bind_rows(gdp.past, .)
+
+  if(drop.scenario) {
+    select(rslt, -scenario)
+  }
+  else {
+    rslt
+  }
+}
diff --git a/input/gcamdata/R/zchunk_LA100.0_LDS_preprocessing.R b/input/gcamdata/R/zaglu_L100.0_LDS_preprocessing.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA100.0_LDS_preprocessing.R
rename to input/gcamdata/R/zaglu_L100.0_LDS_preprocessing.R
index aebcdce7bf..a87a5e8230 100644
--- a/input/gcamdata/R/zchunk_LA100.0_LDS_preprocessing.R
+++ b/input/gcamdata/R/zaglu_L100.0_LDS_preprocessing.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.0_LDS_preprocessing
+#' module_aglu_L100.0_LDS_preprocessing
 #'
 #' Read in and process LDS (Land Data System) files.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter mutate semi_join summarise
 #' @author BBL March 2017
-module_aglu_LA100.0_LDS_preprocessing <- function(command, ...) {
+module_aglu_L100.0_LDS_preprocessing <- function(command, ...) {
 
   namelist <- c("Land_type_area_ha",
                 "LDS_ag_HA_ha",
diff --git a/input/gcamdata/R/zchunk_LA100.FAO_SUA_PrimaryEquivalent.R b/input/gcamdata/R/zaglu_L100.FAO_SUA_PrimaryEquivalent.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA100.FAO_SUA_PrimaryEquivalent.R
rename to input/gcamdata/R/zaglu_L100.FAO_SUA_PrimaryEquivalent.R
index cbfef9afbc..deb0b7c7c0 100644
--- a/input/gcamdata/R/zchunk_LA100.FAO_SUA_PrimaryEquivalent.R
+++ b/input/gcamdata/R/zaglu_L100.FAO_SUA_PrimaryEquivalent.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.FAO_SUA_PrimaryEquivalent
+#' module_aglu_L100.FAO_SUA_PrimaryEquivalent
 #'
 #' Generate supply utilization balance in primary equivalent
 #'
@@ -20,7 +20,7 @@
 #' @importFrom dplyr bind_rows filter if_else inner_join left_join mutate rename select n group_by_at
 #' @importFrom tidyr complete drop_na gather nesting spread replace_na
 #' @author XZ 2022
-module_aglu_LA100.FAO_SUA_PrimaryEquivalent <- function(command, ...) {
+module_aglu_L100.FAO_SUA_PrimaryEquivalent <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/AGLU_ctry",
@@ -671,16 +671,16 @@ module_aglu_LA100.FAO_SUA_PrimaryEquivalent <- function(command, ...) {
       # calculate Prod_diff which is the diff in production b/t the two data sets
       mutate(Prod_diff = FBSH_CB[element == "Production"] - value[element == "Production"] ) %>%
       # adjust processed when prod_diff > 0 by canceling off production and processed
-      mutate(Prod_diff = if_else(Prod_diff > 0 & element %in% c("Production", "Processed"), Prod_diff, 0)) %>%
-      mutate(Processed = if_else(Prod_diff > 0 & element %in% c("Production", "Processed"),
-                                 FBSH_CB[element == "Processed"], 0)) %>%
-      mutate(FBSH_CB = FBSH_CB - pmin(Prod_diff, Processed)) %>%
-      # When production in FBSH_CB = 0 set to production in QCL so scaling will be consistent
-      mutate(FBSH_CB = if_else(FBSH_CB[element == "Production"] == 0 & element == "Production", value, FBSH_CB)) %>%
-      # After the above adjustments, re-scale SUA to match production in value
-      mutate(value = FBSH_CB * value[element == "Production"]/FBSH_CB[element == "Production"]) %>%
-      # fix NA
-      mutate(value = if_else(!is.finite(value), FBSH_CB, value)) %>%
+      mutate(Prod_diff = if_else(Prod_diff > 0 & element %in% c("Production", "Processed"), Prod_diff, 0),
+             Processed = if_else(Prod_diff > 0 & element %in% c("Production", "Processed"),
+                                 FBSH_CB[element == "Processed"], 0),
+             FBSH_CB = FBSH_CB - pmin(Prod_diff, Processed),
+             # When production in FBSH_CB = 0 set to production in QCL so scaling will be consistent
+             FBSH_CB = if_else(FBSH_CB[element == "Production"] == 0 & element == "Production", value, FBSH_CB),
+             # After the above adjustments, re-scale SUA to match production in value
+             value = FBSH_CB * value[element == "Production"]/FBSH_CB[element == "Production"],
+             # fix NA
+             value = if_else(!is.finite(value), FBSH_CB, value)) %>%
       ungroup() %>%
       select(area, GCAM_commodity, element, year, value) %>%
       # adjust gross trade
@@ -690,8 +690,8 @@ module_aglu_LA100.FAO_SUA_PrimaryEquivalent <- function(command, ...) {
       spread(element, value) %>%
       # Note that stock variation here was  = opening - ending
       # reversed here so the variation is a demand
-      mutate(`Stock Variation` = - `Stock Variation`) %>%
-      mutate(`Regional supply` = Production + `Import`,
+      mutate(`Stock Variation` = - `Stock Variation`,
+             `Regional supply` = Production + `Import`,
              `Regional demand` = `Export` + Feed + Food + Loss + Processed + Seed + `Other uses` + `Stock Variation`,
              Residuals = `Regional supply` -  `Regional demand`) %>%
       tidyr::gather(element, value, -area, -GCAM_commodity, -year) %>%
@@ -1003,10 +1003,10 @@ module_aglu_LA100.FAO_SUA_PrimaryEquivalent <- function(command, ...) {
                                by = c("item_code", "item", "macronutrient")) %>%
       mutate(macronutrient_value = if_else(is.na(macronutrient_value),
                                            macronutrient_value_World,
-                                           macronutrient_value)) %>%
-      # calculate total Cal, protein and fat in food
-      # value was in 1000 ton or 10^ 9 g
-      mutate(value = macronutrient_value * Food_Kt,
+                                           macronutrient_value),
+             # calculate total Cal, protein and fat in food
+             # value was in 1000 ton or 10^ 9 g
+             value = macronutrient_value * Food_Kt,
              value = if_else(macronutrient %in% c("fatperc", "proteinperc"),
                              value / 100 /1000, value)) %>% # unit from perc to Mt
       select(-macronutrient_value, -macronutrient_value_World, -Food_Kt) %>%
diff --git a/input/gcamdata/R/zchunk_LA100.FAO_SUA_connection.R b/input/gcamdata/R/zaglu_L100.FAO_SUA_connection.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA100.FAO_SUA_connection.R
rename to input/gcamdata/R/zaglu_L100.FAO_SUA_connection.R
index 07be425724..ad0ae3de84 100644
--- a/input/gcamdata/R/zchunk_LA100.FAO_SUA_connection.R
+++ b/input/gcamdata/R/zaglu_L100.FAO_SUA_connection.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.FAO_SUA_connection
+#' module_aglu_L100.FAO_SUA_connection
 #'
 #' Pull and further process SUA data needed
 #'
@@ -14,7 +14,7 @@
 #' @importFrom tidyr  complete drop_na gather nesting spread replace_na
 #' @importFrom tibble tibble
 #' @author XZ 2022
-module_aglu_LA100.FAO_SUA_connection <- function(command, ...) {
+module_aglu_L100.FAO_SUA_connection <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/GCAM_region_names",
diff --git a/input/gcamdata/R/zchunk_LA100.FAO_preprocessing_OtherData.R b/input/gcamdata/R/zaglu_L100.FAO_preprocessing_OtherData.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA100.FAO_preprocessing_OtherData.R
rename to input/gcamdata/R/zaglu_L100.FAO_preprocessing_OtherData.R
index 1582dc4bf9..6a5fcba4b2 100644
--- a/input/gcamdata/R/zchunk_LA100.FAO_preprocessing_OtherData.R
+++ b/input/gcamdata/R/zaglu_L100.FAO_preprocessing_OtherData.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.FAO_preprocessing_OtherData
+#' module_aglu_L100.FAO_preprocessing_OtherData
 #'
 #' Get FAO data ready for forestry, fertilizer, animal stock, and land cover
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr bind_rows distinct filter full_join left_join rename select add_row
 #' @importFrom tidyr gather replace_na spread
 #' @author BBL XZ 2022
-module_aglu_LA100.FAO_preprocessing_OtherData <- function(command, ...) {
+module_aglu_L100.FAO_preprocessing_OtherData <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/AGLU_ctry",
@@ -90,8 +90,8 @@ module_aglu_LA100.FAO_preprocessing_OtherData <- function(command, ...) {
       # filter out nonexist regions years due to gather e.g., USSR after 1991
       filter(!is.na(value)) %>%
       # change unit if 1000 head to head
-      mutate(value = if_else(unit == "1000 Head", value * 1000, value)) %>%
-      mutate(unit = if_else(unit == "1000 Head", "Head", unit)) %>%
+      mutate(value = if_else(unit == "1000 Head", value * 1000, value),
+             unit = if_else(unit == "1000 Head", "Head", unit)) %>%
       FAO_REG_YEAR_MAP
 
     ##* L100.FAO_an_Dairy_Stocks ----
diff --git a/input/gcamdata/R/zchunk_LA100.GTAP_downscale_ctry.R b/input/gcamdata/R/zaglu_L100.GTAP_downscale_ctry.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA100.GTAP_downscale_ctry.R
rename to input/gcamdata/R/zaglu_L100.GTAP_downscale_ctry.R
index 91b3ae3468..d9a2c4322f 100644
--- a/input/gcamdata/R/zchunk_LA100.GTAP_downscale_ctry.R
+++ b/input/gcamdata/R/zaglu_L100.GTAP_downscale_ctry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.GTAP_downscale_ctry
+#' module_aglu_L100.GTAP_downscale_ctry
 #'
 #' Downscale GTAP region-level land value data to all countries and get GTAP VFA data.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom tidyr replace_na
 #' @importFrom stats na.omit
 #' @author RC April 2017 XZ 2023 March
-module_aglu_LA100.GTAP_downscale_ctry <- function(command, ...) {
+module_aglu_L100.GTAP_downscale_ctry <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/AGLU_ctry",
@@ -36,7 +36,7 @@ module_aglu_LA100.GTAP_downscale_ctry <- function(command, ...) {
     c("L100.GTAP_LV_milUSD",
       "L100.GTAP_capital_stock")
 
-  if(command == driver.DECLARE_INPUTS) {
+    if(command == driver.DECLARE_INPUTS) {
     return(MODULE_INPUTS)
   } else if(command == driver.DECLARE_OUTPUTS) {
     return(MODULE_OUTPUTS)
diff --git a/input/gcamdata/R/zchunk_LA100.IMAGE_downscale_ctry_yr.R b/input/gcamdata/R/zaglu_L100.IMAGE_downscale_ctry_yr.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA100.IMAGE_downscale_ctry_yr.R
rename to input/gcamdata/R/zaglu_L100.IMAGE_downscale_ctry_yr.R
index 783d01df70..13fd9958f5 100644
--- a/input/gcamdata/R/zchunk_LA100.IMAGE_downscale_ctry_yr.R
+++ b/input/gcamdata/R/zaglu_L100.IMAGE_downscale_ctry_yr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.IMAGE_downscale_ctry_yr
+#' module_aglu_L100.IMAGE_downscale_ctry_yr
 #'
 #' Extrapolate IMAGE data to all AGLU historical years and countries.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows filter if_else group_by left_join mutate select union
 #' @importFrom tidyr complete gather nesting spread
 #' @author BBL June 2017 XZ 2022
-module_aglu_LA100.IMAGE_downscale_ctry_yr <- function(command, ...) {
+module_aglu_L100.IMAGE_downscale_ctry_yr <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/AGLU_ctry",
@@ -184,8 +184,8 @@ module_aglu_LA100.IMAGE_downscale_ctry_yr <- function(command, ...) {
           dplyr::group_by_at(vars(-input, -value)) %>%
           summarize(input = sum(value)) %>% ungroup(),
         by = c("year", "IMAGEv3p2_region", "commodity", "system")) %>%
-      mutate(input = if_else(output == 0, 0, input)) %>%
-      mutate(value = input / output) %>%
+      mutate(input = if_else(output == 0, 0, input),
+             value = input / output) %>%
       replace_na(list(value = 0)) %>%
       select(-input, -output) ->
       L100.IMAGE_an_FeedIO_Rimg_C_Sys_Y
@@ -199,8 +199,8 @@ module_aglu_LA100.IMAGE_downscale_ctry_yr <- function(command, ...) {
       select(-IOCoef) %>%
     # Calculate feed shares
       dplyr::group_by_at(vars(-input, -value)) %>%
-      mutate(value = value / sum(value), count = sum(dplyr::n())) %>%
-      mutate(value = if_else(is.na(value), 1/count, value)) %>%
+      mutate(value = value / sum(value), count = sum(dplyr::n()),
+             value = if_else(is.na(value), 1/count, value)) %>%
       ungroup() %>%
       select(-count) ->
       L100.IMAGE_an_Feedfrac_Rimg_C_Sys_Fd_Y
diff --git a/input/gcamdata/R/zchunk_LA100.regional_ag_an_for_prices.R b/input/gcamdata/R/zaglu_L100.regional_ag_an_for_prices.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA100.regional_ag_an_for_prices.R
rename to input/gcamdata/R/zaglu_L100.regional_ag_an_for_prices.R
index b02600b404..6223faad2a 100644
--- a/input/gcamdata/R/zchunk_LA100.regional_ag_an_for_prices.R
+++ b/input/gcamdata/R/zaglu_L100.regional_ag_an_for_prices.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA100.regional_ag_an_for_prices
+#' module_aglu_L100.regional_ag_an_for_prices
 #'
 #' Calculate the calibration prices for all GCAM AGLU commodities.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom tidyr  complete drop_na gather nesting spread replace_na
 #' @importFrom tibble tibble
 #' @author GPK/RC/STW February 2019; XZ 2022
-module_aglu_LA100.regional_ag_an_for_prices <- function(command, ...) {
+module_aglu_L100.regional_ag_an_for_prices <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
@@ -193,8 +193,8 @@ module_aglu_LA100.regional_ag_an_for_prices <- function(command, ...) {
       filter(region %in% c("USA", "Indonesia")) %>% select(GCAM_commodity, region, value) %>%
       spread(region, value) %>%
       full_join(Ag_price_index_relative_to_USA_Indonesia, by = character()) %>%
-      mutate(RegP_interpolated = USA * P_index_toUSA) %>%
-      mutate(RegP_interpolated = if_else(is.na(RegP_interpolated), Indonesia * P_index_toIndonesia,
+      mutate(RegP_interpolated = USA * P_index_toUSA,
+             RegP_interpolated = if_else(is.na(RegP_interpolated), Indonesia * P_index_toIndonesia,
                                          RegP_interpolated)) %>%
       select(GCAM_region_ID, GCAM_commodity, RegP_interpolated)
 
@@ -225,8 +225,8 @@ module_aglu_LA100.regional_ag_an_for_prices <- function(command, ...) {
         bind_rows(
           L100.FAO_ag_an_ProducerPrice_R_C_Y %>%
             filter(region == "China") %>%
-            mutate(region = "Taiwan") %>%
-            mutate(GCAM_region_ID = c(GCAM_region_names %>%
+            mutate(region = "Taiwan",
+                   GCAM_region_ID = c(GCAM_region_names %>%
                                         filter(region == "Taiwan") %>%
                                         pull(GCAM_region_ID)))
         )
diff --git a/input/gcamdata/R/zchunk_LA101.ag_FAO_R_C_Y.R b/input/gcamdata/R/zaglu_L101.ag_FAO_R_C_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA101.ag_FAO_R_C_Y.R
rename to input/gcamdata/R/zaglu_L101.ag_FAO_R_C_Y.R
index 7dcf66b7b2..89597ed4d2 100644
--- a/input/gcamdata/R/zchunk_LA101.ag_FAO_R_C_Y.R
+++ b/input/gcamdata/R/zaglu_L101.ag_FAO_R_C_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA101.ag_FAO_R_C_Y
+#' module_aglu_L101.ag_FAO_R_C_Y
 #'
 #' Aggregate FAO food consumption, ag production, and harvested area
 #' data to GCAM regions and GCAM commodities.
@@ -23,7 +23,7 @@
 #' @importFrom dplyr anti_join arrange bind_rows distinct filter full_join if_else group_by inner_join left_join mutate right_join select summarise
 #' @importFrom tidyr complete drop_na replace_na
 #' @author KVC March 2017 (revised August 2018 by GPK); XZ 2022
-module_aglu_LA101.ag_FAO_R_C_Y <- function(command, ...) {
+module_aglu_L101.ag_FAO_R_C_Y <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R b/input/gcamdata/R/zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R
rename to input/gcamdata/R/zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R
index a1565c98b1..5a35017617 100644
--- a/input/gcamdata/R/zchunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R
+++ b/input/gcamdata/R/zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y
+#' module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y
 #'
 #' Build IMAGE Animal Production, Feed Consumption, and Input-Output Coefficients for each GCAM region and GCAM commodity in every year.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join mutate select summarise
 #' @importFrom tidyr replace_na
 #' @author ACS April 2017
-module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y <- function(command, ...) {
+module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L100.IMAGE_an_Prodmixfrac_ctry_C_Y",
@@ -31,7 +31,6 @@ module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y <- function(command, ...) {
     c("L107.an_Prod_Mt_R_C_Sys_Fd_Y",
       "L107.an_Feed_Mt_R_C_Sys_Fd_Y")
 
-
   if(command == driver.DECLARE_INPUTS) {
     return(MODULE_INPUTS)
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_LA108.ag_Feed_R_C_Y.R b/input/gcamdata/R/zaglu_L108.ag_Feed_R_C_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA108.ag_Feed_R_C_Y.R
rename to input/gcamdata/R/zaglu_L108.ag_Feed_R_C_Y.R
index 6f0491cdf1..e9c7f8b92a 100644
--- a/input/gcamdata/R/zchunk_LA108.ag_Feed_R_C_Y.R
+++ b/input/gcamdata/R/zaglu_L108.ag_Feed_R_C_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LA108.ag_Feed_R_C_Y
+#' module_aglu_L108.ag_Feed_R_C_Y
 #'
 #' Compute (1) feed by GCAM commodity, region, and year, and (2) net exports of FodderHerb.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate right_join select summarize
 #' @importFrom tidyr complete nesting replace_na
 #' @author KVC April 2017 XZ 2022
-module_aglu_LA108.ag_Feed_R_C_Y <- function(command, ...) {
+module_aglu_L108.ag_Feed_R_C_Y <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LB109.ag_an_ALL_R_C_Y.R b/input/gcamdata/R/zaglu_L109.ag_an_ALL_R_C_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB109.ag_an_ALL_R_C_Y.R
rename to input/gcamdata/R/zaglu_L109.ag_an_ALL_R_C_Y.R
index d6ad8cf558..fbe992b6ff 100644
--- a/input/gcamdata/R/zchunk_LB109.ag_an_ALL_R_C_Y.R
+++ b/input/gcamdata/R/zaglu_L109.ag_an_ALL_R_C_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB109.ag_an_ALL_R_C_Y
+#' module_aglu_L109.ag_an_ALL_R_C_Y
 #'
 #' Calculate primary agricultural good and animal product mass balances, by region / commodity / year.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate pull select summarise
 #' @importFrom tidyr gather spread
 #' @author RC April 2017 XZ 2022
-module_aglu_LB109.ag_an_ALL_R_C_Y <- function(command, ...) {
+module_aglu_L109.ag_an_ALL_R_C_Y <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L101.ag_Food_Mt_R_C_Y",
diff --git a/input/gcamdata/R/zchunk_LB110.For_FAO_R_Y.R b/input/gcamdata/R/zaglu_L110.For_FAO_R_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB110.For_FAO_R_Y.R
rename to input/gcamdata/R/zaglu_L110.For_FAO_R_Y.R
index 2ed74aa766..f3ac9ff147 100644
--- a/input/gcamdata/R/zchunk_LB110.For_FAO_R_Y.R
+++ b/input/gcamdata/R/zaglu_L110.For_FAO_R_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB110.For_FAO_R_Y
+#' module_aglu_L110.For_FAO_R_Y
 #'
 #' Build FAO forestry production, export, import, and consumption data for every GCAM region in each year.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter group_by mutate select summarise summarise_all
 #' @author MC and ACS March 2017
-module_aglu_LB110.For_FAO_R_Y <- function(command, ...) {
+module_aglu_L110.For_FAO_R_Y <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LB111.ag_resbio_R_C.R b/input/gcamdata/R/zaglu_L111.ag_resbio_R_C.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LB111.ag_resbio_R_C.R
rename to input/gcamdata/R/zaglu_L111.ag_resbio_R_C.R
index f1a6834ebf..837c463103 100644
--- a/input/gcamdata/R/zchunk_LB111.ag_resbio_R_C.R
+++ b/input/gcamdata/R/zaglu_L111.ag_resbio_R_C.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB111.ag_resbio_R_C
+#' module_aglu_L111.ag_resbio_R_C
 #'
 #' Calculate the production-weighted parameters of residue biomass by GCAM region and commodity.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr filter full_join group_by mutate select summarize_if
 #' @importFrom tidyr gather spread
 #' @author RC March 2017 XZ 2022
-module_aglu_LB111.ag_resbio_R_C <- function(command, ...) {
+module_aglu_L111.ag_resbio_R_C <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L100.FAO_ag_Prod_t",
diff --git a/input/gcamdata/R/zchunk_LB112.ag_prodchange_R_C_Y_GLU.R b/input/gcamdata/R/zaglu_L112.ag_prodchange_R_C_Y_GLU.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB112.ag_prodchange_R_C_Y_GLU.R
rename to input/gcamdata/R/zaglu_L112.ag_prodchange_R_C_Y_GLU.R
index 82f87e2989..5d12473ce9 100644
--- a/input/gcamdata/R/zchunk_LB112.ag_prodchange_R_C_Y_GLU.R
+++ b/input/gcamdata/R/zaglu_L112.ag_prodchange_R_C_Y_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB112.ag_prodchange_R_C_Y_GLU
+#' module_aglu_L112.ag_prodchange_R_C_Y_GLU
 #'
 #' Calculate yield change ratios and yield change rates by GCAM commodity / region / future years.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom dplyr anti_join bind_rows filter full_join if_else group_by left_join mutate pull select summarise
 #' @importFrom stats median
 #' @author RC April 2017
-module_aglu_LB112.ag_prodchange_R_C_Y_GLU <- function(command, ...) {
+module_aglu_L112.ag_prodchange_R_C_Y_GLU <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R b/input/gcamdata/R/zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R
rename to input/gcamdata/R/zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R
index 3dca353337..0c380080d3 100644
--- a/input/gcamdata/R/zchunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R
+++ b/input/gcamdata/R/zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU
+#' module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU
 #'
 #' Land cover by GCAM region / aggregate land type / historical year / GLU.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom tidyr complete nesting spread
 #' @importFrom stats quantile
 #' @author BBL April 2017
-module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU <- function(command, ...) {
+module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/LDS/LDS_land_types",
@@ -132,7 +132,10 @@ module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU <- function(command, ...) {
       ## Drop all rows with missing values (inland bodies of water)
       na.omit() %>%
       # moirai only outputs carbon values from unmanaged land. Therefore, we remove pastures, urbanland and cropland from the below. We continue to calculate the carbon values for these land types using the Houghton structure.
-      left_join_error_no_match(Various_CarbonData_LTsage %>%  filter(!LT_SAGE %in% c("Pasture","UrbanLand","Cropland")) %>% mutate(LT_SAGE = gsub(" ","",LT_SAGE)), by= c("LT_SAGE")) %>%
+      left_join_error_no_match(Various_CarbonData_LTsage %>%
+                                 filter(!LT_SAGE %in% c("Pasture","UrbanLand","Cropland")) %>%
+                                 mutate(LT_SAGE = gsub(" ","",LT_SAGE)), by= c("LT_SAGE")) %>%
+      rename(iso = iso) %>%
       mutate(`mature age` = if_else(is.na(`mature age`),1,`mature age`)) %>%
       complete(nesting(GCAM_region_ID, Land_Type, GLU,iso,land_code), year, fill = list(value = 0)) %>%
       complete(nesting(GCAM_region_ID, Land_Type, GLU,iso,land_code), year = unique(c(year, aglu.LAND_COVER_YEARS))) %>%
@@ -178,6 +181,7 @@ module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU <- function(command, ...) {
       na.omit() %>%
       # moirai only outputs carbon values from unmanaged land. Therefore, we remove pastures, urbanland and cropland from the below. We continue to calculate the carbon values for these land types using the Houghton structure.
       left_join_error_no_match(Various_CarbonData_LTsage %>%  filter(!LT_SAGE %in% c("Pasture","UrbanLand","Unmanaged")) %>% mutate(LT_SAGE = gsub(" ","",LT_SAGE)), by= c("LT_SAGE")) %>%
+      rename(iso = iso) %>%
       mutate(`mature age` = if_else(is.na(`mature age`),1,`mature age`)) %>%
       complete(nesting(GCAM_region_ID, Land_Type, GLU,iso,land_code), year, fill = list(value = 0)) %>%
       complete(nesting(GCAM_region_ID, Land_Type, GLU,iso,land_code), year = unique(c(year, aglu.LAND_COVER_YEARS))) %>%
@@ -201,8 +205,8 @@ module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU <- function(command, ...) {
     Land_for_Crop_carbon %>%
       left_join_keep_first_only(L120.LC_soil_veg_carbon_mean_LT_GLU_reg, by=c("GLU", "GCAM_region_ID", "Land_Type")) %>%
       mutate(soil_c = if_else(is.na(soil_c),aglu.DEFAULT_SOIL_CARBON_CROPLAND,soil_c),
-             veg_c = if_else(is.na(veg_c),aglu.DEFAULT_VEG_CARBON_CROPLAND,veg_c)) %>%
-      mutate(Land_Type = "Cropland") %>%
+             veg_c = if_else(is.na(veg_c),aglu.DEFAULT_VEG_CARBON_CROPLAND,veg_c),
+             Land_Type = "Cropland") %>%
       group_by(GCAM_region_ID, Land_Type, GLU) %>%
       #Note that soil and vegetation carbon units are in Mgc/ha. These are therefore converted to kg/m2 using CONV_THA_KGM2.
       #We compute a weighted average using land area as a weight.
diff --git a/input/gcamdata/R/zchunk_LB121.Carbon_LT.R b/input/gcamdata/R/zaglu_L121.Carbon_LT.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB121.Carbon_LT.R
rename to input/gcamdata/R/zaglu_L121.Carbon_LT.R
index 3b8d4a49c1..61919b821a 100644
--- a/input/gcamdata/R/zchunk_LB121.Carbon_LT.R
+++ b/input/gcamdata/R/zaglu_L121.Carbon_LT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB121.Carbon_LT
+#' module_aglu_L121.Carbon_LT
 #'
 #' Compute natural vegetation, managed land, and pasture carbon density, mature age, and yield.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr spread
 #' @importFrom stats weighted.mean
 #' @author BBL April 2017
-module_aglu_LB121.Carbon_LT <- function(command, ...) {
+module_aglu_L121.Carbon_LT <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/SAGE_LT",
diff --git a/input/gcamdata/R/zchunk_LB122.LC_R_Cropland_Yh_GLU.R b/input/gcamdata/R/zaglu_L122.LC_R_Cropland_Yh_GLU.R
similarity index 93%
rename from input/gcamdata/R/zchunk_LB122.LC_R_Cropland_Yh_GLU.R
rename to input/gcamdata/R/zaglu_L122.LC_R_Cropland_Yh_GLU.R
index a7816a51c1..e7f8e9ef86 100644
--- a/input/gcamdata/R/zchunk_LB122.LC_R_Cropland_Yh_GLU.R
+++ b/input/gcamdata/R/zaglu_L122.LC_R_Cropland_Yh_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB122.LC_R_Cropland_Yh_GLU
+#' module_aglu_L122.LC_R_Cropland_Yh_GLU
 #'
 #' Integrate disparate data sources for land cover and harvested area from FAO, Monfreda, and Hyde in
 #' order to calculate cropland cover by specific crop type, other arable land, harvested:cropped ratio, economic
@@ -28,7 +28,7 @@
 #' @importFrom dplyr anti_join arrange bind_rows distinct filter if_else group_by left_join mutate select summarise summarise_all
 #' @importFrom tidyr replace_na
 #' @author ACS April 2017
-module_aglu_LB122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
+module_aglu_L122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
@@ -175,21 +175,21 @@ module_aglu_LB122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
       # sort the ids:
       arrange(GCAM_region_ID) %>%
       # add a land type identifier for each region:
-      mutate(Land_Type = "Cropland") %>%
-      # join in fallow land table, L122.cropland_fallow_R, to get the fallow_frac for each region,
-      # maintaining NA's for use in determining data availability to calculate nonharvested_frac:
-      mutate(fallow_frac = left_join(., L122.cropland_fallow_R, by = "GCAM_region_ID")[['fallow_frac']]) %>%
-      # join in cropped land table, L122.cropland_cropped_R, to get the cropped_frac for each region, and
-      # use to calculate the uncropped fraction, maintaining NA's to set to 0 later:
-      mutate(uncropped_frac = 1 - left_join(., L122.cropland_cropped_R, by = "GCAM_region_ID")[['cropped_frac']]) %>%
-      # calculate the nonharvested fraction of land via nested if statements
-      #   based on availability, using (1) fallow land fraction, (2) land not in crop rotations, or (3) 0
-      #   This step determines (1) versus (2):
-      #                                  If there is no available fallow land data
-      mutate(nonharvested_frac = if_else(is.na(fallow_frac),
-                                         #                                  use the uncropped fraction
+      mutate(Land_Type = "Cropland",
+             # join in fallow land table, L122.cropland_fallow_R, to get the fallow_frac for each region,
+             # maintaining NA's for use in determining data availability to calculate nonharvested_frac:
+             fallow_frac = left_join(., L122.cropland_fallow_R, by = "GCAM_region_ID")[['fallow_frac']],
+             # join in cropped land table, L122.cropland_cropped_R, to get the cropped_frac for each region, and
+             # use to calculate the uncropped fraction, maintaining NA's to set to 0 later:
+             uncropped_frac = 1 - left_join(., L122.cropland_cropped_R, by = "GCAM_region_ID")[['cropped_frac']],
+             # calculate the nonharvested fraction of land via nested if statements
+             #   based on availability, using (1) fallow land fraction, (2) land not in crop rotations, or (3) 0
+             #   This step determines (1) versus (2):
+             #                           If there is no available fallow land data
+             nonharvested_frac = if_else(is.na(fallow_frac),
+                                         # use the uncropped fraction
                                          uncropped_frac,
-                                         #                                  otherwise, use the available fallow land data:
+                                         # otherwise, use the available fallow land data:
                                          fallow_frac)) %>%
       #   This step determines (3) when (1) and (2) are not available:
       replace_na(list(nonharvested_frac = 0)) ->
@@ -268,13 +268,13 @@ module_aglu_LB122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
       left_join_error_no_match(L122.LC_bm2_R_AvailableCropLand_Y_GLU %>%
                                  spread(Land_Type, value),
                                by = c("GCAM_region_ID", "GLU", "year")) %>%
-      mutate(Cropland_min = Annual / aglu.MAX_HA_TO_CROPLAND_Annual + Perennial) %>%
-      mutate(Cropland_min = if_else(
-        (GCAM_region_ID == 3 & GLU == "GLU087") | (GCAM_region_ID == 30 & GLU == "GLU078"),
-         Annual / aglu.MAX_HA_TO_CROPLAND_Annual_SpecialAdjust + Perennial, Cropland_min))  %>%
+      mutate(Cropland_min = Annual / aglu.MAX_HA_TO_CROPLAND_Annual + Perennial,
+             Cropland_min = if_else(
+                (GCAM_region_ID == 3 & GLU == "GLU087") | (GCAM_region_ID == 30 & GLU == "GLU078"),
+                Annual / aglu.MAX_HA_TO_CROPLAND_Annual_SpecialAdjust + Perennial, Cropland_min))  %>%
       # Update cropland
-      mutate(Cropland = pmax(Cropland_min, Cropland)) %>%
-      mutate(AnnualCropHarvestFrequency = Annual / (Cropland - Perennial),
+      mutate(Cropland = pmax(Cropland_min, Cropland),
+             AnnualCropHarvestFrequency = Annual / (Cropland - Perennial),
              AnnualCropHarvestFrequency = pmax(aglu.MIN_HA_TO_CROPLAND_Annual, AnnualCropHarvestFrequency)) ->
       L122.ag_HA_bm2_R_Y_GLU_AnnualCHF
 
@@ -293,11 +293,11 @@ module_aglu_LB122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
                                  select(GCAM_region_ID, GLU, year, CropHarvestFrequency = AnnualCropHarvestFrequency),
                                by = c("GCAM_region_ID", "GLU", "year") ) %>%
       # replace CropHarvestFrequency for Perennial with 1
-      mutate(CropHarvestFrequency = if_else(type == "Perennial", 1, CropHarvestFrequency)) %>%
-      # calculate the harvested cropland for each commodity as value = value.x/value.y:
-      mutate(value = value / CropHarvestFrequency) %>%
-      # add a Land_Type identifier:
-      mutate(Land_Type = "HarvCropLand") ->
+      mutate(CropHarvestFrequency = if_else(type == "Perennial", 1, CropHarvestFrequency),
+             # calculate the harvested cropland for each commodity as value = value.x/value.y:
+             value = value / CropHarvestFrequency,
+             # add a Land_Type identifier:
+             Land_Type = "HarvCropLand") ->
       # store in a table of Harvested Cropland by region-commodity-glu-year:
       L122.LC_bm2_R_HarvCropLand_C_Y_GLU
 
@@ -365,10 +365,11 @@ module_aglu_LB122.LC_R_Cropland_Yh_GLU <- function(command, ...) {
     # Take the residual cropland by region-glu-year:
     L122.LC_bm2_R_ResidualCropLand_Y_GLU %>%
       # update the Land_Type identifier
-      ungroup() %>% mutate(Land_Type = "UnusedCropLand") %>%
-      # positive residuals cannot be remapped to OtherArableLand. Therefore, they do not count as UnusedCropLand
-      # and region-glu-years with positive residual have 0 UnusedCropLand:
-      mutate(value = if_else(value > 0, 0, value),
+      ungroup() %>%
+      mutate(Land_Type = "UnusedCropLand",
+             # positive residuals cannot be remapped to OtherArableLand. Therefore, they do not count as UnusedCropLand
+             # and region-glu-years with positive residual have 0 UnusedCropLand:
+             value = if_else(value > 0, 0, value),
              # negative residuals ARE UnusedCropLand. -1 * the negative residual is the amount of UnusuedCropLand that
              # can be mapped to OtherArable Land. Calculate UnusedCropLand:
              value = -1 * value) ->
diff --git a/input/gcamdata/R/zchunk_LB123.LC_R_MgdPastFor_Yh_GLU.R b/input/gcamdata/R/zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB123.LC_R_MgdPastFor_Yh_GLU.R
rename to input/gcamdata/R/zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R
index 84fd7e94ca..b3eb3315af 100644
--- a/input/gcamdata/R/zchunk_LB123.LC_R_MgdPastFor_Yh_GLU.R
+++ b/input/gcamdata/R/zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU
+#' module_aglu_L123.LC_R_MgdPastFor_Yh_GLU
 #'
 #' Calculates pasture and forests production, yields and managed land cover by GCAM region / GLU / year.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join mutate right_join select summarise
 #' @importFrom tidyr replace_na
 #' @author RC August 2017
-module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU <- function(command, ...) {
+module_aglu_L123.LC_R_MgdPastFor_Yh_GLU <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L108.ag_Feed_Mt_R_C_Y",
              "L110.For_ALL_bm3_R_Y",
diff --git a/input/gcamdata/R/zchunk_LB124.LC_R_UnMgd_Yh_GLU.R b/input/gcamdata/R/zaglu_L124.LC_R_UnMgd_Yh_GLU.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB124.LC_R_UnMgd_Yh_GLU.R
rename to input/gcamdata/R/zaglu_L124.LC_R_UnMgd_Yh_GLU.R
index 222643df4e..ace2bdf79c 100644
--- a/input/gcamdata/R/zchunk_LB124.LC_R_UnMgd_Yh_GLU.R
+++ b/input/gcamdata/R/zaglu_L124.LC_R_UnMgd_Yh_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB124.LC_R_UnMgd_Yh_GLU
+#' module_aglu_L124.LC_R_UnMgd_Yh_GLU
 #'
 #' Adjust land cover data for unmanaged land types (shrub, grass, unmgd pasture, unmgd forest) in L120.LC_bm2_R_LT_Yh_GLU to deduct
 #' the extra cropland needs described in L122.LC_bm2_R_ExtraCropLand_Yh_GLU proportionally according to the relative share of each unmanaged
@@ -27,7 +27,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join mutate select summarise
 #' @importFrom tidyr replace_na
 #' @author ACS August 2017
-module_aglu_LB124.LC_R_UnMgd_Yh_GLU <- function(command, ...) {
+module_aglu_L124.LC_R_UnMgd_Yh_GLU <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L120.LC_bm2_R_LT_Yh_GLU",
               "L122.LC_bm2_R_ExtraCropLand_Yh_GLU",
diff --git a/input/gcamdata/R/zchunk_LB125.LC_tot.R b/input/gcamdata/R/zaglu_L125.LC_tot.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB125.LC_tot.R
rename to input/gcamdata/R/zaglu_L125.LC_tot.R
index 2b065f5afa..bc2eb7be70 100644
--- a/input/gcamdata/R/zchunk_LB125.LC_tot.R
+++ b/input/gcamdata/R/zaglu_L125.LC_tot.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB125.LC_tot
+#' module_aglu_L125.LC_tot
 #'
 #' Build Total Land Cover by GCAM region, and by GCAM region and GLU, and by GCAM region/GLU/year.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter group_by lag mutate select summarise
 #' @author MC May 2017
-module_aglu_LB125.LC_tot <- function(command, ...) {
+module_aglu_L125.LC_tot <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L120.LC_bm2_R_UrbanLand_Yh_GLU",
              "L120.LC_bm2_R_Tundra_Yh_GLU",
diff --git a/input/gcamdata/R/zchunk_LB131.LV_R_GLU.R b/input/gcamdata/R/zaglu_L131.LV_R_GLU.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LB131.LV_R_GLU.R
rename to input/gcamdata/R/zaglu_L131.LV_R_GLU.R
index d0357e30a6..e75589ffeb 100644
--- a/input/gcamdata/R/zchunk_LB131.LV_R_GLU.R
+++ b/input/gcamdata/R/zaglu_L131.LV_R_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB131.LV_R_GLU
+#' module_aglu_L131.LV_R_GLU
 #'
 #' Compute average value of land in $/m2
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter group_by left_join mutate select summarize
 #' @author KVC April 2017
-module_aglu_LB131.LV_R_GLU <- function(command, ...) {
+module_aglu_L131.LV_R_GLU <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LB141.ag_Fert_IFA_ctry_crop.R b/input/gcamdata/R/zaglu_L141.ag_Fert_IFA_ctry_crop.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB141.ag_Fert_IFA_ctry_crop.R
rename to input/gcamdata/R/zaglu_L141.ag_Fert_IFA_ctry_crop.R
index cbfbf8d1a5..b7c448dfbb 100644
--- a/input/gcamdata/R/zchunk_LB141.ag_Fert_IFA_ctry_crop.R
+++ b/input/gcamdata/R/zaglu_L141.ag_Fert_IFA_ctry_crop.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB141.ag_Fert_IFA_ctry_crop
+#' module_aglu_L141.ag_Fert_IFA_ctry_crop
 #'
 #' Reconcile disparate IFA fertilizer consumption data to calculate fertilizer consumption (demand) for each GTAP country/crop.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr distinct filter if_else group_by left_join mutate select summarise
 #' @importFrom tidyr gather drop_na replace_na
 #' @author ACS May 2017
-module_aglu_LB141.ag_Fert_IFA_ctry_crop <- function(command, ...) {
+module_aglu_L141.ag_Fert_IFA_ctry_crop <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/FAO/FAO_ag_items_PRODSTAT",
diff --git a/input/gcamdata/R/zchunk_LB142.ag_Fert_IO_R_C_Y_GLU.R b/input/gcamdata/R/zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB142.ag_Fert_IO_R_C_Y_GLU.R
rename to input/gcamdata/R/zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R
index fc3bf0c5b1..137cbedb94 100644
--- a/input/gcamdata/R/zchunk_LB142.ag_Fert_IO_R_C_Y_GLU.R
+++ b/input/gcamdata/R/zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU
+#' module_aglu_L142.ag_Fert_IO_R_C_Y_GLU
 #'
 #' Calculate the adjusted fertilizer production by country / year, fertilizer net exports by GCAM region / year,
 #' and fertilizer input-output coefficients by GCAM region / commodity / year / GLU.
@@ -18,7 +18,7 @@
 #' @importFrom dplyr filter full_join group_by left_join mutate right_join select semi_join summarise
 #' @importFrom tidyr complete replace_na
 #' @author RC June 2017
-module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU <- function(command, ...) {
+module_aglu_L142.ag_Fert_IO_R_C_Y_GLU <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R b/input/gcamdata/R/zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R
rename to input/gcamdata/R/zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R
index 357668d408..d9b2e36a7b 100644
--- a/input/gcamdata/R/zchunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr
+#' module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr
 #'
 #' Separates country and harvested area into irrigated and rainfed by country, GLU, and GTAP_crop.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom tidyr replace_na
 #' @author KVC April 2017
 #' @export
-module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr <- function(command, ...) {
+module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "aglu/AGLU_ctry",
              FILE = "aglu/FAO/FAO_ag_items_PRODSTAT",
diff --git a/input/gcamdata/R/zchunk_LB152.ag_GTAP_R_C_GLU_irr.R b/input/gcamdata/R/zaglu_L152.ag_GTAP_R_C_GLU_irr.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB152.ag_GTAP_R_C_GLU_irr.R
rename to input/gcamdata/R/zaglu_L152.ag_GTAP_R_C_GLU_irr.R
index 981a543e4f..21da57ac1a 100644
--- a/input/gcamdata/R/zchunk_LB152.ag_GTAP_R_C_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L152.ag_GTAP_R_C_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB152.ag_GTAP_R_C_GLU_irr
+#' module_aglu_L152.ag_GTAP_R_C_GLU_irr
 #'
 #' Aggregate the irrigated/rainfed harvest area and production data by GCAM region / commodity / GLU.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr group_by left_join mutate select summarise
 #' @author RC May 2017
-module_aglu_LB152.ag_GTAP_R_C_GLU_irr <- function(command, ...) {
+module_aglu_L152.ag_GTAP_R_C_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/FAO/FAO_ag_items_PRODSTAT",
diff --git a/input/gcamdata/R/zchunk_LB161.ag_R_C_Y_GLU_irr.R b/input/gcamdata/R/zaglu_L161.ag_R_C_Y_GLU_irr.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB161.ag_R_C_Y_GLU_irr.R
rename to input/gcamdata/R/zaglu_L161.ag_R_C_Y_GLU_irr.R
index 68cfc3f7d4..412191f7d3 100644
--- a/input/gcamdata/R/zchunk_LB161.ag_R_C_Y_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L161.ag_R_C_Y_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB161.ag_R_C_Y_GLU_irr
+#' module_aglu_L161.ag_R_C_Y_GLU_irr
 #'
 #' Calculates irrigated and rainfed agriculture production, harvested area and yields by GCAM region / commodity / GLU / year.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom dplyr if_else left_join mutate right_join select
 #' @importFrom tidyr replace_na
 #' @author RC August 2017
-module_aglu_LB161.ag_R_C_Y_GLU_irr <- function(command, ...) {
+module_aglu_L161.ag_R_C_Y_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L101.ag_Prod_Mt_R_C_Y_GLU",
              "L101.ag_HA_bm2_R_C_Y_GLU",
diff --git a/input/gcamdata/R/zchunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R b/input/gcamdata/R/zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R
rename to input/gcamdata/R/zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R
index 72c479e20c..20bfeffb47 100644
--- a/input/gcamdata/R/zchunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr
+#' module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr
 #'
 #' This module calculates the first level production/yield change assumptions that are exogenous to GCAM. These rates are calculated for each commodity
 #' at the region-glu-irrigation level in each model year, including the calibration year.
@@ -21,7 +21,7 @@
 #' @importFrom tidyr complete nesting
 #' @importFrom tibble tibble
 #' @author ACS June 2017
-module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr <- function(command, ...) {
+module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/A_defaultYieldRate",
diff --git a/input/gcamdata/R/zchunk_LB163.bio_Yield_R_GLU_irr.R b/input/gcamdata/R/zaglu_L163.bio_Yield_R_GLU_irr.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB163.bio_Yield_R_GLU_irr.R
rename to input/gcamdata/R/zaglu_L163.bio_Yield_R_GLU_irr.R
index b92e0b6b4e..c68990f722 100644
--- a/input/gcamdata/R/zchunk_LB163.bio_Yield_R_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L163.bio_Yield_R_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB163.bio_Yield_R_GLU_irr
+#' module_aglu_L163.bio_Yield_R_GLU_irr
 #'
 #' Compute base year generic, rainfed, and irrigated bioenergy crop yields for each GCAM region and GLU.
 #'
@@ -20,7 +20,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter group_by left_join mutate pull select summarise
 #' @author ACS June 2017
-module_aglu_LB163.bio_Yield_R_GLU_irr <- function(command, ...) {
+module_aglu_L163.bio_Yield_R_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              "L100.LDS_ag_HA_ha",
diff --git a/input/gcamdata/R/zchunk_LB165.ag_water_R_C_Y_GLU_irr.R b/input/gcamdata/R/zaglu_L165.ag_water_R_C_Y_GLU_irr.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB165.ag_water_R_C_Y_GLU_irr.R
rename to input/gcamdata/R/zaglu_L165.ag_water_R_C_Y_GLU_irr.R
index c32b953403..30041819e9 100644
--- a/input/gcamdata/R/zchunk_LB165.ag_water_R_C_Y_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L165.ag_water_R_C_Y_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB165.ag_water_R_C_Y_GLU_irr
+#' module_aglu_L165.ag_water_R_C_Y_GLU_irr
 #'
 #' Compute irrigation efficiency (by GCAM region) and blue, green, and total consumption coefficients (by region, commodity, and GLU).
 #'
@@ -22,7 +22,7 @@
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate right_join select summarise summarise_at vars
 #' @importFrom tidyr gather replace_na spread
 #' @author BBL April 2017
-module_aglu_LB165.ag_water_R_C_Y_GLU_irr <- function(command, ...) {
+module_aglu_L165.ag_water_R_C_Y_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/FAO/FAO_ag_items_PRODSTAT",
diff --git a/input/gcamdata/R/zchunk_LB171.LC_R_Cropland_Yh_GLU_irr.R b/input/gcamdata/R/zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB171.LC_R_Cropland_Yh_GLU_irr.R
rename to input/gcamdata/R/zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R
index 39efe722f0..ae47b14066 100644
--- a/input/gcamdata/R/zchunk_LB171.LC_R_Cropland_Yh_GLU_irr.R
+++ b/input/gcamdata/R/zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr
+#' module_aglu_L171.LC_R_Cropland_Yh_GLU_irr
 #'
 #' Calculate irrigated/rainfed harvested cropland cover and economic yields by GCAM region / commodity / year / GLU.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter full_join if_else group_by left_join mutate select
 #' @importFrom tidyr nesting
 #' @author RC May 2017
-module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr <- function(command, ...) {
+module_aglu_L171.LC_R_Cropland_Yh_GLU_irr <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L122.LC_bm2_R_HarvCropLand_C_Yh_GLU",
               "L161.ag_irrProd_Mt_R_C_Y_GLU",
diff --git a/input/gcamdata/R/zchunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R b/input/gcamdata/R/zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R
index d3dea07547..cda4e19af5 100644
--- a/input/gcamdata/R/zchunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R
+++ b/input/gcamdata/R/zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt
+#' module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt
 #'
 #' Calculates the economic yields, cropland cover and production by GCAM region / commodity / year / GLU / irrigation / mgmt level.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr bind_rows filter left_join mutate select
 #' @importFrom tidyr gather
 #' @author RC May 2017
-module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt <- function(command, ...) {
+module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L171.LC_bm2_R_rfdHarvCropLand_C_Yh_GLU",
              "L171.LC_bm2_R_irrHarvCropLand_C_Yh_GLU",
diff --git a/input/gcamdata/R/zchunk_L2012.ag_For_Past_bio_input_irr_mgmt.R b/input/gcamdata/R/zaglu_L2012.ag_For_Past_bio_input_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2012.ag_For_Past_bio_input_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2012.ag_For_Past_bio_input_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L202.an_input.R b/input/gcamdata/R/zaglu_L202.an_input.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L202.an_input.R
rename to input/gcamdata/R/zaglu_L202.an_input.R
diff --git a/input/gcamdata/R/zchunk_L203.ag_an_demand_input.R b/input/gcamdata/R/zaglu_L203.ag_an_demand_input.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L203.ag_an_demand_input.R
rename to input/gcamdata/R/zaglu_L203.ag_an_demand_input.R
diff --git a/input/gcamdata/R/zchunk_L2042.resbio_input_irr_mgmt.R b/input/gcamdata/R/zaglu_L2042.resbio_input_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2042.resbio_input_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2042.resbio_input_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L2052.ag_prodchange_cost_irr_mgmt.R b/input/gcamdata/R/zaglu_L2052.ag_prodchange_cost_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2052.ag_prodchange_cost_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2052.ag_prodchange_cost_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L2062.ag_Fert_irr_mgmt.R b/input/gcamdata/R/zaglu_L2062.ag_Fert_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2062.ag_Fert_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2062.ag_Fert_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L2072.ag_water_irr_mgmt.R b/input/gcamdata/R/zaglu_L2072.ag_water_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2072.ag_water_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2072.ag_water_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L221.land_input_1.R b/input/gcamdata/R/zaglu_L221.land_input_1.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L221.land_input_1.R
rename to input/gcamdata/R/zaglu_L221.land_input_1.R
diff --git a/input/gcamdata/R/zchunk_L222.land_input_2.R b/input/gcamdata/R/zaglu_L222.land_input_2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L222.land_input_2.R
rename to input/gcamdata/R/zaglu_L222.land_input_2.R
diff --git a/input/gcamdata/R/zchunk_L2231.land_input_3_irr.R b/input/gcamdata/R/zaglu_L2231.land_input_3_irr.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2231.land_input_3_irr.R
rename to input/gcamdata/R/zaglu_L2231.land_input_3_irr.R
diff --git a/input/gcamdata/R/zchunk_L2242.land_input_4_irr_mgmt.R b/input/gcamdata/R/zaglu_L2242.land_input_4_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2242.land_input_4_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2242.land_input_4_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L2252.land_input_5_irr_mgmt.R b/input/gcamdata/R/zaglu_L2252.land_input_5_irr_mgmt.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2252.land_input_5_irr_mgmt.R
rename to input/gcamdata/R/zaglu_L2252.land_input_5_irr_mgmt.R
diff --git a/input/gcamdata/R/zchunk_L240.ag_trade.R b/input/gcamdata/R/zaglu_L240.ag_trade.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L240.ag_trade.R
rename to input/gcamdata/R/zaglu_L240.ag_trade.R
diff --git a/input/gcamdata/R/zchunk_L242.ssp34_pasture.R b/input/gcamdata/R/zaglu_L242.ssp34_pasture.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L242.ssp34_pasture.R
rename to input/gcamdata/R/zaglu_L242.ssp34_pasture.R
diff --git a/input/gcamdata/R/zchunk_L243.bio_trade_input.R b/input/gcamdata/R/zaglu_L243.bio_trade_input.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L243.bio_trade_input.R
rename to input/gcamdata/R/zaglu_L243.bio_trade_input.R
diff --git a/input/gcamdata/R/zchunk_batch_ag_Fert_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_Fert_IRR_MGMT.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ag_Fert_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_Fert_IRR_MGMT.R
index 30a8cac8e8..0ad085cfea 100644
--- a/input/gcamdata/R/zchunk_batch_ag_Fert_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_Fert_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_Fert_IRR_MGMT_xml
+#' module_aglu_ag_Fert_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_Fert_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_Fert_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_Fert_IRR_MGMT.xml} (aglu XML).
-module_aglu_batch_ag_Fert_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_Fert_IRR_MGMT_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L2062.AgCoef_Fert_ag_irr_mgmt",
diff --git a/input/gcamdata/R/zchunk_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_For_Past_bio_base_IRR_MGMT.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_For_Past_bio_base_IRR_MGMT.R
index d4ba524d60..ce3e3a1178 100644
--- a/input/gcamdata/R/zchunk_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_For_Past_bio_base_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml
+#' module_aglu_ag_For_Past_bio_base_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_For_Past_bio_base_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_For_Past_bio_base_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_For_Past_bio_base_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_For_Past_bio_base_IRR_MGMT_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L2012.AgSupplySector",
diff --git a/input/gcamdata/R/zchunk_batch_ag_an_demand_input_xml.R b/input/gcamdata/R/zaglu_xml_ag_an_demand_input.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_ag_an_demand_input_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_an_demand_input.R
index 8460406aaa..43149de6e9 100644
--- a/input/gcamdata/R/zchunk_batch_ag_an_demand_input_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_an_demand_input.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_an_demand_input_xml
+#' module_aglu_ag_an_demand_input_xml
 #'
 #' Construct XML data structure for \code{ag_an_demand_input.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_an_demand_input.xml}. The corresponding file in the
 #' original data system was \code{batch_demand_input_xml.R} (aglu XML).
-module_aglu_batch_ag_an_demand_input_xml <- function(command, ...) {
+module_aglu_ag_an_demand_input_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L203.Supplysector_demand",
diff --git a/input/gcamdata/R/zchunk_batch_ag_cost_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_cost_IRR_MGMT.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_ag_cost_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_cost_IRR_MGMT.R
index 020e688cb2..1024bca01c 100644
--- a/input/gcamdata/R/zchunk_batch_ag_cost_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_cost_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_cost_IRR_MGMT_xml
+#' module_aglu_ag_cost_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_cost_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_cost_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_cost_IRR_MGMT_xml.R} (aglu XML).
-module_aglu_batch_ag_cost_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_cost_IRR_MGMT_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L2062.AgCost_ag_irr_mgmt_adj",
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ref_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ref_IRR_MGMT.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ref_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ref_IRR_MGMT.R
index 5c702e0608..f03729eded 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ref_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ref_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ref_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ref_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ref_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ref_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ref_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_ag_irr_ref",
               "L2052.AgProdChange_bio_irr_ref"))
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp1_IRR_MGMT.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ssp1_IRR_MGMT.R
index 67727218b8..d59ef5d95e 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp1_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ssp1_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ssp1_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ssp1_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ssp1_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ssp1_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_irr_high"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp2_IRR_MGMT.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ssp2_IRR_MGMT.R
index 313bf38e02..43a30f6cac 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp2_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ssp2_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ssp2_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ssp2_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ssp2_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ssp2_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_ag_irr_ref"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp3_IRR_MGMT.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ssp3_IRR_MGMT.R
index b6693b5b5a..0bee8228fe 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp3_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ssp3_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ssp3_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ssp3_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ssp3_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ssp3_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_irr_low"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp4_IRR_MGMT.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ssp4_IRR_MGMT.R
index 73f927a9bb..a1bb15388e 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp4_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ssp4_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ssp4_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ssp4_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ssp4_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ssp4_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_irr_ssp4"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp5_IRR_MGMT.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_prodchange_ssp5_IRR_MGMT.R
index e612d061de..f4f14dfb38 100644
--- a/input/gcamdata/R/zchunk_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_prodchange_ssp5_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml
+#' module_aglu_ag_prodchange_ssp5_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_prodchange_ssp5_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_prodchange_ssp5_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_prodchange_ssp5_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_prodchange_ssp5_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2052.AgProdChange_irr_high"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ag_trade_xml.R b/input/gcamdata/R/zaglu_xml_ag_trade.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_ag_trade_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_trade.R
index 5aded00847..d8740bc520 100644
--- a/input/gcamdata/R/zchunk_batch_ag_trade_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_trade_xml
+#' module_aglu_ag_trade_xml
 #'
 #' Construct XML data structure for \code{ag_trade.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_trade.xml}.
-module_aglu_batch_ag_trade_xml <- function(command, ...) {
+module_aglu_ag_trade_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L240.Supplysector_tra",
diff --git a/input/gcamdata/R/zchunk_batch_ag_water_input_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_ag_water_input_IRR_MGMT.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_ag_water_input_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_ag_water_input_IRR_MGMT.R
index aa4f470246..e148866b82 100644
--- a/input/gcamdata/R/zchunk_batch_ag_water_input_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ag_water_input_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ag_water_input_IRR_MGMT_xml
+#' module_aglu_ag_water_input_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{ag_water_input_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ag_water_input_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_ag_water_input_IRR_MGMT_xml.R} (aglu XML).
-module_aglu_batch_ag_water_input_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_ag_water_input_IRR_MGMT_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L2072.AgCoef_IrrBphysWater_ag_mgmt",
diff --git a/input/gcamdata/R/zchunk_batch_an_input_xml.R b/input/gcamdata/R/zaglu_xml_an_input.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_an_input_xml.R
rename to input/gcamdata/R/zaglu_xml_an_input.R
index 558976920e..0886cf6bd4 100644
--- a/input/gcamdata/R/zchunk_batch_an_input_xml.R
+++ b/input/gcamdata/R/zaglu_xml_an_input.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_an_input_xml
+#' module_aglu_an_input_xml
 #'
 #' Construct XML data structure for \code{an_input.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{an_input.xml}. The corresponding file in the
 #' original data system was \code{batch_an_input.xml.R} (aglu XML).
-module_aglu_batch_an_input_xml <- function(command, ...) {
+module_aglu_an_input_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L202.RenewRsrc",
diff --git a/input/gcamdata/R/zchunk_batch_bio_trade_xml.R b/input/gcamdata/R/zaglu_xml_bio_trade.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_bio_trade_xml.R
rename to input/gcamdata/R/zaglu_xml_bio_trade.R
index 5c2d0be471..ca2b4bb4e6 100644
--- a/input/gcamdata/R/zchunk_batch_bio_trade_xml.R
+++ b/input/gcamdata/R/zaglu_xml_bio_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_bio_trade_xml
+#' module_aglu_bio_trade_xml
 #'
 #' Construct XML data structure for \code{bio_trade.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{bio_trade.xml}. The corresponding file in the
 #' original data system was \code{batch_bio_trade.xml.R} (aglu XML).
-module_aglu_batch_bio_trade_xml <- function(command, ...) {
+module_aglu_bio_trade_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L243.DeleteInput_RegBio",
              "L243.TechCoef_RegBio",
diff --git a/input/gcamdata/R/zchunk_batch_food_SSP1_xml.R b/input/gcamdata/R/zaglu_xml_food_SSP1.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_food_SSP1_xml.R
rename to input/gcamdata/R/zaglu_xml_food_SSP1.R
index 9ac62b0494..cbf686f789 100644
--- a/input/gcamdata/R/zchunk_batch_food_SSP1_xml.R
+++ b/input/gcamdata/R/zaglu_xml_food_SSP1.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_food_SSP1_xml
+#' module_aglu_food_SSP1_xml
 #'
 #' Construct XML data structure for \code{food_SSP1.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{food_SSP1.xml}. The corresponding file in the
 #' original data system was \code{batch_food_SSP1_xml.R} (aglu XML).
-module_aglu_batch_food_SSP1_xml <- function(command, ...) {
+module_aglu_food_SSP1_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L203.FuelPrefElast_ssp1"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_land_input_1_xml.R b/input/gcamdata/R/zaglu_xml_land_input_1.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_land_input_1_xml.R
rename to input/gcamdata/R/zaglu_xml_land_input_1.R
index ef5dcd4981..1f7e96fe8b 100644
--- a/input/gcamdata/R/zchunk_batch_land_input_1_xml.R
+++ b/input/gcamdata/R/zaglu_xml_land_input_1.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_land_input_1_xml
+#' module_aglu_land_input_1_xml
 #'
 #' Construct XML data structure for \code{land_input_1.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{land_input_1.xml}. The corresponding file in the
 #' original data system was \code{batch_land_input_1.xml.R} (aglu XML).
-module_aglu_batch_land_input_1_xml <- function(command, ...) {
+module_aglu_land_input_1_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L221.LN0_Logit",
               "L221.LN0_Land",
diff --git a/input/gcamdata/R/zchunk_batch_land_input_2_xml.R b/input/gcamdata/R/zaglu_xml_land_input_2.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_land_input_2_xml.R
rename to input/gcamdata/R/zaglu_xml_land_input_2.R
index 7eba66a3f9..2b716a4b9f 100644
--- a/input/gcamdata/R/zchunk_batch_land_input_2_xml.R
+++ b/input/gcamdata/R/zaglu_xml_land_input_2.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_land_input_2_xml
+#' module_aglu_land_input_2_xml
 #'
 #' Construct XML data structure for \code{land_input_2.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{land_input_2.xml}. The corresponding file in the
 #' original data system was \code{batch_land_input_2.xml.R} (aglu XML).
-module_aglu_batch_land_input_2_xml <- function(command, ...) {
+module_aglu_land_input_2_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L222.LN2_Logit",
               "L222.LN2_HistUnmgdAllocation",
diff --git a/input/gcamdata/R/zchunk_batch_land_input_3_IRR_xml.R b/input/gcamdata/R/zaglu_xml_land_input_3_IRR.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_land_input_3_IRR_xml.R
rename to input/gcamdata/R/zaglu_xml_land_input_3_IRR.R
index b5185230f4..703eaf80dc 100644
--- a/input/gcamdata/R/zchunk_batch_land_input_3_IRR_xml.R
+++ b/input/gcamdata/R/zaglu_xml_land_input_3_IRR.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_land_input_3_IRR_xml
+#' module_aglu_land_input_3_IRR_xml
 #'
 #' Construct XML data structure for \code{land_input_3_IRR.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{land_input_3_IRR.xml}. The corresponding file in the
 #' original data system was \code{batch_land_input_3_IRR.xml.R} (aglu XML).
-module_aglu_batch_land_input_3_IRR_xml <- function(command, ...) {
+module_aglu_land_input_3_IRR_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2231.LN3_Logit",
               "L2231.LN3_HistUnmgdAllocation",
diff --git a/input/gcamdata/R/zchunk_batch_land_input_4_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_land_input_4_IRR_MGMT.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_land_input_4_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_land_input_4_IRR_MGMT.R
index 9a34b07dc1..8d971b812e 100644
--- a/input/gcamdata/R/zchunk_batch_land_input_4_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_land_input_4_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_land_input_4_IRR_MGMT_xml
+#' module_aglu_land_input_4_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{land_input_4_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{land_input_4_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_land_input_4_IRR_MGMT.xml.R} (aglu XML).
-module_aglu_batch_land_input_4_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_land_input_4_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2242.LN4_Logit",
              "L2242.LN4_NodeGhostShare",
diff --git a/input/gcamdata/R/zchunk_batch_land_input_5_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_land_input_5_IRR_MGMT.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_land_input_5_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_land_input_5_IRR_MGMT.R
index 9d2fa24fd8..a1f87bafa6 100644
--- a/input/gcamdata/R/zchunk_batch_land_input_5_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_land_input_5_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_land_input_5_IRR_MGMT_xml
+#' module_aglu_land_input_5_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{land_input_5_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{land_input_5_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_land_input_5_IRR_MGMT_xml.R} (aglu XML).
-module_aglu_batch_land_input_5_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_land_input_5_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2252.LN5_Logit",
              "L2252.LN5_HistMgdAllocation_crop",
diff --git a/input/gcamdata/R/zchunk_batch_pasture_ssp34_xml.R b/input/gcamdata/R/zaglu_xml_pasture_ssp34.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_pasture_ssp34_xml.R
rename to input/gcamdata/R/zaglu_xml_pasture_ssp34.R
index a4633021ec..a171093161 100644
--- a/input/gcamdata/R/zchunk_batch_pasture_ssp34_xml.R
+++ b/input/gcamdata/R/zaglu_xml_pasture_ssp34.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_pasture_ssp34_xml
+#' module_aglu_pasture_ssp34_xml
 #'
 #' Construct XML data structure for \code{pasture_ssp34.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{pasture_ssp34.xml}. The corresponding file in the
 #' original data system was \code{batch_pasture_ssp34.xml.R} (aglu XML).
-module_aglu_batch_pasture_ssp34_xml <- function(command, ...) {
+module_aglu_pasture_ssp34_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L242.LN2_HistUnmgdAllocation_SSP34",
               "L242.LN2_UnmgdAllocation_SSP34",
diff --git a/input/gcamdata/R/zchunk_batch_protected_land_input_2_xml.R b/input/gcamdata/R/zaglu_xml_protected_land_input_2.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_protected_land_input_2_xml.R
rename to input/gcamdata/R/zaglu_xml_protected_land_input_2.R
index 2def54f6e5..5c9d15f45b 100644
--- a/input/gcamdata/R/zchunk_batch_protected_land_input_2_xml.R
+++ b/input/gcamdata/R/zaglu_xml_protected_land_input_2.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_protected_land_input_2_xml
+#' module_aglu_protected_land_input_2_xml
 #'
 #' Construct XML data structure for \code{protected_land_input_2.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{protected_land_input_2.xml}. The corresponding file in the
 #' original data system was \code{batch_protected_land_input_2.xml.R} (aglu XML).
-module_aglu_batch_protected_land_input_2_xml <- function(command, ...) {
+module_aglu_protected_land_input_2_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L222.LN2_HistUnmgdAllocation_noprot",
               "L222.LN2_UnmgdAllocation_noprot",
diff --git a/input/gcamdata/R/zchunk_batch_protected_land_input_3_xml.R b/input/gcamdata/R/zaglu_xml_protected_land_input_3.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_protected_land_input_3_xml.R
rename to input/gcamdata/R/zaglu_xml_protected_land_input_3.R
index e9db5a2fab..36df5273c5 100644
--- a/input/gcamdata/R/zchunk_batch_protected_land_input_3_xml.R
+++ b/input/gcamdata/R/zaglu_xml_protected_land_input_3.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_protected_land_input_3_xml
+#' module_aglu_protected_land_input_3_xml
 #'
 #' Construct XML data structure for \code{protected_land_input_3.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{protected_land_input_3.xml}. The corresponding file in the
 #' original data system was \code{batch_protected_land_input_3.xml.R} (aglu XML).
-module_aglu_batch_protected_land_input_3_xml <- function(command, ...) {
+module_aglu_protected_land_input_3_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2231.LN1_Logit_prot",
               "L2231.LN3_HistUnmgdAllocation_noprot",
diff --git a/input/gcamdata/R/zchunk_batch_resbio_input_IRR_MGMT_xml.R b/input/gcamdata/R/zaglu_xml_resbio_input_IRR_MGMT.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_resbio_input_IRR_MGMT_xml.R
rename to input/gcamdata/R/zaglu_xml_resbio_input_IRR_MGMT.R
index aa29471002..59c71f2465 100644
--- a/input/gcamdata/R/zchunk_batch_resbio_input_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zaglu_xml_resbio_input_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_resbio_input_IRR_MGMT_xml
+#' module_aglu_resbio_input_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{resbio_input_IRR_MGMT.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{resbio_input_IRR_MGMT.xml}. The corresponding file in the
 #' original data system was \code{batch_resbio_input_IRR_MGMT_xml.R} (aglu XML).
-module_aglu_batch_resbio_input_IRR_MGMT_xml <- function(command, ...) {
+module_aglu_resbio_input_IRR_MGMT_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2042.AgResBio_For",
               "L2042.AgResBioCurve_For",
diff --git a/input/gcamdata/R/zchunk_batch_ssp3_bio_trade_xml.R b/input/gcamdata/R/zaglu_xml_ssp3_bio_trade.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ssp3_bio_trade_xml.R
rename to input/gcamdata/R/zaglu_xml_ssp3_bio_trade.R
index 478a494428..198879b370 100644
--- a/input/gcamdata/R/zchunk_batch_ssp3_bio_trade_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ssp3_bio_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ssp3_bio_trade_xml
+#' module_aglu_ssp3_bio_trade_xml
 #'
 #' Construct XML data structure for \code{ssp3_bio_trade.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ssp3_bio_trade.xml}. The corresponding file in the
 #' original data system was \code{batch_ssp3_bio_trade.xml.R} (aglu XML).
-module_aglu_batch_ssp3_bio_trade_xml <- function(command, ...) {
+module_aglu_ssp3_bio_trade_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L243.SubsectorShrwt_TotBio_SSP3",
              "L243.StubTechShrwt_TotBio_SSP3"))
diff --git a/input/gcamdata/R/zchunk_batch_ssp4_ag_bio_trade_xml.R b/input/gcamdata/R/zaglu_xml_ssp4_ag_bio_trade.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_ssp4_ag_bio_trade_xml.R
rename to input/gcamdata/R/zaglu_xml_ssp4_ag_bio_trade.R
index bd9b4bd777..93e0a723a5 100644
--- a/input/gcamdata/R/zchunk_batch_ssp4_ag_bio_trade_xml.R
+++ b/input/gcamdata/R/zaglu_xml_ssp4_ag_bio_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_batch_ssp4_bio_trade_xml
+#' module_aglu_ssp4_bio_trade_xml
 #'
 #' Construct XML data structure for \code{ssp4_ag_bio_trade.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ssp4_ag_bio_trade.xml}. The corresponding file in the
 #' original data system was \code{batch_ssp4_ag_bio_trade.xml.R} (aglu XML).
-module_aglu_batch_ssp4_ag_bio_trade_xml <- function(command, ...) {
+module_aglu_ssp4_ag_bio_trade_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L243.SubsectorShrwt_TotBio_SSP4",
              "L243.SubsectorShrwtFllt_TradedBio_SSP4",
diff --git a/input/gcamdata/R/zchunk_batch_hector_xml.R b/input/gcamdata/R/zclimate_xml_hector.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_hector_xml.R
rename to input/gcamdata/R/zclimate_xml_hector.R
index aaecae5543..8ce8d8ef94 100644
--- a/input/gcamdata/R/zchunk_batch_hector_xml.R
+++ b/input/gcamdata/R/zclimate_xml_hector.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_climate_xml_batch_hector_xml
+#' module_climate_xml_hector_xml
 #'
 #' Construct XML data structure for \code{hector.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{hector.xml}. The corresponding file in the
 #' original data system was \code{batch_hector.xml.R} (climate_xml XML).
-module_climate_xml_batch_hector_xml <- function(command, ...) {
+module_climate_xml_hector_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L200.hector"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_magicc_xml.R b/input/gcamdata/R/zclimate_xml_magicc.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_magicc_xml.R
rename to input/gcamdata/R/zclimate_xml_magicc.R
index 8190e636b5..c181557fb6 100644
--- a/input/gcamdata/R/zchunk_batch_magicc_xml.R
+++ b/input/gcamdata/R/zclimate_xml_magicc.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_climate_xml_batch_magicc_xml
+#' module_climate_xml_magicc_xml
 #'
 #' Construct XML data structure for \code{magicc.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{magicc.xml}. The corresponding file in the
 #' original data system was \code{batch_magicc.xml.R} (climate_xml XML).
-module_climate_xml_batch_magicc_xml <- function(command, ...) {
+module_climate_xml_magicc_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L200.MAGICC"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_no_climate_model_xml.R b/input/gcamdata/R/zclimate_xml_no_climate_model.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_no_climate_model_xml.R
rename to input/gcamdata/R/zclimate_xml_no_climate_model.R
index dfccea55c4..5f4d079ccc 100644
--- a/input/gcamdata/R/zchunk_batch_no_climate_model_xml.R
+++ b/input/gcamdata/R/zclimate_xml_no_climate_model.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_batch_no_climate_model_xml
+#' module_climate_no_climate_model_xml
 #'
 #' Construct XML data structure for \code{no_climate_model.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{no_climate_model.xml}, \code{disable_climate_model.xml}.
-module_batch_no_climate_model_xml <- function(command, ...) {
+module_climate_no_climate_model_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c())
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_L102.nonco2_ceds_R_S_Y.R b/input/gcamdata/R/zemissions_L102.nonco2_ceds_R_S_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L102.nonco2_ceds_R_S_Y.R
rename to input/gcamdata/R/zemissions_L102.nonco2_ceds_R_S_Y.R
index 0f7af49659..c2457b67c4 100644
--- a/input/gcamdata/R/zchunk_L102.nonco2_ceds_R_S_Y.R
+++ b/input/gcamdata/R/zemissions_L102.nonco2_ceds_R_S_Y.R
@@ -172,7 +172,7 @@ module_emissions_L102.nonco2_ceds_R_S_Y <- function(command, ...) {
 
         # Filter for iso's whose emissions will be scaled to CEDS (currently just USA)
         L102.CEDS %>%
-          filter(iso %in% emissions.CEDS_scale) -> L102.CEDS_to_scale
+          filter(iso %in% emissions.CEDS_SCALE) -> L102.CEDS_to_scale
 
 
         # Aggregate by region, GHG, and CEDS sector
diff --git a/input/gcamdata/R/zchunk_L112.ceds_ghg_en_R_S_T_Y.R b/input/gcamdata/R/zemissions_L112.ceds_ghg_en_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L112.ceds_ghg_en_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L112.ceds_ghg_en_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L114.bcoc_en_R_S_T_Y.R b/input/gcamdata/R/zemissions_L114.bcoc_en_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L114.bcoc_en_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L114.bcoc_en_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L1211.nonco2_awb_R_S_T_Y_IRR.R b/input/gcamdata/R/zemissions_L1211.nonco2_awb_R_S_T_Y_IRR.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L1211.nonco2_awb_R_S_T_Y_IRR.R
rename to input/gcamdata/R/zemissions_L1211.nonco2_awb_R_S_T_Y_IRR.R
diff --git a/input/gcamdata/R/zchunk_L1221.ghg_agr_R_S_T_Y_IRR.R b/input/gcamdata/R/zemissions_L1221.ghg_agr_R_S_T_Y_IRR.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L1221.ghg_agr_R_S_T_Y_IRR.R
rename to input/gcamdata/R/zemissions_L1221.ghg_agr_R_S_T_Y_IRR.R
diff --git a/input/gcamdata/R/zchunk_L123.bcoc_awb_R_S_T_Y.R b/input/gcamdata/R/zemissions_L123.bcoc_awb_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L123.bcoc_awb_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L123.bcoc_awb_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L141.hfc_R_S_T_Y.R b/input/gcamdata/R/zemissions_L141.hfc_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L141.hfc_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L141.hfc_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L142.pfc_R_S_T_Y.R b/input/gcamdata/R/zemissions_L142.pfc_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L142.pfc_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L142.pfc_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L151.ctrl_R_en_S_T.R b/input/gcamdata/R/zemissions_L151.ctrl_R_en_S_T.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L151.ctrl_R_en_S_T.R
rename to input/gcamdata/R/zemissions_L151.ctrl_R_en_S_T.R
diff --git a/input/gcamdata/R/zchunk_L152.MACC.R b/input/gcamdata/R/zemissions_L152.MACC.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L152.MACC.R
rename to input/gcamdata/R/zemissions_L152.MACC.R
diff --git a/input/gcamdata/R/zchunk_L161.nonghg_en_ssp_R_S_T_Y.R b/input/gcamdata/R/zemissions_L161.nonghg_en_ssp_R_S_T_Y.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L161.nonghg_en_ssp_R_S_T_Y.R
rename to input/gcamdata/R/zemissions_L161.nonghg_en_ssp_R_S_T_Y.R
diff --git a/input/gcamdata/R/zchunk_L169.nonghg_NEI_scaling.R b/input/gcamdata/R/zemissions_L169.nonghg_NEI_scaling.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L169.nonghg_NEI_scaling.R
rename to input/gcamdata/R/zemissions_L169.nonghg_NEI_scaling.R
index 99bbeb5ac2..d70eb82d81 100644
--- a/input/gcamdata/R/zchunk_L169.nonghg_NEI_scaling.R
+++ b/input/gcamdata/R/zemissions_L169.nonghg_NEI_scaling.R
@@ -1,3 +1,5 @@
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
 #' module_emissions_L169.nonghg_NEI_scaling
 #'
 #' Further processes the NEI data to get a full timeseries for 1990 - 2017.
@@ -340,8 +342,8 @@ module_emissions_L169.nonghg_NEI_scaling <- function(command, ...) {
     # 1.1 preparing CEDS data
     # Converting from Tg to short ton to match NEI units
     L102.ceds_GFED_nonco2_tg_C_S_F %>%
-      mutate( emissions = emissions / CONV_TST_TG * 1000 ) %>%
-      mutate( units = "TON" ) -> CEDS_ton
+      mutate( emissions = emissions / CONV_TST_TG * 1000 ,
+              units = "TON" ) -> CEDS_ton
 
     # 1.2 preparing the NEI data
     NEI_2008_2017_final %>%
diff --git a/input/gcamdata/R/zchunk_L170.nonghg_ceds_scaling.R b/input/gcamdata/R/zemissions_L170.nonghg_ceds_scaling.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L170.nonghg_ceds_scaling.R
rename to input/gcamdata/R/zemissions_L170.nonghg_ceds_scaling.R
index ddd8f5a3c2..313ff65fcb 100644
--- a/input/gcamdata/R/zchunk_L170.nonghg_ceds_scaling.R
+++ b/input/gcamdata/R/zemissions_L170.nonghg_ceds_scaling.R
@@ -1,3 +1,5 @@
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
 #' module_emissions_L170.nonghg_ceds_scaling
 #'
 #' Scales pre-processed NEI non-CO2 emissions to CEDS at the national level
diff --git a/input/gcamdata/R/zchunk_L201.en_nonco2.R b/input/gcamdata/R/zemissions_L201.en_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L201.en_nonco2.R
rename to input/gcamdata/R/zemissions_L201.en_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L211.ag_nonco2.R b/input/gcamdata/R/zemissions_L211.ag_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L211.ag_nonco2.R
rename to input/gcamdata/R/zemissions_L211.ag_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L2111.ag_nonco2_IRR.R b/input/gcamdata/R/zemissions_L2111.ag_nonco2_IRR.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2111.ag_nonco2_IRR.R
rename to input/gcamdata/R/zemissions_L2111.ag_nonco2_IRR.R
diff --git a/input/gcamdata/R/zchunk_L2112.ag_nonco2_IRR_MGMT.R b/input/gcamdata/R/zemissions_L2112.ag_nonco2_IRR_MGMT.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2112.ag_nonco2_IRR_MGMT.R
rename to input/gcamdata/R/zemissions_L2112.ag_nonco2_IRR_MGMT.R
diff --git a/input/gcamdata/R/zchunk_L212.unmgd_nonco2.R b/input/gcamdata/R/zemissions_L212.unmgd_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L212.unmgd_nonco2.R
rename to input/gcamdata/R/zemissions_L212.unmgd_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L231.proc_sector.R b/input/gcamdata/R/zemissions_L231.proc_sector.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L231.proc_sector.R
rename to input/gcamdata/R/zemissions_L231.proc_sector.R
diff --git a/input/gcamdata/R/zchunk_L232.prc_nonco2.R b/input/gcamdata/R/zemissions_L232.prc_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L232.prc_nonco2.R
rename to input/gcamdata/R/zemissions_L232.prc_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L241.en_newtech_nonco2.R b/input/gcamdata/R/zemissions_L241.en_newtech_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L241.en_newtech_nonco2.R
rename to input/gcamdata/R/zemissions_L241.en_newtech_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L241.fgas.R b/input/gcamdata/R/zemissions_L241.fgas.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L241.fgas.R
rename to input/gcamdata/R/zemissions_L241.fgas.R
diff --git a/input/gcamdata/R/zchunk_L251.en_ssp_nonco2.R b/input/gcamdata/R/zemissions_L251.en_ssp_nonco2.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L251.en_ssp_nonco2.R
rename to input/gcamdata/R/zemissions_L251.en_ssp_nonco2.R
diff --git a/input/gcamdata/R/zchunk_L252.MACC.R b/input/gcamdata/R/zemissions_L252.MACC.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L252.MACC.R
rename to input/gcamdata/R/zemissions_L252.MACC.R
diff --git a/input/gcamdata/R/zchunk_L253.emission_controls.R b/input/gcamdata/R/zemissions_L253.emission_controls.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L253.emission_controls.R
rename to input/gcamdata/R/zemissions_L253.emission_controls.R
diff --git a/input/gcamdata/R/zchunk_L270.nonghg_NEI_to_GCAM.R b/input/gcamdata/R/zemissions_L270.nonghg_NEI_to_GCAM.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L270.nonghg_NEI_to_GCAM.R
rename to input/gcamdata/R/zemissions_L270.nonghg_NEI_to_GCAM.R
index 1eb5c522af..6e502fd22b 100644
--- a/input/gcamdata/R/zchunk_L270.nonghg_NEI_to_GCAM.R
+++ b/input/gcamdata/R/zemissions_L270.nonghg_NEI_to_GCAM.R
@@ -1,3 +1,5 @@
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
 #' module_emissions_L270.nonghg_nei_to_gcam
 #'
 #' Produce tables containing non-GHG emissions for all model base years by sector.
diff --git a/input/gcamdata/R/zchunk_batch_MACC_TC_SSP_xml.R b/input/gcamdata/R/zemissions_xml_MACC_TC_SSP.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_MACC_TC_SSP_xml.R
rename to input/gcamdata/R/zemissions_xml_MACC_TC_SSP.R
index 912bc3a8e2..20683f4fae 100644
--- a/input/gcamdata/R/zchunk_batch_MACC_TC_SSP_xml.R
+++ b/input/gcamdata/R/zemissions_xml_MACC_TC_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_MACC_TC_SSP_xml
+#' module_emissions_MACC_TC_SSP_xml
 #'
 #' Construct XML data structure for all the \code{MACC_TC_SSP.xml} files.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{MACC_TC_SSP1.xml}, \code{MACC_TC_SSP2.xml}, and \code{MACC_TC_SSP5.xml}.
-module_emissions_batch_MACC_TC_SSP_xml <- function(command, ...) {
+module_emissions_MACC_TC_SSP_xml <- function(command, ...) {
 
   SSP_NUMS <- c(1, 2, 5)
 
diff --git a/input/gcamdata/R/zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R b/input/gcamdata/R/zemissions_xml_all_aglu_emissions_IRR_MGMT.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R
rename to input/gcamdata/R/zemissions_xml_all_aglu_emissions_IRR_MGMT.R
index bc5912bf80..f1bcdf1155 100644
--- a/input/gcamdata/R/zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R
+++ b/input/gcamdata/R/zemissions_xml_all_aglu_emissions_IRR_MGMT.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml
+#' module_emissions_all_aglu_emissions_IRR_MGMT_xml
 #'
 #' Construct XML data structure for \code{all_aglu_emissions_IRR_MGMT.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{all_aglu_emissions_IRR_MGMT.xml}, \code{all_aglu_emissions_IRR_MGMT_MAC.xml}.
 #' The corresponding file in the original data system was
 #' \code{batch_all_aglu_emissions_IRR_MGMT.xml} (emissions XML).
-module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml <- function(command, ...) {
+module_emissions_all_aglu_emissions_IRR_MGMT_xml <- function(command, ...) {
 
   MODULE_INPUTS <-
     c("L2112.AWBEmissions",
diff --git a/input/gcamdata/R/zchunk_batch_all_energy_emissions_xml.R b/input/gcamdata/R/zemissions_xml_all_energy_emissions.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_all_energy_emissions_xml.R
rename to input/gcamdata/R/zemissions_xml_all_energy_emissions.R
index 21f680afe8..b3bfc2b7fb 100644
--- a/input/gcamdata/R/zchunk_batch_all_energy_emissions_xml.R
+++ b/input/gcamdata/R/zemissions_xml_all_energy_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_all_energy_emissions_xml
+#' module_emissions_all_energy_emissions_xml
 #'
 #' Construct XML data structure for \code{all_energy_emissions.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{all_energy_emissions.xml}, \code{all_energy_emissions_MAC.xml}.
 #' The corresponding file in the original data system was \code{batch_all_energy_emissions.xml.R} (emissions XML).
-module_emissions_batch_all_energy_emissions_xml <- function(command, ...) {
+module_emissions_all_energy_emissions_xml <- function(command, ...) {
   input_names <- c("L201.en_pol_emissions",
                    "L201.en_ghg_emissions",
                    "L201.OutputEmissions_elec",
diff --git a/input/gcamdata/R/zchunk_batch_all_fgas_emissions_xml.R b/input/gcamdata/R/zemissions_xml_all_fgas_emissions.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_all_fgas_emissions_xml.R
rename to input/gcamdata/R/zemissions_xml_all_fgas_emissions.R
index a9b57e4edd..b15aff1a1e 100644
--- a/input/gcamdata/R/zchunk_batch_all_fgas_emissions_xml.R
+++ b/input/gcamdata/R/zemissions_xml_all_fgas_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_all_fgas_emissions_xml
+#' module_emissions_all_fgas_emissions_xml
 #'
 #' Construct XML data structure for \code{all_fgas_emissions.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{all_fgas_emissions.xml}, \code{all_fgas_emissions_MAC.xml}.
 #' The corresponding file in the
 #' original data system was \code{batch_all_fgas_emissions.xml} (emissions XML).
-module_emissions_batch_all_fgas_emissions_xml <- function(command, ...) {
+module_emissions_all_fgas_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L241.hfc_all",
              "L241.pfc_all",
diff --git a/input/gcamdata/R/zchunk_batch_all_protected_unmgd_emissions_xml.R b/input/gcamdata/R/zemissions_xml_all_protected_unmgd_emissions.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_all_protected_unmgd_emissions_xml.R
rename to input/gcamdata/R/zemissions_xml_all_protected_unmgd_emissions.R
index cb582bdaee..b5acc38b84 100644
--- a/input/gcamdata/R/zchunk_batch_all_protected_unmgd_emissions_xml.R
+++ b/input/gcamdata/R/zemissions_xml_all_protected_unmgd_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_all_protected_unmgd_emissions_xml
+#' module_emissions_all_protected_unmgd_emissions_xml
 #'
 #' Construct XML data structure for \code{all_protected_unmgd_emissions.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{all_protected_unmgd_emissions.xml}. The corresponding file in the
 #' original data system was \code{batch_all_protected_unmgd_emissions.xml} (emissions XML).
-module_emissions_batch_all_protected_unmgd_emissions_xml <- function(command, ...) {
+module_emissions_all_protected_unmgd_emissions_xml <- function(command, ...) {
 
   MODULE_INPUTS <- c("L212.ItemName",
                    "L212.ItemName_prot",
diff --git a/input/gcamdata/R/zchunk_batch_all_unmgd_emissions_xml.R b/input/gcamdata/R/zemissions_xml_all_unmgd_emissions.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_all_unmgd_emissions_xml.R
rename to input/gcamdata/R/zemissions_xml_all_unmgd_emissions.R
index c64c11319b..bfb5c0bc05 100644
--- a/input/gcamdata/R/zchunk_batch_all_unmgd_emissions_xml.R
+++ b/input/gcamdata/R/zemissions_xml_all_unmgd_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_all_unmgd_emissions_xml
+#' module_emissions_all_unmgd_emissions_xml
 #'
 #' Construct XML data structure for \code{all_unmgd_emissions.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{all_unmgd_emissions.xml}. The corresponding file in the
 #' original data system was \code{batch_all_unmgd_emissions.xml} (emissions XML).
-module_emissions_batch_all_unmgd_emissions_xml <- function(command, ...) {
+module_emissions_all_unmgd_emissions_xml <- function(command, ...) {
   input_names <- c("L212.AgSupplySector",
                    "L212.AgSupplySubsector",
                    "L212.ItemName",
diff --git a/input/gcamdata/R/zchunk_batch_delete_gdp_control_xml.R b/input/gcamdata/R/zemissions_xml_delete_gdp_control.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_delete_gdp_control_xml.R
rename to input/gcamdata/R/zemissions_xml_delete_gdp_control.R
index 82fe8be195..ab2ff7c336 100644
--- a/input/gcamdata/R/zchunk_batch_delete_gdp_control_xml.R
+++ b/input/gcamdata/R/zemissions_xml_delete_gdp_control.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_delete_gdp_control_xml
+#' module_emissions_delete_gdp_control_xml
 #'
 #' Construct XML data structure for \code{delete_gdp_control.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{delete_gdp_control.xml}. The corresponding file in the
 #' original data system was \code{batch_delete_gdp_control_xml.R} (emissions XML).
-module_emissions_batch_delete_gdp_control_xml <- function(command, ...) {
+module_emissions_delete_gdp_control_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L251.ctrl.delete"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_emission_controls_xml.R b/input/gcamdata/R/zemissions_xml_emission_controls.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_emission_controls_xml.R
rename to input/gcamdata/R/zemissions_xml_emission_controls.R
index ce1b578504..cab710facc 100644
--- a/input/gcamdata/R/zchunk_batch_emission_controls_xml.R
+++ b/input/gcamdata/R/zemissions_xml_emission_controls.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_emission_controls_xml
+#' module_emissions_emission_controls_xml
 #'
 #' Construct XML data structure for \code{emission_factor_controls.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{EF_controls.xml}, \code{EF_controls_user.xml}
 #' \code{EF_controls_USA.xml}, \code{EF_controls_user_USA.xml}
 
-module_emissions_batch_emission_controls_xml <- function(command, ...) {
+module_emissions_emission_controls_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L253.EF_retrofit",
              "L253.EF_NSPS_new_vintage",
diff --git a/input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors.R b/input/gcamdata/R/zemissions_xml_ind_urb_processing_sectors.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors.R
rename to input/gcamdata/R/zemissions_xml_ind_urb_processing_sectors.R
index 07fe3b43ba..716e838b15 100644
--- a/input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors.R
+++ b/input/gcamdata/R/zemissions_xml_ind_urb_processing_sectors.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_ind_urb_processing_sectors_xml
+#' module_emissions_ind_urb_processing_sectors_xml
 #'
 #' Construct XML data structure for \code{ind_urb_processing_sectors.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{ind_urb_processing_sectors.xml}, \code{ind_urb_processing_sectors_MAC.xml}.
 #' The corresponding file in the original data system was
 #' \code{batch_ind_urb_processing_sectors.xml} (emissions XML).
-module_emissions_batch_ind_urb_processing_sectors_xml <- function(command, ...) {
+module_emissions_ind_urb_processing_sectors_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L231.UnlimitRsrc",
              "L231.UnlimitRsrcPrice",
diff --git a/input/gcamdata/R/zchunk_batch_ssp15_emissions_factors_xml.R b/input/gcamdata/R/zemissions_xml_ssp15_emissions_factors.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ssp15_emissions_factors_xml.R
rename to input/gcamdata/R/zemissions_xml_ssp15_emissions_factors.R
index b4e035843d..8c1d2cbec5 100644
--- a/input/gcamdata/R/zchunk_batch_ssp15_emissions_factors_xml.R
+++ b/input/gcamdata/R/zemissions_xml_ssp15_emissions_factors.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_ssp15_emissions_factors_xml
+#' module_emissions_ssp15_emissions_factors_xml
 #'
 #' Construct XML data structure for \code{ssp15_emissions_factors.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ssp15_emissions_factors.xml}. The corresponding file in the
 #' original data system was \code{batch_ssp15_emissions_factors_xml.R} (emissions XML).
-module_emissions_batch_ssp15_emissions_factors_xml <- function(command, ...) {
+module_emissions_ssp15_emissions_factors_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L251.ssp15_ef",
              "L251.ssp15_ef_elec",
diff --git a/input/gcamdata/R/zchunk_batch_ssp2_emissions_factors_xml.R b/input/gcamdata/R/zemissions_xml_ssp2_emissions_factors.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ssp2_emissions_factors_xml.R
rename to input/gcamdata/R/zemissions_xml_ssp2_emissions_factors.R
index 72f1851fdb..90da9bed4a 100644
--- a/input/gcamdata/R/zchunk_batch_ssp2_emissions_factors_xml.R
+++ b/input/gcamdata/R/zemissions_xml_ssp2_emissions_factors.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_ssp2_emissions_factors_xml
+#' module_emissions_ssp2_emissions_factors_xml
 #'
 #' Construct XML data structure for \code{ssp2_emissions_factors.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ssp2_emissions_factors.xml}. The corresponding file in the
 #' original data system was \code{batch_ssp2_emissions_factors_xml.R} (emissions XML).
-module_emissions_batch_ssp2_emissions_factors_xml <- function(command, ...) {
+module_emissions_ssp2_emissions_factors_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L251.ssp2_ef",
              "L251.ssp2_ef_elec",
diff --git a/input/gcamdata/R/zchunk_batch_ssp34_emissions_factors_xml.R b/input/gcamdata/R/zemissions_xml_ssp34_emissions_factors.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ssp34_emissions_factors_xml.R
rename to input/gcamdata/R/zemissions_xml_ssp34_emissions_factors.R
index c86e6239d9..98dff77c79 100644
--- a/input/gcamdata/R/zchunk_batch_ssp34_emissions_factors_xml.R
+++ b/input/gcamdata/R/zemissions_xml_ssp34_emissions_factors.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_batch_ssp34_emissions_factors_xml
+#' module_emissions_ssp34_emissions_factors_xml
 #'
 #' Construct XML data structure for \code{ssp34_emissions_factors.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ssp34_emissions_factors.xml}. The corresponding file in the
 #' original data system was \code{batch_ssp34_emissions_factors_xml.R} (emissions XML).
-module_emissions_batch_ssp34_emissions_factors_xml <- function(command, ...) {
+module_emissions_ssp34_emissions_factors_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L251.ssp34_ef",
              "L251.ssp34_ef_elec",
diff --git a/input/gcamdata/R/zchunk_LA100.CDIAC_downscale_ctry.R b/input/gcamdata/R/zenergy_L100.CDIAC_downscale_ctry.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA100.CDIAC_downscale_ctry.R
rename to input/gcamdata/R/zenergy_L100.CDIAC_downscale_ctry.R
index 5a2e394caa..aff95ac8f6 100644
--- a/input/gcamdata/R/zchunk_LA100.CDIAC_downscale_ctry.R
+++ b/input/gcamdata/R/zenergy_L100.CDIAC_downscale_ctry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA100.CDIAC_downscale_ctry
+#' module_energy_L100.CDIAC_downscale_ctry
 #'
 #' Combine and downscale (back in time, for USSR and Yugoslavia) the CDIAC emissions and sequestration data.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows distinct filter group_by mutate right_join select
 #' @importFrom tidyr gather replace_na spread
 #' @author BBL April 2017
-module_energy_LA100.CDIAC_downscale_ctry <- function(command, ...) {
+module_energy_L100.CDIAC_downscale_ctry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "emissions/CDIAC_CO2_by_nation",
              FILE = "emissions/CDIAC_Cseq_by_nation",
diff --git a/input/gcamdata/R/zchunk_LA100.IEA_downscale_ctry.R b/input/gcamdata/R/zenergy_L100.IEA_downscale_ctry.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA100.IEA_downscale_ctry.R
rename to input/gcamdata/R/zenergy_L100.IEA_downscale_ctry.R
index c2fa8d045e..f08c36b5d5 100644
--- a/input/gcamdata/R/zchunk_LA100.IEA_downscale_ctry.R
+++ b/input/gcamdata/R/zenergy_L100.IEA_downscale_ctry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA100.IEA_downscale_ctry
+#' module_energy_L100.IEA_downscale_ctry
 #'
 #' Downscale proprietary IEA energy balance data to 201 countries, by iso code, FLOW, PRODUCT, and historical year.
 #'
@@ -21,7 +21,7 @@
 #' @importFrom dplyr bind_rows distinct filter group_by intersect mutate one_of select semi_join summarise
 #' @importFrom tidyr replace_na spread
 #' @author BBL May 2017
-module_energy_LA100.IEA_downscale_ctry <- function(command, ...) {
+module_energy_L100.IEA_downscale_ctry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L100.Pop_thous_ctry_Yh",
              OPTIONAL_FILE = "energy/IEA_EnergyBalances_2019",
diff --git a/input/gcamdata/R/zchunk_LA101.en_bal_IEA.R b/input/gcamdata/R/zenergy_L101.en_bal_IEA.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA101.en_bal_IEA.R
rename to input/gcamdata/R/zenergy_L101.en_bal_IEA.R
index 677174b60c..b550fa1ed9 100644
--- a/input/gcamdata/R/zchunk_LA101.en_bal_IEA.R
+++ b/input/gcamdata/R/zenergy_L101.en_bal_IEA.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA101.en_bal_IEA
+#' module_energy_L101.en_bal_IEA
 #'
 #' Rename IEA products and flows to intermediate fuels and sectors used for constructing GCAM's fuel and sector calibration.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else group_by left_join matches mutate select summarise summarise_all
 #' @importFrom tidyr replace_na
 #' @author FF and BBL July 2017
-module_energy_LA101.en_bal_IEA <- function(command, ...) {
+module_energy_L101.en_bal_IEA <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/A_regions",
diff --git a/input/gcamdata/R/zchunk_LA1011.en_bal_adj.R b/input/gcamdata/R/zenergy_L1011.en_bal_adj.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1011.en_bal_adj.R
rename to input/gcamdata/R/zenergy_L1011.en_bal_adj.R
index ce42131b74..95568a2999 100644
--- a/input/gcamdata/R/zchunk_LA1011.en_bal_adj.R
+++ b/input/gcamdata/R/zenergy_L1011.en_bal_adj.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1011.en_bal_adj
+#' module_energy_L1011.en_bal_adj
 #'
 #' Adjustments to the IEA energy balance for shipping fuel consumption, Russia, and natural
 #' gas total primary energy supply (TPES; i.e., consumption).
@@ -17,7 +17,7 @@
 #' @importFrom dplyr arrange distinct filter if_else group_by inner_join left_join mutate select summarise
 #' @importFrom tidyr complete nesting replace_na
 #' @author JDH July 2017
-module_energy_LA1011.en_bal_adj <- function(command, ...) {
+module_energy_L1011.en_bal_adj <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_LB1011.fossilFuel_GrossTrade_EJ_R_C_Y.R b/input/gcamdata/R/zenergy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
rename to input/gcamdata/R/zenergy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
index 821d910bbe..f5ef2a8aed 100644
--- a/input/gcamdata/R/zchunk_LB1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
+++ b/input/gcamdata/R/zenergy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LB1011.ff_GrossTrade
+#' module_energy_L1011.ff_GrossTrade
 #'
 #' Calculate primary fossil fuel (coal, natural gas, crude oil) product balances, by region / commodity / year.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr anti_join bind_rows distinct filter group_by inner_join left_join mutate rename select ungroup
 #' @importFrom tidyr complete drop_na replace_na spread
 #' @author GPK/JEH April 2019
-module_energy_LB1011.ff_GrossTrade <- function(command, ...) {
+module_energy_L1011.ff_GrossTrade <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "common/GCAM_region_names",
diff --git a/input/gcamdata/R/zchunk_LA1012.en_bal_EFW.R b/input/gcamdata/R/zenergy_L1012.en_bal_EFW.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1012.en_bal_EFW.R
rename to input/gcamdata/R/zenergy_L1012.en_bal_EFW.R
index 04ad15f712..932bfe4b95 100644
--- a/input/gcamdata/R/zchunk_LA1012.en_bal_EFW.R
+++ b/input/gcamdata/R/zenergy_L1012.en_bal_EFW.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1012.en_bal_EFW
+#' module_energy_L1012.en_bal_EFW
 #'
 #' Adjustments to the IEA energy balances to account for energy-for-water processes explicitly modeled.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr bind_rows distinct filter group_by left_join mutate rename right_join select ungroup
 #' @importFrom tidyr replace_na
 #' @author GPK January 2019
-module_energy_LA1012.en_bal_EFW <- function(command, ...) {
+module_energy_L1012.en_bal_EFW <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_LA102.en_emiss_CDIAC.R b/input/gcamdata/R/zenergy_L102.en_emiss_CDIAC.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA102.en_emiss_CDIAC.R
rename to input/gcamdata/R/zenergy_L102.en_emiss_CDIAC.R
index e675ce2061..40afc77aa9 100644
--- a/input/gcamdata/R/zchunk_LA102.en_emiss_CDIAC.R
+++ b/input/gcamdata/R/zenergy_L102.en_emiss_CDIAC.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA102.en_emiss_CDIAC
+#' module_energy_L102.en_emiss_CDIAC
 #'
 #' Calculates regional TPES as well as regional and global emissions coefficients by fuel
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr filter if_else group_by mutate select summarise
 #' @author CWR July 2017
 
-module_energy_LA102.en_emiss_CDIAC <- function(command, ...) {
+module_energy_L102.en_emiss_CDIAC <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "emissions/mappings/CDIAC_fuel",
diff --git a/input/gcamdata/R/zchunk_LB1092.iron_steel_GrossTrade.R b/input/gcamdata/R/zenergy_L1092.iron_steel_GrossTrade.R
similarity index 83%
rename from input/gcamdata/R/zchunk_LB1092.iron_steel_GrossTrade.R
rename to input/gcamdata/R/zenergy_L1092.iron_steel_GrossTrade.R
index e1183b171a..f9579a5675 100644
--- a/input/gcamdata/R/zchunk_LB1092.iron_steel_GrossTrade.R
+++ b/input/gcamdata/R/zenergy_L1092.iron_steel_GrossTrade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LB1092.iron_steel_GrossTrade
+#' module_energy_L1092.iron_steel_GrossTrade
 #'
 #' Reads country-level steel production, consumption, imports and exports data from World Steel Association data set.
 #' Adjusts regional steel exports and imports by a scaling factor to fit the trade balance equation (consumption = production - exports + imports).
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter if_else mutate select distinct
 #' @importFrom tidyr gather spread
 #' @author Siddarth Durga July 2022
-module_energy_LB1092.iron_steel_GrossTrade <- function(command, ...){
+module_energy_L1092.iron_steel_GrossTrade <- function(command, ...){
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/WSA_steel_prod_cons_1970_2018",
              FILE = "energy/WSA_steel_trade_1970_2018",
@@ -53,9 +53,9 @@ module_energy_LB1092.iron_steel_GrossTrade <- function(command, ...){
     # Convert data from wide to long format, and adjust units
     WSA_steel_all_1970_2018 <- rbind(WSA_steel_prod_cons_1970_2018,WSA_steel_trade_1970_2018) %>%
       gather(key="year",value="value",'1970':'2021') %>%
-      mutate(year=as.integer(year))%>%
-      mutate(value=value/1000) %>% #Unit: to Mt
-      mutate(value=replace_na(value,0)) #replace missing data with zero
+      mutate(year=as.integer(year),
+             value=value/1000, #Unit: to Mt
+             value=replace_na(value,0)) #replace missing data with zero
 
     #Function to prepare trade data for further processing
     WSA_trade_data <- function(WSA_metric,value_name) {
@@ -99,25 +99,25 @@ module_energy_LB1092.iron_steel_GrossTrade <- function(command, ...){
       filter(GCAM_region!="NA")%>%
       #if production is equal to zero in the model base-year add a minimum calibration value of 0.01 Mt
       #This minimum calibration value is 5 times less than the smallest producer of steel in 2015
-      mutate(production=ifelse(production==0 & year == MODEL_FINAL_BASE_YEAR,0.01,production))%>%
-      #estimate the imports and exports scaling factor to match the reported WSA steel consumption data
-      #calculate scaling factor (x) so that consumption = production - x*exports + x*imports
-      mutate(scaling_factor=(consumption-production)/(imports-exports))%>%
-      #re-evaluate the exports and imports by multiplying with the scaling factor
-      mutate(exports_reval=scaling_factor*exports,imports_reval=scaling_factor*imports)%>%
-      #for regions with negative scaling factors use the WSA imports and exports
-      mutate(exports_reval=ifelse(exports_reval<0,exports,exports_reval),imports_reval=ifelse(imports_reval<0,imports,imports_reval))%>%
-      #estimate the % increase in imports and exports after scaling
-      mutate(diff_exports=ifelse(exports==0,0,((exports_reval-exports)/exports)*100)) %>%
-      mutate(diff_imports=ifelse(imports==0,0,((imports_reval-imports)/imports)*100)) %>%
-      #for regions with % increase in imports and exports greater than 10% (tolerance level) use the reported WSA imports and exports
-      mutate(exports_reval=ifelse(diff_exports>=10 | diff_exports <=-10,exports,exports_reval),imports_reval=ifelse(diff_imports >=10 |diff_imports <=-10,imports,imports_reval))%>%
-      #estimate the domestic supply of iron and steel (production minus exports)
-      #if this value is negative assume exports and imports for this region are 0
-      mutate(exports_reval=ifelse(production-exports_reval<0,0,exports_reval),imports_reval=ifelse(production-exports_reval<0,0,imports_reval))%>%
-      mutate(domestic_supply=production-exports_reval)%>%
-      #estimate steel consumption using the final scaled imports and exports
-      mutate(consumption_reval=production-exports_reval+imports_reval) %>%
+      mutate(production=ifelse(production==0 & year == MODEL_FINAL_BASE_YEAR,0.01,production),
+             #estimate the imports and exports scaling factor to match the reported WSA steel consumption data
+             #calculate scaling factor (x) so that consumption = production - x*exports + x*imports
+             scaling_factor=(consumption-production)/(imports-exports),
+             #re-evaluate the exports and imports by multiplying with the scaling factor
+             exports_reval=scaling_factor*exports,imports_reval=scaling_factor*imports,
+             #for regions with negative scaling factors use the WSA imports and exports
+             exports_reval=ifelse(exports_reval<0,exports,exports_reval),imports_reval=ifelse(imports_reval<0,imports,imports_reval),
+             #estimate the % increase in imports and exports after scaling
+             diff_exports=ifelse(exports==0,0,((exports_reval-exports)/exports)*100),
+             diff_imports=ifelse(imports==0,0,((imports_reval-imports)/imports)*100),
+             #for regions with % increase in imports and exports greater than 10% (tolerance level) use the reported WSA imports and exports
+             exports_reval=ifelse(diff_exports>=10 | diff_exports <=-10,exports,exports_reval),imports_reval=ifelse(diff_imports >=10 |diff_imports <=-10,imports,imports_reval),
+             #estimate the domestic supply of iron and steel (production minus exports)
+             #if this value is negative assume exports and imports for this region are 0
+             exports_reval=ifelse(production-exports_reval<0,0,exports_reval),imports_reval=ifelse(production-exports_reval<0,0,imports_reval),
+             domestic_supply=production-exports_reval,
+             #estimate steel consumption using the final scaled imports and exports
+             consumption_reval=production-exports_reval+imports_reval) %>%
       select(GCAM_region,year,production,imports_reval,exports_reval,consumption_reval,domestic_supply) %>%
       mutate(production=replace_na(production,0),imports_reval=replace_na(imports_reval,0),exports_reval=replace_na(exports_reval,0),
              consumption_reval=replace_na(consumption_reval,0),domestic_supply=replace_na(domestic_supply,0)) -> LB1092.Tradebalance_iron_steel_Mt_R_Y
@@ -131,14 +131,14 @@ module_energy_LB1092.iron_steel_GrossTrade <- function(command, ...){
       mutate(value=sum(value))%>%
       distinct(year,metric,value) %>%
       spread(key="metric",value="value") %>%
-      mutate(imports_export_scale = exports_reval/imports_reval) %>%
-      mutate(imports_export_scale=replace_na(imports_export_scale,1))%>%
+      mutate(imports_export_scale = exports_reval/imports_reval,
+             imports_export_scale=replace_na(imports_export_scale,1))%>%
       select(year,imports_export_scale)
 
     LB1092.Tradebalance_iron_steel_Mt_R_Y <- LB1092.Tradebalance_iron_steel_Mt_R_Y %>%
       left_join(Global_scaling_factors,by="year") %>%
-      mutate(imports_reval=imports_reval*imports_export_scale) %>%
-      mutate(consumption_reval=production-exports_reval+imports_reval) %>%
+      mutate(imports_reval=imports_reval*imports_export_scale,
+             consumption_reval=production-exports_reval+imports_reval) %>%
       select(-imports_export_scale)%>%
       gather(key="metric",value="value",'production':'domestic_supply') %>%
       ungroup()
@@ -194,16 +194,16 @@ module_energy_LB1092.iron_steel_GrossTrade <- function(command, ...){
                   select(GCAM_region,temp_percent_trade),by=c("GCAM_region")) %>%
       #add intra regional trade for model years where data is available
       left_join(intra_regional_trade_pct,by=c("year","GCAM_region")) %>%
-      mutate(percent_trade=ifelse(is.na(percent_trade),temp_percent_trade,percent_trade)) %>%
-      mutate(intra_exports=value*percent_trade/100) %>%
-      mutate(intra_exports=ifelse(is.na(intra_exports),0,intra_exports))%>%
+      mutate(percent_trade=ifelse(is.na(percent_trade),temp_percent_trade,percent_trade),
+             intra_exports=value*percent_trade/100,
+             intra_exports=ifelse(is.na(intra_exports),0,intra_exports))%>%
       select(GCAM_region,year,intra_exports)-> intra_regional_trade_Mt_R_Y
 
     #remove intra region trade from imports and exports and add this amount to domestic supply
     LB1092.Tradebalance_iron_steel_Mt_R_Y %>%
       left_join(intra_regional_trade_Mt_R_Y,by=c("GCAM_region","year"))%>%
-      mutate(value=ifelse(metric %in% c("exports_reval","imports_reval"),value-intra_exports,value))%>%
-      mutate(value=ifelse(metric %in% c("domestic_supply"),value+intra_exports,value))%>%
+      mutate(value=ifelse(metric %in% c("exports_reval","imports_reval"),value-intra_exports,value),
+             value=ifelse(metric %in% c("domestic_supply"),value+intra_exports,value))%>%
       select(-intra_exports)-> LB1092.Tradebalance_iron_steel_Mt_R_Y
 
 
diff --git a/input/gcamdata/R/zchunk_LA111.rsrc_fos_Prod.R b/input/gcamdata/R/zenergy_L111.rsrc_fos_Prod.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA111.rsrc_fos_Prod.R
rename to input/gcamdata/R/zenergy_L111.rsrc_fos_Prod.R
index eb46caf49c..29002f5d52 100644
--- a/input/gcamdata/R/zchunk_LA111.rsrc_fos_Prod.R
+++ b/input/gcamdata/R/zenergy_L111.rsrc_fos_Prod.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA111.rsrc_fos_Prod
+#' module_energy_L111.rsrc_fos_Prod
 #'
 #' Calculate historical fossil energy production and fossil resource supply curves.
 #'
@@ -20,7 +20,7 @@
 #' @importFrom dplyr arrange bind_rows filter if_else group_by left_join mutate select summarise
 #' @importFrom tidyr complete replace_na
 #' @author BBL August 2017
-module_energy_LA111.rsrc_fos_Prod <- function(command, ...) {
+module_energy_L111.rsrc_fos_Prod <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/mappings/IEA_product_rsrc",
diff --git a/input/gcamdata/R/zchunk_LA112.U.R b/input/gcamdata/R/zenergy_L112.U.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LA112.U.R
rename to input/gcamdata/R/zenergy_L112.U.R
index 3694625b3c..b4e49a5991 100644
--- a/input/gcamdata/R/zchunk_LA112.U.R
+++ b/input/gcamdata/R/zenergy_L112.U.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA112.U
+#' module_energy_L112.U
 #'
 #' Assigning global uranium supply curve to GCAM_region_ID 1.
 #'
@@ -13,7 +13,7 @@
 #' @details Describe in detail what this chunk does.
 #' @importFrom assertthat assert_that
 #' @author HM April 2017
-module_energy_LA112.U <- function(command, ...) {
+module_energy_L112.U <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "energy/A12.U_curves"))
diff --git a/input/gcamdata/R/zchunk_LA113.MSW.R b/input/gcamdata/R/zenergy_L113.MSW.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA113.MSW.R
rename to input/gcamdata/R/zenergy_L113.MSW.R
index a84bc1d2ca..adcfa106bc 100644
--- a/input/gcamdata/R/zchunk_LA113.MSW.R
+++ b/input/gcamdata/R/zenergy_L113.MSW.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA113.MSW
+#' module_energy_L113.MSW
 #'
 #' Generate municipal solid waste data.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom tibble tibble
 #' @importFrom dplyr filter full_join group_by mutate summarise
 #' @author BBL
-module_energy_LA113.MSW <- function(command, ...) {
+module_energy_L113.MSW <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/A13.MSW_curves",
diff --git a/input/gcamdata/R/zchunk_LA113.atb_cost.R b/input/gcamdata/R/zenergy_L113.atb_cost.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA113.atb_cost.R
rename to input/gcamdata/R/zenergy_L113.atb_cost.R
index 48f77e8b51..e37705e9cc 100644
--- a/input/gcamdata/R/zchunk_LA113.atb_cost.R
+++ b/input/gcamdata/R/zenergy_L113.atb_cost.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA113.atb_cost
+#' module_energy_L113.atb_cost
 #'
 #' Generates power sector cost input files based on 2019 ATB data.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter mutate select pull left_join anti_join bind_rows arrange rename
 #' @author AJS March 2019
-module_energy_LA113.atb_cost <- function(command, ...) {
+module_energy_L113.atb_cost <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A23.globaltech_capital",
              FILE = "energy/A23.globaltech_capital_adv",
diff --git a/input/gcamdata/R/zchunk_LA114.wind-energy.R b/input/gcamdata/R/zenergy_L114.wind-energy.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA114.wind-energy.R
rename to input/gcamdata/R/zenergy_L114.wind-energy.R
index e98d967289..7915d29a5d 100644
--- a/input/gcamdata/R/zchunk_LA114.wind-energy.R
+++ b/input/gcamdata/R/zenergy_L114.wind-energy.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA114.wind
+#' module_energy_L114.wind
 #'
 #' Calculate regional supply curves for wind using country-level supply curves.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter group_by mutate pull row_number select summarise rename
 #' @author AJS June 2017
-module_energy_LA114.wind <- function(command, ...) {
+module_energy_L114.wind <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/Zhou_wind_supply_ctry_EJ"))
diff --git a/input/gcamdata/R/zchunk_LA115.roofPV.R b/input/gcamdata/R/zenergy_L115.roofPV.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA115.roofPV.R
rename to input/gcamdata/R/zenergy_L115.roofPV.R
index 667dffcc42..a71e0e52b8 100644
--- a/input/gcamdata/R/zchunk_LA115.roofPV.R
+++ b/input/gcamdata/R/zenergy_L115.roofPV.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA115.roofPV
+#' module_energy_L115.roofPV
 #'
 #' Convert rooftop PV resources from the 14 GCAM regions, i.e., "region_GCAM3", to the 32 GCAM region IDs.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter group_by mutate select summarise
 #' @author AJS April 2017
-module_energy_LA115.roofPV <- function(command, ...) {
+module_energy_L115.roofPV <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/A15.roofPV_curves",
diff --git a/input/gcamdata/R/zchunk_LA116.geo.R b/input/gcamdata/R/zenergy_L116.geo.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA116.geo.R
rename to input/gcamdata/R/zenergy_L116.geo.R
index 3213bb0418..18c62fcba2 100644
--- a/input/gcamdata/R/zchunk_LA116.geo.R
+++ b/input/gcamdata/R/zenergy_L116.geo.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA116.geo
+#' module_energy_L116.geo
 #'
 #' Generate geothermal (hydrothermal and engineered geothermal systems (EGS)) supply curves by GCAM region
 #' Supply curves developed for the 14 GCAM 3.0 regions are downscaled to the country level on the basis
@@ -19,7 +19,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr distinct filter full_join group_by mutate select summarise
 #' @author GPK April 2017
-module_energy_LA116.geo <- function(command, ...) {
+module_energy_L116.geo <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/LDS/Land_type_area_ha",
diff --git a/input/gcamdata/R/zchunk_LA117.tradbio.R b/input/gcamdata/R/zenergy_L117.tradbio.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA117.tradbio.R
rename to input/gcamdata/R/zenergy_L117.tradbio.R
index 22e65d5789..157437244d 100644
--- a/input/gcamdata/R/zchunk_LA117.tradbio.R
+++ b/input/gcamdata/R/zenergy_L117.tradbio.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA117.tradbio
+#' module_energy_L117.tradbio
 #'
 #' Creates regional traditional biomass supply curves
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange filter group_by mutate select summarise
 #' @author RH March 2017
-module_energy_LA117.tradbio <- function(command, ...) {
+module_energy_L117.tradbio <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L1012.en_bal_EJ_R_Si_Fi_Yh",
              FILE = "energy/A17.tradbio_curves"))
diff --git a/input/gcamdata/R/zchunk_LA118.hydro.R b/input/gcamdata/R/zenergy_L118.hydro.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA118.hydro.R
rename to input/gcamdata/R/zenergy_L118.hydro.R
index b97f9c7e0c..8add27c2eb 100644
--- a/input/gcamdata/R/zchunk_LA118.hydro.R
+++ b/input/gcamdata/R/zenergy_L118.hydro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA118.hydro
+#' module_energy_L118.hydro
 #'
 #' Calculate hydro potential in EJ from 2010 to 2100 by GCAM region ID
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr arrange bind_rows filter if_else group_by left_join mutate pull select summarise
 #' @importFrom tidyr fill spread
 #' @author AS May 2017
-module_energy_LA118.hydro <- function(command, ...) {
+module_energy_L118.hydro <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/Hydropower_potential",
diff --git a/input/gcamdata/R/zchunk_LA119.solar.R b/input/gcamdata/R/zenergy_L119.solar.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA119.solar.R
rename to input/gcamdata/R/zenergy_L119.solar.R
index 95ec6208e4..ecc4684e90 100644
--- a/input/gcamdata/R/zchunk_LA119.solar.R
+++ b/input/gcamdata/R/zenergy_L119.solar.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA119.solar
+#' module_energy_L119.solar
 #'
 #' Computes relative average irradiance and dni (direct normal irradiance) by GCAM region for solar sector.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter if_else group_by inner_join left_join mutate right_join select summarise
 #' @author LF November 2017
-module_energy_LA119.solar <- function(command, ...) {
+module_energy_L119.solar <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/LDS/Land_type_area_ha",
diff --git a/input/gcamdata/R/zchunk_LA120.offshore_wind.R b/input/gcamdata/R/zenergy_L120.offshore_wind.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA120.offshore_wind.R
rename to input/gcamdata/R/zenergy_L120.offshore_wind.R
index 069c49907c..44e2a7dfbd 100644
--- a/input/gcamdata/R/zchunk_LA120.offshore_wind.R
+++ b/input/gcamdata/R/zenergy_L120.offshore_wind.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA120.offshore_wind
+#' module_energy_L120.offshore_wind
 #'
 #' Takes in data on country-level offshore wind energy potential and global offshore wind capital
 #' cost assumptions and generates tables containing region-level offshore wind data.
@@ -19,7 +19,7 @@
 #' @importFrom tidyr gather
 #' @importFrom stats optimize
 #' @author MB GI AJS March 2019
-module_energy_LA120.offshore_wind <- function(command, ...) {
+module_energy_L120.offshore_wind <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "common/GCAM_region_names",
diff --git a/input/gcamdata/R/zchunk_LA121.liquids.R b/input/gcamdata/R/zenergy_L121.liquids.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA121.liquids.R
rename to input/gcamdata/R/zenergy_L121.liquids.R
index 0754d8df9b..469bcd34c4 100644
--- a/input/gcamdata/R/zchunk_LA121.liquids.R
+++ b/input/gcamdata/R/zenergy_L121.liquids.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA121.liquids
+#' module_energy_L121.liquids
 #'
 #' Process historical oil data and separate into unconventional oil, crude oil, and energy inputs to oil.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr arrange distinct filter group_by if_else inner_join left_join mutate select summarise
 #' @importFrom tidyr complete nesting
 #' @author JDH June 2017, ed GPK April 2019
-module_energy_LA121.liquids <- function(command, ...) {
+module_energy_L121.liquids <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/IIASA_biofuel_production",
diff --git a/input/gcamdata/R/zchunk_LA122.gasproc_refining.R b/input/gcamdata/R/zenergy_L122.gasproc_refining.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA122.gasproc_refining.R
rename to input/gcamdata/R/zenergy_L122.gasproc_refining.R
index f9c94fb06f..aedb8a9e4b 100644
--- a/input/gcamdata/R/zchunk_LA122.gasproc_refining.R
+++ b/input/gcamdata/R/zenergy_L122.gasproc_refining.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA122.gasproc_refining
+#' module_energy_L122.gasproc_refining
 #'
 #' Create gasproc, oil refining and crops inputs, outputs and IO "input-output" coefficients for refining.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else left_join mutate right_join select semi_join
 #' @importFrom tidyr complete gather nesting
 #' @author FF, May 2017
-module_energy_LA122.gasproc_refining <- function(command, ...) {
+module_energy_L122.gasproc_refining <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "aglu/A_agRegionalTechnology",
diff --git a/input/gcamdata/R/zchunk_LA123.electricity.R b/input/gcamdata/R/zenergy_L123.electricity.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA123.electricity.R
rename to input/gcamdata/R/zenergy_L123.electricity.R
index 59179b9796..95fe1af9c1 100644
--- a/input/gcamdata/R/zchunk_LA123.electricity.R
+++ b/input/gcamdata/R/zenergy_L123.electricity.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA123.electricity
+#' module_energy_L123.electricity
 #'
 #' This script creates electricity generation and inputs by fuel, region and historical year. Estimates are adjusted by efficiency factors.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter full_join if_else group_by left_join mutate select semi_join summarise summarise_all
 #' @author FF April 2017
-module_energy_LA123.electricity <- function(command, ...) {
+module_energy_L123.electricity <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/enduse_fuel_aggregation",
              FILE = "energy/A23.chp_elecratio",
diff --git a/input/gcamdata/R/zchunk_LA1231.elec_tech.R b/input/gcamdata/R/zenergy_L1231.elec_tech.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1231.elec_tech.R
rename to input/gcamdata/R/zenergy_L1231.elec_tech.R
index 3bd17ac2f0..7f44e51914 100644
--- a/input/gcamdata/R/zchunk_LA1231.elec_tech.R
+++ b/input/gcamdata/R/zenergy_L1231.elec_tech.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1231.elec_tech
+#' module_energy_L1231.elec_tech
 #'
 #' Obtain inputs, outputs and efficiencies in the electricity sector for all technologies by region, sector, and year.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr anti_join arrange bind_rows distinct filter full_join if_else group_by left_join mutate select semi_join
 #' @author FF, May 2017
 
-module_energy_LA1231.elec_tech<- function(command, ...) {
+module_energy_L1231.elec_tech<- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A23.globaltech_eff",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_LA1232.desal_from_elec.R b/input/gcamdata/R/zenergy_L1232.desal_from_elec.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA1232.desal_from_elec.R
rename to input/gcamdata/R/zenergy_L1232.desal_from_elec.R
index 14e7d1d6b8..9d09ae72ad 100644
--- a/input/gcamdata/R/zchunk_LA1232.desal_from_elec.R
+++ b/input/gcamdata/R/zenergy_L1232.desal_from_elec.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1232.desal_from_elec
+#' module_energy_L1232.desal_from_elec
 #'
 #' Output ratio of desalinated seawater produced as secondary output from electric power plants.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter group_by left_join mutate rename select ungroup
 #' @author GPK January 2019
-module_energy_LA1232.desal_from_elec <- function(command, ...) {
+module_energy_L1232.desal_from_elec <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L1231.out_EJ_R_elec_F_tech_Yh",
              "L171.out_km3_R_desalfromelec_Yh",
diff --git a/input/gcamdata/R/zchunk_LA124.heat.R b/input/gcamdata/R/zenergy_L124.heat.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA124.heat.R
rename to input/gcamdata/R/zenergy_L124.heat.R
index 99e7542441..27e103e4b0 100644
--- a/input/gcamdata/R/zchunk_LA124.heat.R
+++ b/input/gcamdata/R/zenergy_L124.heat.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA124.heat
+#' module_energy_L124.heat
 #'
 #' Process historical heat data into input, output from district heat, output from CHP, CHP ratio
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr arrange distinct filter if_else group_by left_join mutate select summarise
 #' @importFrom tidyr complete nesting replace_na
 #' @author JDH April 2017
-module_energy_LA124.heat <- function(command, ...) {
+module_energy_L124.heat <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A_regions",
              FILE = "energy/A24.globaltech_coef",
diff --git a/input/gcamdata/R/zchunk_LA125.hydrogen.R b/input/gcamdata/R/zenergy_L125.hydrogen.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LA125.hydrogen.R
rename to input/gcamdata/R/zenergy_L125.hydrogen.R
index b14b63ebd5..5facf84a11 100644
--- a/input/gcamdata/R/zchunk_LA125.hydrogen.R
+++ b/input/gcamdata/R/zenergy_L125.hydrogen.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA125.hydrogen
+#' module_energy_L125.hydrogen
 #'
 #' Provides supply sector information, subsector information, technology information for hydrogen sectors.
 #'
@@ -21,7 +21,7 @@
 #           solar electrolysis, and wind electrolysis. See in line comments below for further detail.
 # ------------------------------------------------------------------------------
 #'
-module_energy_LA125.hydrogen <- function(command, ...) {
+module_energy_L125.hydrogen <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/H2A_IO_coef_data",
              FILE = "energy/H2A_NE_cost_data",
@@ -297,9 +297,9 @@ module_energy_LA125.hydrogen <- function(command, ...) {
       complete(nesting(sector.name, subsector.name, technology,minicam.energy.input), year = sort(unique(c(year, MODEL_BASE_YEARS, MODEL_FUTURE_YEARS)))) %>%
       arrange(sector.name, subsector.name, technology, minicam.energy.input, year) %>%
       group_by(sector.name, subsector.name, technology, minicam.energy.input) %>%
-      mutate(value = 1 / value) %>%
-      mutate(units = if_else(minicam.energy.input %in% c( 'water_td_ind_C','water_td_ind_W' ),'GJ H2 / M3 H2O','GJ H2 / GJ input')) %>%
-      mutate(improvement_to_2040 = (value[year == 2040] - value[year == 2015]) / value[year == 2015],
+      mutate(value = 1 / value,
+             units = if_else(minicam.energy.input %in% c( 'water_td_ind_C','water_td_ind_W' ),'GJ H2 / M3 H2O','GJ H2 / GJ input'),
+             improvement_to_2040 = (value[year == 2040] - value[year == 2015]) / value[year == 2015],
              improvement_rate = (1 + improvement_to_2040) ^ (1 / (2040 - 2015)) - 1) %>%
       ungroup() -> H2A_eff_improvement
 
@@ -383,14 +383,14 @@ module_energy_LA125.hydrogen <- function(command, ...) {
                                (year>=2015) ~ value[year == 2015]*(1 + improvement_rate) ^ (year - 2015),
                                year >= 2040 ~ value[year == 2040]*(1 + improvement_rate_post_2040)^(year - 2040)),
              value = case_when(technology == 'coal chemical' & year>2015~value[year == 2015]*(1 + improvement_rate) ^ (year - 2015),
-                               TRUE~value))%>%
-      mutate( improve_max = case_when( ( year >= 1975 ) ~ ( value[ year == 2015] * ( 1 + max_improvement ) ) ) ) %>%
-      mutate( value = if_else( value > improve_max & improvement_rate > 0, improve_max, value ), # set to max improvement value if exceeded
-              #for techs with negative improvement rates (i.e., consuming more input like electricity per unit over time, but presumably less primary input like natural gas),
-              #make 2040 value the "least efficient" they can get
-              value = case_when( improvement_rate < 0 & year >= 2040 ~ value[year == 2040],
-                                 improvement_rate < 0 & year < 2040 ~ value,
-                                 improvement_rate >= 0 ~ value )) %>%
+                               TRUE~value),
+             improve_max = case_when( ( year >= 1975 ) ~ ( value[ year == 2015] * ( 1 + max_improvement ) ) ),
+             value = if_else( value > improve_max & improvement_rate > 0, improve_max, value ), # set to max improvement value if exceeded
+             #for techs with negative improvement rates (i.e., consuming more input like electricity per unit over time, but presumably less primary input like natural gas),
+             #make 2040 value the "least efficient" they can get
+             value = case_when( improvement_rate < 0 & year >= 2040 ~ value[year == 2040],
+                                improvement_rate < 0 & year < 2040 ~ value,
+                                improvement_rate >= 0 ~ value )) %>%
       ungroup()-> H2A_eff_GCAM_years
 
     add_coal_and_bio_eff %>%
diff --git a/input/gcamdata/R/zchunk_LA126.distribution.R b/input/gcamdata/R/zenergy_L126.distribution.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA126.distribution.R
rename to input/gcamdata/R/zenergy_L126.distribution.R
index f80931d447..43a8f603c7 100644
--- a/input/gcamdata/R/zchunk_LA126.distribution.R
+++ b/input/gcamdata/R/zenergy_L126.distribution.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA126.distribution
+#' module_energy_L126.distribution
 #'
 #' Adjust for onsite, transmission, and distribution losses for electricity and gas. Energy input, output, and input/output ratio are calculated for the following three processes:
 #' \itemize{
@@ -21,7 +21,7 @@
 #' @importFrom dplyr filter group_by left_join mutate select summarise
 #' @importFrom tidyr replace_na
 #' @author AS May 2017
-module_energy_LA126.distribution <- function(command, ...) {
+module_energy_L126.distribution <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L1012.en_bal_EJ_R_Si_Fi_Yh",
              "L122.out_EJ_R_gasproc_F_Yh",
diff --git a/input/gcamdata/R/zchunk_LA131.enduse.R b/input/gcamdata/R/zenergy_L131.enduse.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA131.enduse.R
rename to input/gcamdata/R/zenergy_L131.enduse.R
index a0a10ff5d3..b1edec538b 100644
--- a/input/gcamdata/R/zchunk_LA131.enduse.R
+++ b/input/gcamdata/R/zenergy_L131.enduse.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA131.enduse
+#' module_energy_L131.enduse
 #'
 #' Generate the following two tables:
 #' \itemize{
@@ -19,7 +19,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by mutate select summarise
 #' @importFrom tidyr replace_na
 #' @author AJS May 2017
-module_energy_LA131.enduse <- function(command, ...) {
+module_energy_L131.enduse <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A_regions",
              FILE = "energy/mappings/enduse_sector_aggregation",
diff --git a/input/gcamdata/R/zchunk_LA132.industry.R b/input/gcamdata/R/zenergy_L132.industry.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA132.industry.R
rename to input/gcamdata/R/zenergy_L132.industry.R
index b67306c23a..f29d1bca04 100644
--- a/input/gcamdata/R/zchunk_LA132.industry.R
+++ b/input/gcamdata/R/zenergy_L132.industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA132.industry
+#' module_energy_L132.industry
 #'
 #' Provides industrial energy consumption (not including CHP) and industrial feedstock consumption by GCAM region/fuel/historical year.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr anti_join bind_rows filter group_by left_join mutate select summarise
 #' @author LF September 2017
-module_energy_LA132.industry <- function(command, ...) {
+module_energy_L132.industry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A_regions",
              FILE = "energy/mappings/enduse_fuel_aggregation",
diff --git a/input/gcamdata/R/zchunk_LA1321.cement.R b/input/gcamdata/R/zenergy_L1321.cement.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1321.cement.R
rename to input/gcamdata/R/zenergy_L1321.cement.R
index cfbad8dbc0..9797101118 100644
--- a/input/gcamdata/R/zchunk_LA1321.cement.R
+++ b/input/gcamdata/R/zenergy_L1321.cement.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1321.cement
+#' module_energy_L1321.cement
 #'
 #' Sets up input, output, and IO coefficients for cement and subtracts input energy from industry energy use
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr complete gather nesting
 #' @author CWR Nov 2017
-module_energy_LA1321.cement <- function(command, ...) {
+module_energy_L1321.cement <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "emissions/A_PrimaryFuelCCoef",
diff --git a/input/gcamdata/R/zchunk_LB1322.Fert.R b/input/gcamdata/R/zenergy_L1322.Fert.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB1322.Fert.R
rename to input/gcamdata/R/zenergy_L1322.Fert.R
index 69e261b713..abb0a26002 100644
--- a/input/gcamdata/R/zchunk_LB1322.Fert.R
+++ b/input/gcamdata/R/zenergy_L1322.Fert.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LB1322.Fert
+#' module_energy_L1322.Fert
 #'
 #' Compute fertilizer production and energy inputs by technology.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr filter group_by left_join mutate pull select summarise
 #' @importFrom tidyr complete fill gather replace_na spread
 #' @author AJS July 2017
-module_energy_LB1322.Fert <- function(command, ...) {
+module_energy_L1322.Fert <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LA1323.iron_steel.R b/input/gcamdata/R/zenergy_L1323.iron_steel.R
similarity index 95%
rename from input/gcamdata/R/zchunk_LA1323.iron_steel.R
rename to input/gcamdata/R/zenergy_L1323.iron_steel.R
index 0261a14526..c3bc503479 100644
--- a/input/gcamdata/R/zchunk_LA1323.iron_steel.R
+++ b/input/gcamdata/R/zenergy_L1323.iron_steel.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1323.iron_steel
+#' module_energy_L1323.iron_steel
 #'
 #' Sets up input, output, and IO coefficients for iron and steel and subtracts input energy from industry energy use
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr gather spread
 #' @author Yang Liu Sep 2019, Siddarth Durga April 2023
-module_energy_LA1323.iron_steel <- function(command, ...) {
+module_energy_L1323.iron_steel <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/steel_prod_process",
              FILE = "energy/steel_intensity",
@@ -65,19 +65,19 @@ module_energy_LA1323.iron_steel <- function(command, ...) {
       gather(year,value,-metric,-country_name)%>%
       spread(metric,value)%>%
       replace(is.na(.), 0) %>%
-      mutate(year = as.numeric(year))%>%
-      mutate(DRI_consumption=`DRI production`- `DRI exports` + `DRI imports`)%>%
-      mutate(DRI_consumption=ifelse(DRI_consumption<0,0,DRI_consumption))%>%
+      mutate(year = as.numeric(year),
+             DRI_consumption=`DRI production`- `DRI exports` + `DRI imports`,
+             DRI_consumption=ifelse(DRI_consumption<0,0,DRI_consumption))%>%
       select(country_name,year,DRI_consumption)-> DRI_stats
 
     #Calculate EAF-Scrap and EAF-DRI based steel production using DRI consumption data
     All_steel %>%
       left_join(DRI_stats,by=c("country_name","year")) %>%
       replace(is.na(.), 0) %>%
-      rename(`EAF with DRI`=DRI_consumption)%>%
-      mutate(`EAF with scrap`=EAF-`EAF with DRI`)%>%
-      mutate(`EAF with DRI`=ifelse(`EAF with scrap`<=0,EAF,`EAF with DRI`))%>%
-      mutate(`EAF with scrap`=ifelse(`EAF with scrap`<0,0,`EAF with scrap`))%>%
+      rename(`EAF with DRI`=DRI_consumption,
+             `EAF with scrap`=EAF-`EAF with DRI`,
+             `EAF with DRI`=ifelse(`EAF with scrap`<=0,EAF,`EAF with DRI`),
+             `EAF with scrap`=ifelse(`EAF with scrap`<0,0,`EAF with scrap`))%>%
       select(-EAF)%>%
       left_join(iso_GCAM_regID,by="country_name")%>%
       select(-GCAM_region_ID,-country_name,-region_GCAM3)-> All_steel
@@ -103,11 +103,11 @@ module_energy_LA1323.iron_steel <- function(command, ...) {
 
       #add a minimal steel production value (0.5% of the total) to technologies in the base-year where they are calibrated to zero
       All_steel %>%
-        mutate(BLASTFUR=ifelse(BLASTFUR==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,BLASTFUR))%>%
-        mutate(`EAF with scrap`=ifelse(`EAF with scrap`==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,`EAF with scrap`))%>%
-        mutate(`EAF with DRI`=ifelse(`EAF with DRI`==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,`EAF with DRI`))%>%
-        #calculate the percentage of BLASTFUR, EAF with scrap, and EAF with DRI across regions and years
-        mutate(BLASTFUR_pct=BLASTFUR/(BLASTFUR+`EAF with scrap`+`EAF with DRI`),
+        mutate(BLASTFUR=ifelse(BLASTFUR==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,BLASTFUR),
+               `EAF with scrap`=ifelse(`EAF with scrap`==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,`EAF with scrap`),
+               `EAF with DRI`=ifelse(`EAF with DRI`==0 & year == MODEL_FINAL_BASE_YEAR,(BLASTFUR+`EAF with scrap`+`EAF with DRI`)*0.005,`EAF with DRI`),
+               #calculate the percentage of BLASTFUR, EAF with scrap, and EAF with DRI across regions and years
+               BLASTFUR_pct=BLASTFUR/(BLASTFUR+`EAF with scrap`+`EAF with DRI`),
                EAF_scrap_pct=`EAF with scrap`/(BLASTFUR+`EAF with scrap`+`EAF with DRI`),
                EAF_DRI_pct=`EAF with DRI`/(BLASTFUR+`EAF with scrap`+`EAF with DRI`)) %>%
         #join the WSA total steel production data from LB1092.Tradebalance_iron_steel_Mt_R_Y
diff --git a/input/gcamdata/R/zchunk_LA1324.Off_road.R b/input/gcamdata/R/zenergy_L1324.Off_road.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1324.Off_road.R
rename to input/gcamdata/R/zenergy_L1324.Off_road.R
index 6b266507d6..b9ab80caf1 100644
--- a/input/gcamdata/R/zchunk_LA1324.Off_road.R
+++ b/input/gcamdata/R/zenergy_L1324.Off_road.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1324.Off_road
+#' module_energy_L1324.Off_road
 #'
 #' Sets up input, output, and IO coefficients for Off_road and subtracts input energy from industry energy use
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr gather spread
 #' @author Yang Liu Sep 2019
-module_energy_LA1324.Off_road <- function(command, ...) {
+module_energy_L1324.Off_road <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L1012.en_bal_EJ_R_Si_Fi_Yh",
              FILE = "energy/A_regions",
diff --git a/input/gcamdata/R/zchunk_LA1325.chemical.R b/input/gcamdata/R/zenergy_L1325.chemical.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1325.chemical.R
rename to input/gcamdata/R/zenergy_L1325.chemical.R
index d7d5153398..a18a812f82 100644
--- a/input/gcamdata/R/zchunk_LA1325.chemical.R
+++ b/input/gcamdata/R/zenergy_L1325.chemical.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1325.chemical
+#' module_energy_L1325.chemical
 #'
 #' Sets up input, output, and IO coefficients for chemical and subtracts input energy from industry energy use
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr gather spread
 #' @author Yang Liu Sep 2019
-module_energy_LA1325.chemical <- function(command, ...) {
+module_energy_L1325.chemical <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L1012.en_bal_EJ_R_Si_Fi_Yh",
 			       FILE = "energy/A_regions",
diff --git a/input/gcamdata/R/zchunk_LA1326.aluminum.R b/input/gcamdata/R/zenergy_L1326.aluminum.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA1326.aluminum.R
rename to input/gcamdata/R/zenergy_L1326.aluminum.R
index 96716748bf..9e930b0d22 100644
--- a/input/gcamdata/R/zchunk_LA1326.aluminum.R
+++ b/input/gcamdata/R/zenergy_L1326.aluminum.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA1326.aluminum
+#' module_energy_L1326.aluminum
 #'
 #' Sets up input, output, and IO coefficients for aluminum and subtracts input energy from industry energy use
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr gather spread
 #' @author Yang Liu Sep 2019
-module_energy_LA1326.aluminum <- function(command, ...) {
+module_energy_L1326.aluminum <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A_regions",
              FILE = "energy/mappings/enduse_fuel_aggregation",
diff --git a/input/gcamdata/R/zchunk_LA142.building_agg.R b/input/gcamdata/R/zenergy_L142.building_agg.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA142.building_agg.R
rename to input/gcamdata/R/zenergy_L142.building_agg.R
index 35d2bd8512..7014f361e1 100644
--- a/input/gcamdata/R/zchunk_LA142.building_agg.R
+++ b/input/gcamdata/R/zenergy_L142.building_agg.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA142.building_agg
+#' module_energy_L142.building_agg
 #'
 #' Calculate building sector energy consumption, producing the following output table: Building energy consumption by GCAM region / fuel / historical year
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter group_by left_join mutate pull select summarise
 #' @author AS May 2017
-module_energy_LA142.building_agg <- function(command, ...) {
+module_energy_L142.building_agg <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A_regions",
              FILE = "energy/mappings/enduse_fuel_aggregation",
diff --git a/input/gcamdata/R/zchunk_LA143.HDDCDD.R b/input/gcamdata/R/zenergy_L143.HDDCDD.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA143.HDDCDD.R
rename to input/gcamdata/R/zenergy_L143.HDDCDD.R
index cc16e83f80..ee2d3d0f0f 100644
--- a/input/gcamdata/R/zchunk_LA143.HDDCDD.R
+++ b/input/gcamdata/R/zenergy_L143.HDDCDD.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA143.HDDCDD
+#' module_energy_L143.HDDCDD
 #'
 #' Reads in country level heating and cooling degree day data and returns GCAM region degree days via population weighting
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate select summarise
 #' @author RH April 2017
-module_energy_LA143.HDDCDD <- function(command, ...) {
+module_energy_L143.HDDCDD <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/GIS_ctry",
diff --git a/input/gcamdata/R/zchunk_LA144.building_det_en.R b/input/gcamdata/R/zenergy_L144.building_det_en.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA144.building_det_en.R
rename to input/gcamdata/R/zenergy_L144.building_det_en.R
index e9ba4bc9ba..e4d699d019 100644
--- a/input/gcamdata/R/zchunk_LA144.building_det_en.R
+++ b/input/gcamdata/R/zenergy_L144.building_det_en.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA144.building_det_en
+#' module_energy_L144.building_det_en
 #'
 #' Calculates global detailed buildings energy data
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join lag mutate pull select summarise
 #' @importFrom tidyr complete replace_na
 #' @author AJS July 2017
-module_energy_LA144.building_det_en <- function(command, ...) {
+module_energy_L144.building_det_en <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LA144.building_det_flsp.R b/input/gcamdata/R/zenergy_L144.building_det_flsp.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA144.building_det_flsp.R
rename to input/gcamdata/R/zenergy_L144.building_det_flsp.R
index 5ce7d9e8bd..d51fe0b84b 100644
--- a/input/gcamdata/R/zchunk_LA144.building_det_flsp.R
+++ b/input/gcamdata/R/zenergy_L144.building_det_flsp.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA144.building_det_flsp
+#' module_energy_L144.building_det_flsp
 #'
 #' Calculate residential and commercial floorspace - and floorspace prices - by GCAM region and historical year.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join matches mutate pull select summarise
 #' @importFrom tidyr complete gather spread
 #' @author AJS July 2017
-module_energy_LA144.building_det_flsp <- function(command, ...) {
+module_energy_L144.building_det_flsp <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "common/GCAM_region_names",
@@ -318,8 +318,10 @@ module_energy_LA144.building_det_flsp <- function(command, ...) {
              Units="thous km2") %>%
       select(region,year,Units,value)
 
-    L144.hab_land_flsp_fin<-L144.hab_land_flsp %>%
-      filter(year==MODEL_FINAL_BASE_YEAR) %>%
+    L144.hab_land_flsp_fin <- L144.hab_land_flsp %>%
+      filter(year == if_else(MODEL_FINAL_BASE_YEAR > max(L144.hab_land_flsp$year),
+                             max(L144.hab_land_flsp$year),
+                             MODEL_FINAL_BASE_YEAR)) %>%
       select(-year) %>%
       repeat_add_columns(tibble(year = MODEL_FUTURE_YEARS)) %>%
       bind_rows(L144.hab_land_flsp) %>%
diff --git a/input/gcamdata/R/zchunk_LA152.transportation.R b/input/gcamdata/R/zenergy_L152.transportation.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LA152.transportation.R
rename to input/gcamdata/R/zenergy_L152.transportation.R
index 7f69a922fb..43a1f5a519 100644
--- a/input/gcamdata/R/zchunk_LA152.transportation.R
+++ b/input/gcamdata/R/zenergy_L152.transportation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA152.transportation
+#' module_energy_L152.transportation
 #'
 #' Calculate transportation sector energy consumption.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter group_by mutate select summarise
 #' @author BBL April 2017
-module_energy_LA152.transportation <- function(command, ...) {
+module_energy_L152.transportation <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/enduse_fuel_aggregation",
              FILE = "energy/mappings/enduse_sector_aggregation",
diff --git a/input/gcamdata/R/zchunk_LA154.transportation_UCD.R b/input/gcamdata/R/zenergy_L154.transportation_UCD.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA154.transportation_UCD.R
rename to input/gcamdata/R/zenergy_L154.transportation_UCD.R
index e2651178e6..ade038ee0b 100644
--- a/input/gcamdata/R/zchunk_LA154.transportation_UCD.R
+++ b/input/gcamdata/R/zenergy_L154.transportation_UCD.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA154.transportation_UCD
+#' module_energy_L154.transportation_UCD
 #'
 #' Generates transportation energy and other data using UCD transportation database and IEA data.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom data.table as.data.table setorderv rbindlist
 #' @importFrom rlang :=
 #' @author RH May 2017
-module_energy_LA154.transportation_UCD <- function(command, ...) {
+module_energy_L154.transportation_UCD <- function(command, ...) {
 
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_LA161.Cstorage.R b/input/gcamdata/R/zenergy_L161.Cstorage.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA161.Cstorage.R
rename to input/gcamdata/R/zenergy_L161.Cstorage.R
index d5fba9c3b0..48553ae16a 100644
--- a/input/gcamdata/R/zchunk_LA161.Cstorage.R
+++ b/input/gcamdata/R/zenergy_L161.Cstorage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA161.Cstorage
+#' module_energy_L161.Cstorage
 #'
 #' Build carbon storage supply curves by region.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter group_by mutate select summarise
 #' @importFrom tidyr gather
 #' @author RLH November 2017
-module_energy_LA161.Cstorage <- function(command, ...) {
+module_energy_L161.Cstorage <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "aglu/LDS/Land_type_area_ha",
diff --git a/input/gcamdata/R/zchunk_LA162.dac.R b/input/gcamdata/R/zenergy_L162.dac.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LA162.dac.R
rename to input/gcamdata/R/zenergy_L162.dac.R
index 1ac43507e3..a8de1a5308 100644
--- a/input/gcamdata/R/zchunk_LA162.dac.R
+++ b/input/gcamdata/R/zenergy_L162.dac.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LA162.dac
+#' module_energy_L162.dac
 #'
 #' Sets up input, output, and IO coefficients for dac
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select semi_join summarise summarise_all
 #' @importFrom tidyr complete gather nesting
 #' @author JF March 2021
-module_energy_LA162.dac <- function(command, ...) {
+module_energy_L162.dac <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L161.RsrcCurves_MtC_R"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_LB2011.ff_ALL_R_C_Y.R b/input/gcamdata/R/zenergy_L2011.ff_ALL_R_C_Y.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB2011.ff_ALL_R_C_Y.R
rename to input/gcamdata/R/zenergy_L2011.ff_ALL_R_C_Y.R
index dd551efe0a..8790ecf29a 100644
--- a/input/gcamdata/R/zchunk_LB2011.ff_ALL_R_C_Y.R
+++ b/input/gcamdata/R/zenergy_L2011.ff_ALL_R_C_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_LB2011.ff_ALL_R_C_Y
+#' module_energy_L2011.ff_ALL_R_C_Y
 #'
 #' Calculate fossil fuel energy balances, by region / commodity / year and harmonize GCAM's data to Comtrade's.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author JEH Nov 2019
-module_energy_LB2011.ff_ALL_R_C_Y <- function(command, ...) {
+module_energy_L2011.ff_ALL_R_C_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              "L1012.en_bal_EJ_R_Si_Fi_Yh",
diff --git a/input/gcamdata/R/zchunk_L202.Ccoef.R b/input/gcamdata/R/zenergy_L202.Ccoef.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L202.Ccoef.R
rename to input/gcamdata/R/zenergy_L202.Ccoef.R
diff --git a/input/gcamdata/R/zchunk_L210.resources.R b/input/gcamdata/R/zenergy_L210.resources.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L210.resources.R
rename to input/gcamdata/R/zenergy_L210.resources.R
diff --git a/input/gcamdata/R/zchunk_L221.en_supply.R b/input/gcamdata/R/zenergy_L221.en_supply.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L221.en_supply.R
rename to input/gcamdata/R/zenergy_L221.en_supply.R
diff --git a/input/gcamdata/R/zchunk_L222.en_transformation.R b/input/gcamdata/R/zenergy_L222.en_transformation.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L222.en_transformation.R
rename to input/gcamdata/R/zenergy_L222.en_transformation.R
diff --git a/input/gcamdata/R/zchunk_L223.electricity.R b/input/gcamdata/R/zenergy_L223.electricity.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L223.electricity.R
rename to input/gcamdata/R/zenergy_L223.electricity.R
diff --git a/input/gcamdata/R/zchunk_L2231.wind_update.R b/input/gcamdata/R/zenergy_L2231.wind_update.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2231.wind_update.R
rename to input/gcamdata/R/zenergy_L2231.wind_update.R
diff --git a/input/gcamdata/R/zchunk_L224.heat.R b/input/gcamdata/R/zenergy_L224.heat.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L224.heat.R
rename to input/gcamdata/R/zenergy_L224.heat.R
diff --git a/input/gcamdata/R/zchunk_L225.hydrogen.R b/input/gcamdata/R/zenergy_L225.hydrogen.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L225.hydrogen.R
rename to input/gcamdata/R/zenergy_L225.hydrogen.R
diff --git a/input/gcamdata/R/zchunk_L226.en_distribution.R b/input/gcamdata/R/zenergy_L226.en_distribution.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L226.en_distribution.R
rename to input/gcamdata/R/zenergy_L226.en_distribution.R
diff --git a/input/gcamdata/R/zchunk_L232.other_industry.R b/input/gcamdata/R/zenergy_L232.other_industry.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L232.other_industry.R
rename to input/gcamdata/R/zenergy_L232.other_industry.R
diff --git a/input/gcamdata/R/zchunk_L2321.cement.R b/input/gcamdata/R/zenergy_L2321.cement.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2321.cement.R
rename to input/gcamdata/R/zenergy_L2321.cement.R
diff --git a/input/gcamdata/R/zchunk_L2322.Fert.R b/input/gcamdata/R/zenergy_L2322.Fert.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2322.Fert.R
rename to input/gcamdata/R/zenergy_L2322.Fert.R
diff --git a/input/gcamdata/R/zchunk_L2323.iron_steel.R b/input/gcamdata/R/zenergy_L2323.iron_steel.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2323.iron_steel.R
rename to input/gcamdata/R/zenergy_L2323.iron_steel.R
diff --git a/input/gcamdata/R/zchunk_L2324.Off_road.R b/input/gcamdata/R/zenergy_L2324.Off_road.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2324.Off_road.R
rename to input/gcamdata/R/zenergy_L2324.Off_road.R
diff --git a/input/gcamdata/R/zchunk_L2325.chemical.R b/input/gcamdata/R/zenergy_L2325.chemical.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2325.chemical.R
rename to input/gcamdata/R/zenergy_L2325.chemical.R
diff --git a/input/gcamdata/R/zchunk_L2326.aluminum.R b/input/gcamdata/R/zenergy_L2326.aluminum.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2326.aluminum.R
rename to input/gcamdata/R/zenergy_L2326.aluminum.R
diff --git a/input/gcamdata/R/zchunk_L238.iron_steel_trade.R b/input/gcamdata/R/zenergy_L238.iron_steel_trade.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L238.iron_steel_trade.R
rename to input/gcamdata/R/zenergy_L238.iron_steel_trade.R
diff --git a/input/gcamdata/R/zchunk_L239.ff_trade.R b/input/gcamdata/R/zenergy_L239.ff_trade.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L239.ff_trade.R
rename to input/gcamdata/R/zenergy_L239.ff_trade.R
diff --git a/input/gcamdata/R/zchunk_L2391.gas_trade_flows.R b/input/gcamdata/R/zenergy_L2391.gas_trade_flows.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2391.gas_trade_flows.R
rename to input/gcamdata/R/zenergy_L2391.gas_trade_flows.R
diff --git a/input/gcamdata/R/zchunk_L2392.gas_trade.R b/input/gcamdata/R/zenergy_L2392.gas_trade.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2392.gas_trade.R
rename to input/gcamdata/R/zenergy_L2392.gas_trade.R
diff --git a/input/gcamdata/R/zchunk_L242.building_agg.R b/input/gcamdata/R/zenergy_L242.building_agg.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L242.building_agg.R
rename to input/gcamdata/R/zenergy_L242.building_agg.R
diff --git a/input/gcamdata/R/zchunk_L244.building_det.R b/input/gcamdata/R/zenergy_L244.building_det.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L244.building_det.R
rename to input/gcamdata/R/zenergy_L244.building_det.R
diff --git a/input/gcamdata/R/zchunk_L252.transportation.R b/input/gcamdata/R/zenergy_L252.transportation.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L252.transportation.R
rename to input/gcamdata/R/zenergy_L252.transportation.R
diff --git a/input/gcamdata/R/zchunk_L254.transportation_UCD.R b/input/gcamdata/R/zenergy_L254.transportation_UCD.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L254.transportation_UCD.R
rename to input/gcamdata/R/zenergy_L254.transportation_UCD.R
diff --git a/input/gcamdata/R/zchunk_L261.Cstorage.R b/input/gcamdata/R/zenergy_L261.Cstorage.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L261.Cstorage.R
rename to input/gcamdata/R/zenergy_L261.Cstorage.R
diff --git a/input/gcamdata/R/zchunk_L262.dac.R b/input/gcamdata/R/zenergy_L262.dac.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L262.dac.R
rename to input/gcamdata/R/zenergy_L262.dac.R
diff --git a/input/gcamdata/R/zchunk_L270.limits.R b/input/gcamdata/R/zenergy_L270.limits.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L270.limits.R
rename to input/gcamdata/R/zenergy_L270.limits.R
diff --git a/input/gcamdata/R/zchunk_batch_Ccoef_xml.R b/input/gcamdata/R/zenergy_xml_Ccoef.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_Ccoef_xml.R
rename to input/gcamdata/R/zenergy_xml_Ccoef.R
index 0678b5d098..79de3af924 100644
--- a/input/gcamdata/R/zchunk_batch_Ccoef_xml.R
+++ b/input/gcamdata/R/zenergy_xml_Ccoef.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_Ccoef_xml
+#' module_energy_Ccoef_xml
 #'
 #' Construct XML data structure for \code{Ccoef.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{Ccoef.xml}. The corresponding file in the
 #' original data system was \code{batch_Ccoef_xml.R} (energy XML).
-module_energy_batch_Ccoef_xml <- function(command, ...) {
+module_energy_Ccoef_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L202.CarbonCoef"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_Cstorage_xml.R b/input/gcamdata/R/zenergy_xml_Cstorage.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_Cstorage_xml.R
rename to input/gcamdata/R/zenergy_xml_Cstorage.R
index 24f6ee6d43..1bee74f5d6 100644
--- a/input/gcamdata/R/zchunk_batch_Cstorage_xml.R
+++ b/input/gcamdata/R/zenergy_xml_Cstorage.R
@@ -1,7 +1,6 @@
-
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_Cstorage.xml
+#' module_energy_Cstorage.xml
 #'
 #' Construct XML data structure for \code{Cstorage.xml}.
 #'
@@ -11,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{Cstorage.xml}. The corresponding file in the
 #' original data system was \code{batch_Cstorage.xml.R} (energy XML).
-module_energy_batch_Cstorage_xml <- function(command, ...) {
+module_energy_Cstorage_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.Rsrc",
               "L261.UnlimitRsrc",
diff --git a/input/gcamdata/R/zchunk_batch_HDDCDD_xml.R b/input/gcamdata/R/zenergy_xml_HDDCDD.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_HDDCDD_xml.R
rename to input/gcamdata/R/zenergy_xml_HDDCDD.R
index d6f6cefb80..4d4fd6945a 100644
--- a/input/gcamdata/R/zchunk_batch_HDDCDD_xml.R
+++ b/input/gcamdata/R/zenergy_xml_HDDCDD.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_HDDCDD_xml
+#' module_energy_HDDCDD_xml
 #'
 #' Construct XML data structure for all the \code{HDDCDD.xml} files.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{HDDCDD_A2_CCSM3x.xml}, \code{HDDCDD_A2_HadCM3.xml}, \code{HDDCDD_B1_CCSM3x.xml},
 #' \code{HDDCDD_B1_HadCM3.xml}, and \code{HDDCDD_constdd_no_GCM.xml}.
-module_energy_batch_HDDCDD_xml <- function(command, ...) {
+module_energy_HDDCDD_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.HDDCDD_A2_CCSM3x",
              "L244.HDDCDD_A2_HadCM3",
diff --git a/input/gcamdata/R/zchunk_batch_Off_road_xml.R b/input/gcamdata/R/zenergy_xml_Off_road.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_Off_road_xml.R
rename to input/gcamdata/R/zenergy_xml_Off_road.R
index 696e0041e2..bacec98d9a 100644
--- a/input/gcamdata/R/zchunk_batch_Off_road_xml.R
+++ b/input/gcamdata/R/zenergy_xml_Off_road.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_Off_road_xml
+#' module_energy_Off_road_xml
 #'
 #' Construct XML data structure for \code{Off_road.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{Off_road.xml}. The corresponding file in the
 #' original data system was \code{batch_Off_road_xml.R} (energy XML).
-module_energy_batch_Off_road_xml <- function(command, ...) {
+module_energy_Off_road_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2324.Supplysector_Off_road",
              "L2324.FinalEnergyKeyword_Off_road",
diff --git a/input/gcamdata/R/zchunk_batch_Off_road_SSP_xml.R b/input/gcamdata/R/zenergy_xml_Off_road_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_Off_road_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_Off_road_SSP.R
index 1a18bb80be..d0950816d4 100644
--- a/input/gcamdata/R/zchunk_batch_Off_road_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_Off_road_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_Off_road_incelas_SSP_xml
+#' module_energy_Off_road_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{Off_road_incelas_SSP.xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{Off_road_incelas_gcam3.xml}, \code{Off_road_incelas_ssp1.xml}, \code{Off_road_incelas_ssp2.xml}, \code{Off_road_incelas_ssp3.xml},
 #' \code{Off_road_incelas_ssp4.xml}, \code{Off_road_incelas_ssp5.xml}, \code{Off_road_incelas_gssp1.xml}, \code{Off_road_incelas_gssp2.xml},
 #' \code{Off_road_incelas_gssp3.xml}, \code{Off_road_incelas_gssp4.xml}, and \code{Off_road_incelas_gssp5.xml}.
-module_energy_batch_Off_road_incelas_SSP_xml <- function(command, ...) {
+module_energy_Off_road_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_aluminum_xml.R b/input/gcamdata/R/zenergy_xml_aluminum.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_aluminum_xml.R
rename to input/gcamdata/R/zenergy_xml_aluminum.R
index d52bbf73ee..4654543521 100644
--- a/input/gcamdata/R/zchunk_batch_aluminum_xml.R
+++ b/input/gcamdata/R/zenergy_xml_aluminum.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_aluminum_xml
+#' module_energy_aluminum_xml
 #'
 #' Construct XML data structure for \code{aluminum.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{aluminum.xml}. The corresponding file in the
 #' original data system was \code{batch_aluminum_xml.R} (energy XML).
-module_energy_batch_aluminum_xml <- function(command, ...) {
+module_energy_aluminum_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2326.Supplysector_aluminum",
              "L2326.FinalEnergyKeyword_aluminum",
diff --git a/input/gcamdata/R/zchunk_batch_aluminum_SSP_xml.R b/input/gcamdata/R/zenergy_xml_aluminum_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_aluminum_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_aluminum_SSP.R
index da0730708c..fb4994855d 100644
--- a/input/gcamdata/R/zchunk_batch_aluminum_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_aluminum_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_aluminum_incelas_SSP_xml
+#' module_energy_aluminum_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{aluminum_incelas_SSP.xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{aluminum_incelas_gcam3.xml}, \code{aluminum_incelas_ssp1.xml}, \code{aluminum_incelas_ssp2.xml}, \code{aluminum_incelas_ssp3.xml},
 #' \code{aluminum_incelas_ssp4.xml}, \code{aluminum_incelas_ssp5.xml}, \code{aluminum_incelas_gssp1.xml}, \code{aluminum_incelas_gssp2.xml},
 #' \code{aluminum_incelas_gssp3.xml}, \code{aluminum_incelas_gssp4.xml}, and \code{aluminum_incelas_gssp5.xml}.
-module_energy_batch_aluminum_incelas_SSP_xml <- function(command, ...) {
+module_energy_aluminum_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_bio_externality_cost_xml.R b/input/gcamdata/R/zenergy_xml_bio_externality_cost.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_bio_externality_cost_xml.R
rename to input/gcamdata/R/zenergy_xml_bio_externality_cost.R
index 3730a892f2..ac496dc01b 100644
--- a/input/gcamdata/R/zchunk_batch_bio_externality_cost_xml.R
+++ b/input/gcamdata/R/zenergy_xml_bio_externality_cost.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_bio_externality_xml
+#' module_energy_bio_externality_xml
 #'
 #' Construct XML data structure for \code{bio_externality.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{bio_externality.xml}. The corresponding file in the
 #' original data system was \code{L270.limits.R} (energy XML).
-module_energy_batch_bio_externality_xml <- function(command, ...) {
+module_energy_bio_externality_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L270.RenewRsrc",
              "L270.RenewRsrcPrice",
diff --git a/input/gcamdata/R/zchunk_batch_building_SSP_xml.R b/input/gcamdata/R/zenergy_xml_building_SSP.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_building_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_building_SSP.R
index b49aba6132..20b9dd2d07 100644
--- a/input/gcamdata/R/zchunk_batch_building_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_building_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_building_SSP_xml
+#' module_energy_building_SSP_xml
 #'
 #' Construct XML data structure for all the \code{building_SSP.xml} files.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{building_SSP1.xml}, \code{building_SSP2.xml}, \code{building_SSP3.xml},
 #' \code{building_SSP4.xml},and \code{building_SSP5.xml}.
-module_energy_batch_building_SSP_xml <- function(command, ...) {
+module_energy_building_SSP_xml <- function(command, ...) {
   SSP_NUMS <- seq(1, 5)
   fuelpref_NUMS <- c("1" = "15", "3" = "3", "4" = "4", "5" = "15")
 
diff --git a/input/gcamdata/R/zchunk_batch_building_agg_xml.R b/input/gcamdata/R/zenergy_xml_building_agg.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_building_agg_xml.R
rename to input/gcamdata/R/zenergy_xml_building_agg.R
index 2b5bf03548..8932a1a395 100644
--- a/input/gcamdata/R/zchunk_batch_building_agg_xml.R
+++ b/input/gcamdata/R/zenergy_xml_building_agg.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_building_agg_xml
+#' module_energy_building_agg_xml
 #'
 #' Construct XML data structure for \code{building_agg.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{building_agg.xml}. The corresponding file in the
 #' original data system was \code{batch_building_agg.xml.R} (energy XML).
-module_energy_batch_building_agg_xml <- function(command, ...) {
+module_energy_building_agg_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L242.Supplysector_bld",
               "L242.FinalEnergyKeyword_bld",
diff --git a/input/gcamdata/R/zchunk_batch_building_det_xml.R b/input/gcamdata/R/zenergy_xml_building_det.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_building_det_xml.R
rename to input/gcamdata/R/zenergy_xml_building_det.R
index 060ad50ff0..92bce711d7 100644
--- a/input/gcamdata/R/zchunk_batch_building_det_xml.R
+++ b/input/gcamdata/R/zenergy_xml_building_det.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_building_det_xml
+#' module_energy_building_det_xml
 #'
 #' Construct XML data structure for \code{building_det.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{building_det.xml}. The corresponding file in the
 #' original data system was \code{batch_building_det.xml} (energy XML).
-module_energy_batch_building_det_xml <- function(command, ...) {
+module_energy_building_det_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.SubsectorInterpTo_bld",
              "L244.SubsectorInterp_bld",
diff --git a/input/gcamdata/R/zchunk_batch_ccs_supply_high_xml.R b/input/gcamdata/R/zenergy_xml_ccs_supply_high.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ccs_supply_high_xml.R
rename to input/gcamdata/R/zenergy_xml_ccs_supply_high.R
index 6475b7cba6..c98cf9daca 100644
--- a/input/gcamdata/R/zchunk_batch_ccs_supply_high_xml.R
+++ b/input/gcamdata/R/zenergy_xml_ccs_supply_high.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_ccs_supply_high_xml
+#' module_energy_ccs_supply_high_xml
 #'
 #' Construct XML data structure for \code{ccs_supply_high.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ccs_supply_high.xml}. The corresponding file in the
 #' original data system was \code{batch_ccs_supply_high.xml.R} (energy XML).
-module_energy_batch_ccs_supply_high_xml <- function(command, ...) {
+module_energy_ccs_supply_high_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.RsrcCurves_C_high"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ccs_supply_low_xml.R b/input/gcamdata/R/zenergy_xml_ccs_supply_low.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ccs_supply_low_xml.R
rename to input/gcamdata/R/zenergy_xml_ccs_supply_low.R
index 59b8bfcf34..5b7dc17fa6 100644
--- a/input/gcamdata/R/zchunk_batch_ccs_supply_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_ccs_supply_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_ccs_supply_low_xml
+#' module_energy_ccs_supply_low_xml
 #'
 #' Construct XML data structure for \code{ccs_supply_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ccs_supply_low.xml}. The corresponding file in the
 #' original data system was \code{batch_ccs_supply_low.xml.R} (energy XML).
-module_energy_batch_ccs_supply_low_xml <- function(command, ...) {
+module_energy_ccs_supply_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.RsrcCurves_C_low"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_ccs_supply_lowest_xml.R b/input/gcamdata/R/zenergy_xml_ccs_supply_lowest.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_ccs_supply_lowest_xml.R
rename to input/gcamdata/R/zenergy_xml_ccs_supply_lowest.R
index f8ac40ee7a..df1ef51c61 100644
--- a/input/gcamdata/R/zchunk_batch_ccs_supply_lowest_xml.R
+++ b/input/gcamdata/R/zenergy_xml_ccs_supply_lowest.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_ccs_supply_lowest_xml
+#' module_energy_ccs_supply_lowest_xml
 #'
 #' Construct XML data structure for \code{ccs_supply_lowest.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ccs_supply_lowest.xml}. The corresponding file in the
 #' original data system was \code{batch_ccs_supply_lowest.xml.R} (energy XML).
-module_energy_batch_ccs_supply_lowest_xml <- function(command, ...) {
+module_energy_ccs_supply_lowest_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.RsrcCurves_C_lowest"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_cement_xml.R b/input/gcamdata/R/zenergy_xml_cement.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_cement_xml.R
rename to input/gcamdata/R/zenergy_xml_cement.R
index ba040e81a5..3f5675743b 100644
--- a/input/gcamdata/R/zchunk_batch_cement_xml.R
+++ b/input/gcamdata/R/zenergy_xml_cement.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_cement_xml
+#' module_energy_cement_xml
 #'
 #' Construct XML data structure for \code{cement.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{cement.xml}. The corresponding file in the
 #' original data system was \code{batch_cement_xml.R} (energy XML).
-module_energy_batch_cement_xml <- function(command, ...) {
+module_energy_cement_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2321.Supplysector_cement",
              "L2321.FinalEnergyKeyword_cement",
diff --git a/input/gcamdata/R/zchunk_batch_cement_SSP_xml.R b/input/gcamdata/R/zenergy_xml_cement_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_cement_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_cement_SSP.R
index 7af38f1a27..c326a946da 100644
--- a/input/gcamdata/R/zchunk_batch_cement_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_cement_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_cement_incelas_SSP_xml
+#' module_energy_cement_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{cement_incelas_SSP.xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{cement_incelas_gcam3.xml}, \code{cement_incelas_ssp1.xml}, \code{cement_incelas_ssp2.xml}, \code{cement_incelas_ssp3.xml},
 #' \code{cement_incelas_ssp4.xml}, \code{cement_incelas_ssp5.xml}, \code{cement_incelas_gssp1.xml}, \code{cement_incelas_gssp2.xml},
 #' \code{cement_incelas_gssp3.xml}, \code{cement_incelas_gssp4.xml}, and \code{cement_incelas_gssp5.xml}.
-module_energy_batch_cement_incelas_SSP_xml <- function(command, ...) {
+module_energy_cement_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_chemical_xml.R b/input/gcamdata/R/zenergy_xml_chemical.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_chemical_xml.R
rename to input/gcamdata/R/zenergy_xml_chemical.R
index 81a17aa874..5d1621205e 100644
--- a/input/gcamdata/R/zchunk_batch_chemical_xml.R
+++ b/input/gcamdata/R/zenergy_xml_chemical.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_chemical_xml
+#' module_energy_chemical_xml
 #'
 #' Construct XML data structure for \code{chemical.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{chemical.xml}. The corresponding file in the
 #' original data system was \code{batch_chemical_xml.R} (energy XML).
-module_energy_batch_chemical_xml <- function(command, ...) {
+module_energy_chemical_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2325.Supplysector_chemical",
              "L2325.FinalEnergyKeyword_chemical",
diff --git a/input/gcamdata/R/zchunk_batch_chemical_SSP_xml.R b/input/gcamdata/R/zenergy_xml_chemical_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_chemical_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_chemical_SSP.R
index 48a40e4624..2b98c7dd91 100644
--- a/input/gcamdata/R/zchunk_batch_chemical_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_chemical_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_chemical_incelas_SSP_xml
+#' module_energy_chemical_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{chemical_incelas_SSP.xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{chemical_incelas_gcam3.xml}, \code{chemical_incelas_ssp1.xml}, \code{chemical_incelas_ssp2.xml}, \code{chemical_incelas_ssp3.xml},
 #' \code{chemical_incelas_ssp4.xml}, \code{chemical_incelas_ssp5.xml}, \code{chemical_incelas_gssp1.xml}, \code{chemical_incelas_gssp2.xml},
 #' \code{chemical_incelas_gssp3.xml}, \code{chemical_incelas_gssp4.xml}, and \code{chemical_incelas_gssp5.xml}.
-module_energy_batch_chemical_incelas_SSP_xml <- function(command, ...) {
+module_energy_chemical_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_dac_xml.R b/input/gcamdata/R/zenergy_xml_dac.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_dac_xml.R
rename to input/gcamdata/R/zenergy_xml_dac.R
index c83756b40e..0738a16234 100644
--- a/input/gcamdata/R/zchunk_batch_dac_xml.R
+++ b/input/gcamdata/R/zenergy_xml_dac.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_dac_xml
+#' module_energy_dac_xml
 #'
 #' Construct XML data structure for \code{dac.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{dac.xml}. The corresponding file in the
 #' original data system was \code{batch_dac_xml.R} (energy XML).
 #' @author JF March 2021
-module_energy_batch_dac_xml <- function(command, ...) {
+module_energy_dac_xml <- function(command, ...) {
 
 
   TECH_PARAMETRIZATION_INPUTS <- paste0("ssp", 1:5)
diff --git a/input/gcamdata/R/zchunk_batch_elec_bio_low_xml.R b/input/gcamdata/R/zenergy_xml_elec_bio_low.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_elec_bio_low_xml.R
rename to input/gcamdata/R/zenergy_xml_elec_bio_low.R
index 34f02eef9e..62a764c6cd 100644
--- a/input/gcamdata/R/zchunk_batch_elec_bio_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_elec_bio_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_elec_bio_low_xml
+#' module_energy_elec_bio_low_xml
 #'
 #' Construct XML data structure for \code{elec_bio_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elec_bio_low.xml}. The corresponding file in the
 #' original data system was \code{batch_elec_bio_low_xml.R} (energy XML).
-module_energy_batch_elec_bio_low_xml <- function(command, ...) {
+module_energy_elec_bio_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_bio_low"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_electricity_xml.R b/input/gcamdata/R/zenergy_xml_electricity.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_electricity_xml.R
rename to input/gcamdata/R/zenergy_xml_electricity.R
index 1cd173bea9..168a3cb5b6 100644
--- a/input/gcamdata/R/zchunk_batch_electricity_xml.R
+++ b/input/gcamdata/R/zenergy_xml_electricity.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_electricity_xml
+#' module_energy_electricity_xml
 #'
 #' Construct XML data structure for \code{electricity.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electricity.xml}. The corresponding file in the
 #' original data system was \code{batch_electricity.xml.R} (energy XML).
-module_energy_batch_electricity_xml <- function(command, ...) {
+module_energy_electricity_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.Supplysector_elec",
               "L223.ElecReserve",
diff --git a/input/gcamdata/R/zchunk_batch_en_Fert_xml.R b/input/gcamdata/R/zenergy_xml_en_Fert.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_en_Fert_xml.R
rename to input/gcamdata/R/zenergy_xml_en_Fert.R
index b67542506e..e17a409b8a 100644
--- a/input/gcamdata/R/zchunk_batch_en_Fert_xml.R
+++ b/input/gcamdata/R/zenergy_xml_en_Fert.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_en_Fert_xml
+#' module_energy_en_Fert_xml
 #'
 #' Construct XML data structure for \code{en_Fert.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_Fert.xml}. The corresponding file in the
 #' original data system was \code{batch_en_Fert_xml.R} (energy XML).
-module_energy_batch_en_Fert_xml <- function(command, ...) {
+module_energy_en_Fert_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2322.Supplysector_Fert",
              "L2322.FinalEnergyKeyword_Fert",
diff --git a/input/gcamdata/R/zchunk_batch_en_distribution_xml.R b/input/gcamdata/R/zenergy_xml_en_distribution.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_en_distribution_xml.R
rename to input/gcamdata/R/zenergy_xml_en_distribution.R
index acca8114a2..96a38dc832 100644
--- a/input/gcamdata/R/zchunk_batch_en_distribution_xml.R
+++ b/input/gcamdata/R/zenergy_xml_en_distribution.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_en_distribution_xml
+#' module_energy_en_distribution_xml
 #'
 #' Construct XML data structure for \code{en_distribution.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_distribution.xml}. The corresponding file in the
 #' original data system was \code{batch_en_distribution.xml.R} (energy XML).
-module_energy_batch_en_distribution_xml <- function(command, ...) {
+module_energy_en_distribution_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L226.Supplysector_en",
               "L226.SubsectorLogit_en",
diff --git a/input/gcamdata/R/zchunk_batch_en_supply_xml.R b/input/gcamdata/R/zenergy_xml_en_supply.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_en_supply_xml.R
rename to input/gcamdata/R/zenergy_xml_en_supply.R
index 6bb7a56708..b1dd088dd5 100644
--- a/input/gcamdata/R/zchunk_batch_en_supply_xml.R
+++ b/input/gcamdata/R/zenergy_xml_en_supply.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_en_supply_xml
+#' module_energy_en_supply_xml
 #'
 #' Construct XML data structure for \code{en_supply.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_supply.xml}. The corresponding file in the
 #' original data system was \code{batch_en_supply_xml.R} (energy XML).
-module_energy_batch_en_supply_xml <- function(command, ...) {
+module_energy_en_supply_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L221.Supplysector_en",
              "L221.SectorUseTrialMarket_en",
diff --git a/input/gcamdata/R/zchunk_batch_en_transformation_xml.R b/input/gcamdata/R/zenergy_xml_en_transformation.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_en_transformation_xml.R
rename to input/gcamdata/R/zenergy_xml_en_transformation.R
index ee3e1ec85a..8ecbfc034b 100644
--- a/input/gcamdata/R/zchunk_batch_en_transformation_xml.R
+++ b/input/gcamdata/R/zenergy_xml_en_transformation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_en_transformation_xml
+#' module_energy_en_transformation_xml
 #'
 #' Construct XML data structure for \code{en_transformation.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_transformation.xml}. The corresponding file in the
 #' original data system was \code{batch_en_transformation.xml.R} (energy XML).
-module_energy_batch_en_transformation_xml <- function(command, ...) {
+module_energy_en_transformation_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L222.Supplysector_en",
              "L222.SectorUseTrialMarket_en",
diff --git a/input/gcamdata/R/zchunk_batch_en_transformation_low_xml.R b/input/gcamdata/R/zenergy_xml_en_transformation_low.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_en_transformation_low_xml.R
rename to input/gcamdata/R/zenergy_xml_en_transformation_low.R
index 38de8069c1..b795c86aa0 100644
--- a/input/gcamdata/R/zchunk_batch_en_transformation_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_en_transformation_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_en_transformation_low_xml
+#' module_energy_en_transformation_low_xml
 #'
 #' Construct XML data structure for \code{en_transformation_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_transformation_low.xml}. The corresponding file in the
 #' original data system was \code{batch_en_transformation_low.xml.R} (energy XML).
-module_energy_batch_en_transformation_low_xml <- function(command, ...) {
+module_energy_en_transformation_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L222.GlobalTechCost_low_en"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_gas_trade_xml.R b/input/gcamdata/R/zenergy_xml_gas_trade.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_gas_trade_xml.R
rename to input/gcamdata/R/zenergy_xml_gas_trade.R
index fbe0f0de3b..691fb66716 100644
--- a/input/gcamdata/R/zchunk_batch_gas_trade_xml.R
+++ b/input/gcamdata/R/zenergy_xml_gas_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_gas_trade_xml
+#' module_energy_gas_trade_xml
 #'
 #' Construct XML data structure for \code{gas_trade.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{gas_trade.xml}. The corresponding file in the
 #' original data system was \code{batch_en_supply_xml.R} (energy XML).
-module_energy_batch_gas_trade_xml <- function(command, ...) {
+module_energy_gas_trade_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2392.Delete_Supplysector_tra_NG",
              "L2392.Delete_Supplysector_reg_NG",
diff --git a/input/gcamdata/R/zchunk_batch_geo_adv_xml.R b/input/gcamdata/R/zenergy_xml_geo_adv.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_geo_adv_xml.R
rename to input/gcamdata/R/zenergy_xml_geo_adv.R
index d4cdc1391c..310f6a39d5 100644
--- a/input/gcamdata/R/zchunk_batch_geo_adv_xml.R
+++ b/input/gcamdata/R/zenergy_xml_geo_adv.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_geo_adv_xml
+#' module_energy_geo_adv_xml
 #'
 #' Construct XML data structure for \code{geo_adv.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{geo_adv.xml}. The corresponding file in the
 #' original data system was \code{batch_geo_adv_xml.R} (energy XML).
-module_energy_batch_geo_adv_xml <- function(command, ...) {
+module_energy_geo_adv_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L210.GrdRenewRsrcCurves_EGS",
              "L210.GrdRenewRsrcMax_EGS",
diff --git a/input/gcamdata/R/zchunk_batch_geo_low_xml.R b/input/gcamdata/R/zenergy_xml_geo_low.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_geo_low_xml.R
rename to input/gcamdata/R/zenergy_xml_geo_low.R
index 024b05d70e..f998272575 100644
--- a/input/gcamdata/R/zchunk_batch_geo_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_geo_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_geo_low_xml
+#' module_energy_geo_low_xml
 #'
 #' Construct XML data structure for \code{geo_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{geo_low.xml}. The corresponding file in the
 #' original data system was \code{batch_geo_low_xml.R} (energy XML).
-module_energy_batch_geo_low_xml <- function(command, ...) {
+module_energy_geo_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_geo_low"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_geo_tech_adv_xml.R b/input/gcamdata/R/zenergy_xml_geo_tech_adv.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_geo_tech_adv_xml.R
rename to input/gcamdata/R/zenergy_xml_geo_tech_adv.R
index 3368edc3a2..9cb5b14240 100644
--- a/input/gcamdata/R/zchunk_batch_geo_tech_adv_xml.R
+++ b/input/gcamdata/R/zenergy_xml_geo_tech_adv.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_geo_tech_adv_xml
+#' module_energy_geo_tech_adv_xml
 #'
 #' Construct XML data structure for \code{geo_tech_adv.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{geo_tech_adv.xml}. The corresponding file in the
 #' original data system was \code{batch_geo_tech_adv_xml.R} (energy XML).
-module_energy_batch_geo_tech_adv_xml <- function(command, ...) {
+module_energy_geo_tech_adv_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_geo_adv"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_heat_xml.R b/input/gcamdata/R/zenergy_xml_heat.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_heat_xml.R
rename to input/gcamdata/R/zenergy_xml_heat.R
index 7ebcf16b44..5556b20ffb 100644
--- a/input/gcamdata/R/zchunk_batch_heat_xml.R
+++ b/input/gcamdata/R/zenergy_xml_heat.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_heat_xml
+#' module_energy_heat_xml
 #'
 #' Construct XML data structure for \code{heat.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{heat.xml}. The corresponding file in the
 #' original data system was \code{batch_heat.xml.R} (energy XML).
-module_energy_batch_heat_xml <- function(command, ...) {
+module_energy_heat_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L224.Supplysector_heat",
              "L224.SubsectorLogit_heat",
diff --git a/input/gcamdata/R/zchunk_batch_high_cost_ccs_xml.R b/input/gcamdata/R/zenergy_xml_high_cost_ccs.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_high_cost_ccs_xml.R
rename to input/gcamdata/R/zenergy_xml_high_cost_ccs.R
index 69bbb24a8b..b0deec569b 100644
--- a/input/gcamdata/R/zchunk_batch_high_cost_ccs_xml.R
+++ b/input/gcamdata/R/zenergy_xml_high_cost_ccs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_high_cost_ccs_xml
+#' module_energy_high_cost_ccs_xml
 #'
 #' Construct XML data structure for \code{high_cost_ccs.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{high_cost_ccs.xml}. The corresponding file in the
 #' original data system was \code{batch_high_cost_ccs.xml.R} (energy XML).
-module_energy_batch_high_cost_ccs_xml <- function(command, ...) {
+module_energy_high_cost_ccs_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.GlobalTechCost_C_High"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_hydrogen_xml.R b/input/gcamdata/R/zenergy_xml_hydrogen.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_hydrogen_xml.R
rename to input/gcamdata/R/zenergy_xml_hydrogen.R
index 97cbdd18cf..28b31ec956 100644
--- a/input/gcamdata/R/zchunk_batch_hydrogen_xml.R
+++ b/input/gcamdata/R/zenergy_xml_hydrogen.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_hydrogen_xml
+#' module_energy_hydrogen_xml
 #'
 #' Construct XML data structure for \code{hydrogen.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{hydrogen.xml}. The corresponding file in the
 #' original data system was \code{batch_hydrogen.xml.R} (energy XML).
-module_energy_batch_hydrogen_xml <- function(command, ...) {
+module_energy_hydrogen_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L225.Supplysector_h2",
              "L225.SectorUseTrialMarket_h2",
diff --git a/input/gcamdata/R/zchunk_batch_iron_steel_xml.R b/input/gcamdata/R/zenergy_xml_iron_steel.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_iron_steel_xml.R
rename to input/gcamdata/R/zenergy_xml_iron_steel.R
index 8bcce55dd3..46c349dc30 100644
--- a/input/gcamdata/R/zchunk_batch_iron_steel_xml.R
+++ b/input/gcamdata/R/zenergy_xml_iron_steel.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_iron_steel_xml
+#' module_energy_iron_steel_xml
 #'
 #' Construct XML data structure for \code{iron_steel.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{iron_steel.xml}. The corresponding file in the
 #' original data system was \code{batch_iron_steel_xml.R} (energy XML).
-module_energy_batch_iron_steel_xml <- function(command, ...) {
+module_energy_iron_steel_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2323.Supplysector_iron_steel",
              "L2323.FinalEnergyKeyword_iron_steel",
diff --git a/input/gcamdata/R/zchunk_batch_iron_steel_SSP_xml.R b/input/gcamdata/R/zenergy_xml_iron_steel_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_iron_steel_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_iron_steel_SSP.R
index 76086c9cf5..f81a3116c1 100644
--- a/input/gcamdata/R/zchunk_batch_iron_steel_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_iron_steel_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_iron_steel_incelas_SSP_xml
+#' module_energy_iron_steel_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{iron_steel_incelas_SSP.xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{iron_steel_incelas_gcam3.xml}, \code{iron_steel_incelas_ssp1.xml}, \code{iron_steel_incelas_ssp2.xml}, \code{iron_steel_incelas_ssp3.xml},
 #' \code{iron_steel_incelas_ssp4.xml}, \code{iron_steel_incelas_ssp5.xml}, \code{iron_steel_incelas_gssp1.xml}, \code{iron_steel_incelas_gssp2.xml},
 #' \code{iron_steel_incelas_gssp3.xml}, \code{iron_steel_incelas_gssp4.xml}, and \code{iron_steel_incelas_gssp5.xml}.
-module_energy_batch_iron_steel_incelas_SSP_xml <- function(command, ...) {
+module_energy_iron_steel_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_iron_steel_trade_xml.R b/input/gcamdata/R/zenergy_xml_iron_steel_trade.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_iron_steel_trade_xml.R
rename to input/gcamdata/R/zenergy_xml_iron_steel_trade.R
index 0642470a2f..729142859f 100644
--- a/input/gcamdata/R/zchunk_batch_iron_steel_trade_xml.R
+++ b/input/gcamdata/R/zenergy_xml_iron_steel_trade.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_iron_steel_trade_xml
+#' module_energy_iron_steel_trade_xml
 #'
 #' Construct XML data structure for \code{iron_steel_trade.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{iron_steel_trade.xml}.
-module_energy_batch_iron_steel_trade_xml <- function(command, ...) {
+module_energy_iron_steel_trade_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L238.Supplysector_tra",
              "L238.SectorUseTrialMarket_tra",
diff --git a/input/gcamdata/R/zchunk_batch_liquids_limits_xml.R b/input/gcamdata/R/zenergy_xml_liquids_limits.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_liquids_limits_xml.R
rename to input/gcamdata/R/zenergy_xml_liquids_limits.R
index 06e99dcd26..fa228ea7e7 100644
--- a/input/gcamdata/R/zchunk_batch_liquids_limits_xml.R
+++ b/input/gcamdata/R/zenergy_xml_liquids_limits.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_liquids_limits_xml
+#' module_energy_liquids_limits_xml
 #'
 #' Construct XML data structure for \code{liquids_limits.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{liquids_limits.xml}. The corresponding file in the
 #' original data system was \code{L270.limits.R} (energy XML).
-module_energy_batch_liquids_limits_xml <- function(command, ...) {
+module_energy_liquids_limits_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L270.CreditOutput",
               "L270.CreditInput_elec",
diff --git a/input/gcamdata/R/zchunk_batch_negative_emissions_budget_xml.R b/input/gcamdata/R/zenergy_xml_negative_emissions_budget.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_negative_emissions_budget_xml.R
rename to input/gcamdata/R/zenergy_xml_negative_emissions_budget.R
index 36baa3d3d4..7b2b8d65f4 100644
--- a/input/gcamdata/R/zchunk_batch_negative_emissions_budget_xml.R
+++ b/input/gcamdata/R/zenergy_xml_negative_emissions_budget.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_negative_emissions_budget_xml
+#' module_energy_negative_emissions_budget_xml
 #'
 #' Construct XML data structure for \code{paste0("negative_emissions_budget_", c("GCAM3", paste0("SSP", 1:5), paste0("gSSP", 1:5)), ".xml")}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{paste0("negative_emissions_budget_", c("GCAM3", paste0("SSP", 1:5), paste0("gSSP", 1:5)), ".xml")}. The corresponding file in the
 #' original data system was \code{L270.limits.R} (energy XML).
-module_energy_batch_negative_emissions_budget_xml <- function(command, ...) {
+module_energy_negative_emissions_budget_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L270.CTaxInput",
              "L270.LandRootNegEmissMkt",
diff --git a/input/gcamdata/R/zchunk_batch_no_offshore_ccs_xml.R b/input/gcamdata/R/zenergy_xml_no_offshore_ccs.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_no_offshore_ccs_xml.R
rename to input/gcamdata/R/zenergy_xml_no_offshore_ccs.R
index f3c253f55f..0df34c4a82 100644
--- a/input/gcamdata/R/zchunk_batch_no_offshore_ccs_xml.R
+++ b/input/gcamdata/R/zenergy_xml_no_offshore_ccs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_no_offshore_ccs_xml
+#' module_energy_no_offshore_ccs_xml
 #'
 #' Construct XML data structure for \code{no_offshore_ccs.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{no_offshore_ccs.xml}. The corresponding file in the
 #' original data system was \code{batch_no_offshore_ccs.xml.R} (energy XML).
-module_energy_batch_no_offshore_ccs_xml <- function(command, ...) {
+module_energy_no_offshore_ccs_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.GlobalTechShrwt_C_nooffshore"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_nuclear_adv_xml.R b/input/gcamdata/R/zenergy_xml_nuclear_adv.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_nuclear_adv_xml.R
rename to input/gcamdata/R/zenergy_xml_nuclear_adv.R
index 9e1c4afb9b..158b41d43f 100644
--- a/input/gcamdata/R/zchunk_batch_nuclear_adv_xml.R
+++ b/input/gcamdata/R/zenergy_xml_nuclear_adv.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_nuclear_adv_xml
+#' module_energy_nuclear_adv_xml
 #'
 #' Construct XML data structure for \code{nuclear_adv.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{nuclear_adv.xml}. The corresponding file in the
 #' original data system was \code{batch_nuclear_adv_xml.R} (energy XML).
-module_energy_batch_nuclear_adv_xml <- function(command, ...) {
+module_energy_nuclear_adv_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_nuc_adv"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_nuclear_low_xml.R b/input/gcamdata/R/zenergy_xml_nuclear_low.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_nuclear_low_xml.R
rename to input/gcamdata/R/zenergy_xml_nuclear_low.R
index 64b7bdbf0e..9e2ecc979a 100644
--- a/input/gcamdata/R/zchunk_batch_nuclear_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_nuclear_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_nuclear_low_xml
+#' module_energy_nuclear_low_xml
 #'
 #' Construct XML data structure for \code{nuclear_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{nuclear_low.xml}. The corresponding file in the
 #' original data system was \code{batch_nuclear_low_xml.R} (energy XML).
-module_energy_batch_nuclear_low_xml <- function(command, ...) {
+module_energy_nuclear_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_nuc_low"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_onshore_wind_xml.R b/input/gcamdata/R/zenergy_xml_onshore_wind.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_onshore_wind_xml.R
rename to input/gcamdata/R/zenergy_xml_onshore_wind.R
index 9b23ed2bc4..2004bc4474 100644
--- a/input/gcamdata/R/zchunk_batch_onshore_wind_xml.R
+++ b/input/gcamdata/R/zenergy_xml_onshore_wind.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_onshore_wind_xml
+#' module_energy_onshore_wind_xml
 #'
 #' Construct XML data structure for \code{onshore_wind.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{onshore_wind.xml}.
-module_energy_batch_onshore_wind_xml<- function(command, ...) {
+module_energy_onshore_wind_xml<- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2231.SmthRenewRsrcCurves_onshore_wind",
              "L2231.StubTechCapFactor_onshore_wind",
diff --git a/input/gcamdata/R/zchunk_batch_other_industry_xml.R b/input/gcamdata/R/zenergy_xml_other_industry.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_other_industry_xml.R
rename to input/gcamdata/R/zenergy_xml_other_industry.R
index 27adbc05a5..428847e3f7 100644
--- a/input/gcamdata/R/zchunk_batch_other_industry_xml.R
+++ b/input/gcamdata/R/zenergy_xml_other_industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_other_industry_xml
+#' module_energy_other_industry_xml
 #'
 #' Construct XML data structure for \code{other_industry.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{industry.xml}. The corresponding file in the
 #' original data system was \code{batch_industry_xml.R} (energy XML).
-module_energy_batch_other_industry_xml <- function(command, ...) {
+module_energy_other_industry_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.SubsectorLogit_ind",
              "L232.FinalEnergyKeyword_ind",
diff --git a/input/gcamdata/R/zchunk_batch_other_industry_SSP_xml.R b/input/gcamdata/R/zenergy_xml_other_industry_SSP.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_other_industry_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_other_industry_SSP.R
index 648ada7e3a..ada0367782 100644
--- a/input/gcamdata/R/zchunk_batch_other_industry_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_other_industry_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_other_industry_incelas_SSP_xml
+#' module_energy_other_industry_incelas_SSP_xml
 #'
 #' Construct XML data structures for all the \code{other_industry_incelas_SSP.xml} files.
 #'
@@ -12,7 +12,7 @@
 #' \code{other_industry_incelas_ssp3.xml}, \code{other_industry_incelas_ssp4.xml}, \code{other_industry_incelas_ssp5.xml},
 #' \code{other_industry_incelas_gssp1.xml}, \code{other_industry_incelas_gssp2.xml}, \code{other_industry_incelas_gssp3.xml},
 #' \code{other_industry_incelas_gssp4.xml}, and \code{other_industry_incelas_gssp5.xml}.
-module_energy_batch_other_industry_incelas_SSP_xml <- function(command, ...) {
+module_energy_other_industry_incelas_SSP_xml <- function(command, ...) {
 
   INCOME_ELASTICITY_INPUTS <- c("GCAM3",
                                 paste0("gSSP", 1:5),
diff --git a/input/gcamdata/R/zchunk_batch_resources_xml.R b/input/gcamdata/R/zenergy_xml_resources.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_resources_xml.R
rename to input/gcamdata/R/zenergy_xml_resources.R
index 782e0194f7..3b4e6e1425 100644
--- a/input/gcamdata/R/zchunk_batch_resources_xml.R
+++ b/input/gcamdata/R/zenergy_xml_resources.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_resources_xml
+#' module_energy_resources_xml
 #'
 #' Construct XML data structure for \code{resources.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{resources.xml}. The corresponding file in the
 #' original data system was \code{batch_resources_xml.R} (energy XML).
-module_energy_batch_resources_xml <- function(command, ...) {
+module_energy_resources_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L210.Rsrc",
              "L210.RenewRsrc",
diff --git a/input/gcamdata/R/zchunk_batch_resources_SSP_xml.R b/input/gcamdata/R/zenergy_xml_resources_SSP.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_resources_SSP_xml.R
rename to input/gcamdata/R/zenergy_xml_resources_SSP.R
index f278bab690..089857dedd 100644
--- a/input/gcamdata/R/zchunk_batch_resources_SSP_xml.R
+++ b/input/gcamdata/R/zenergy_xml_resources_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_resources_SSP_xml
+#' module_energy_resources_SSP_xml
 #'
 #' Construct XML data structure for all the \code{resources_SSP.xml} files.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{resources_SSP1.xml}, \code{resources_SSP2.xml}, \code{resources_SSP3.xml}, \code{resources_SSP4.xml}, \code{resources_SSP5.xml}.
-module_energy_batch_resources_SSP_xml <- function(command, ...) {
+module_energy_resources_SSP_xml <- function(command, ...) {
 
   SSP_nums <- 1:5
 
diff --git a/input/gcamdata/R/zchunk_batch_solar_adv_xml.R b/input/gcamdata/R/zenergy_xml_solar_adv.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_solar_adv_xml.R
rename to input/gcamdata/R/zenergy_xml_solar_adv.R
index 7b4bc90978..bb9502f097 100644
--- a/input/gcamdata/R/zchunk_batch_solar_adv_xml.R
+++ b/input/gcamdata/R/zenergy_xml_solar_adv.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_solar_adv_xml
+#' module_energy_solar_adv_xml
 #'
 #' Construct XML data structure for \code{solar_adv.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{solar_adv.xml}. The corresponding file in the
 #' original data system was \code{batch_solar_adv_xml.R} (energy XML).
-module_energy_batch_solar_adv_xml <- function(command, ...) {
+module_energy_solar_adv_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_sol_adv",
               "L223.GlobalIntTechCapital_sol_adv",
diff --git a/input/gcamdata/R/zchunk_batch_solar_low_xml.R b/input/gcamdata/R/zenergy_xml_solar_low.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_solar_low_xml.R
rename to input/gcamdata/R/zenergy_xml_solar_low.R
index 435d9be1dc..1b927e52b6 100644
--- a/input/gcamdata/R/zchunk_batch_solar_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_solar_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_solar_low_xml
+#' module_energy_solar_low_xml
 #'
 #' Construct XML data structure for \code{solar_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{solar_low.xml}. The corresponding file in the
 #' original data system was \code{batch_solar_low_xml.R} (energy XML).
-module_energy_batch_solar_low_xml <- function(command, ...) {
+module_energy_solar_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_sol_low",
               "L223.GlobalIntTechCapital_sol_low",
diff --git a/input/gcamdata/R/zchunk_batch_transportation_UCD_CORE_xml.R b/input/gcamdata/R/zenergy_xml_transportation_UCD_CORE.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_transportation_UCD_CORE_xml.R
rename to input/gcamdata/R/zenergy_xml_transportation_UCD_CORE.R
index 8be48e2e9f..629a4b8b91 100644
--- a/input/gcamdata/R/zchunk_batch_transportation_UCD_CORE_xml.R
+++ b/input/gcamdata/R/zenergy_xml_transportation_UCD_CORE.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_transportation_UCD_CORE_xml
+#' module_energy_transportation_UCD_CORE_xml
 #'
 #' Construct XML data structure for \code{transportation_UCD_*.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{transportation_UCD_*.xml}. The corresponding file in the
 #' original data system was \code{batch_transportation_UCD_CORE.xml} (energy XML).
-module_energy_batch_transportation_UCD_CORE_xml <- function(command, ...) {
+module_energy_transportation_UCD_CORE_xml <- function(command, ...) {
   # The below variable (trn_SPP) controls which scenario to run, as only one scenario can be run at a time.
   # This is a special case, and the way this is executed will likely change in the future.
 
diff --git a/input/gcamdata/R/zchunk_batch_turn_off_ccs_xml.R b/input/gcamdata/R/zenergy_xml_turn_off_ccs.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_turn_off_ccs_xml.R
rename to input/gcamdata/R/zenergy_xml_turn_off_ccs.R
index 5ef2157fc8..ff20610031 100644
--- a/input/gcamdata/R/zchunk_batch_turn_off_ccs_xml.R
+++ b/input/gcamdata/R/zenergy_xml_turn_off_ccs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_turn_off_ccs_xml
+#' module_energy_turn_off_ccs_xml
 #'
 #' Construct XML data structure for \code{turn_off_ccs.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{turn_off_ccs.xml}.
 #' @author EL 2022
-module_energy_batch_turn_off_ccs_xml <- function(command, ...) {
+module_energy_turn_off_ccs_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              "L222.GlobalTechCapture_en",
diff --git a/input/gcamdata/R/zchunk_batch_wind_adv_xml.R b/input/gcamdata/R/zenergy_xml_wind_adv.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_wind_adv_xml.R
rename to input/gcamdata/R/zenergy_xml_wind_adv.R
index c6a332205c..b9398e189f 100644
--- a/input/gcamdata/R/zchunk_batch_wind_adv_xml.R
+++ b/input/gcamdata/R/zenergy_xml_wind_adv.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_wind_adv_xml
+#' module_energy_wind_adv_xml
 #'
 #' Construct XML data structure for \code{wind_adv.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{wind_adv.xml}. The corresponding file in the
 #' original data system was \code{batch_wind_adv_xml.R} (energy XML).
-module_energy_batch_wind_adv_xml <- function(command, ...) {
+module_energy_wind_adv_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_wind_adv",
               "L223.GlobalIntTechCapital_wind_adv"))
diff --git a/input/gcamdata/R/zchunk_batch_wind_low_xml.R b/input/gcamdata/R/zenergy_xml_wind_low.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_wind_low_xml.R
rename to input/gcamdata/R/zenergy_xml_wind_low.R
index 72b007279e..83e342d89c 100644
--- a/input/gcamdata/R/zchunk_batch_wind_low_xml.R
+++ b/input/gcamdata/R/zenergy_xml_wind_low.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_energy_batch_wind_low_xml
+#' module_energy_wind_low_xml
 #'
 #' Construct XML data structure for \code{wind_low.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{wind_low.xml}. The corresponding file in the
 #' original data system was \code{batch_wind_low_xml.R} (energy XML).
-module_energy_batch_wind_low_xml <- function(command, ...) {
+module_energy_wind_low_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.GlobalTechCapital_wind_low",
               "L223.GlobalIntTechCapital_wind_low"))
diff --git a/input/gcamdata/R/zchunk_LA100.Socioeconomics.R b/input/gcamdata/R/zgcamusa_L100.Socioeconomics.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA100.Socioeconomics.R
rename to input/gcamdata/R/zgcamusa_L100.Socioeconomics.R
index ea8d6176f2..3ac7edb628 100644
--- a/input/gcamdata/R/zchunk_LA100.Socioeconomics.R
+++ b/input/gcamdata/R/zgcamusa_L100.Socioeconomics.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA100.Socioeconomics
+#' module_gcamusa_L100.Socioeconomics
 #'
 #' Briefly describe what this chunk does.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr arrange bind_rows bind_rows filter first group_by left_join mutate rename right_join select ungroup
 #' @importFrom tidyr complete nesting
 #' @author BBL
-module_gcamusa_LA100.Socioeconomics <- function(command, ...) {
+module_gcamusa_L100.Socioeconomics <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/Census_pop",
diff --git a/input/gcamdata/R/zchunk_LA101.EIA_SEDS.R b/input/gcamdata/R/zgcamusa_L101.EIA_SEDS.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA101.EIA_SEDS.R
rename to input/gcamdata/R/zgcamusa_L101.EIA_SEDS.R
index 1e782c1932..9ca2575a55 100644
--- a/input/gcamdata/R/zchunk_LA101.EIA_SEDS.R
+++ b/input/gcamdata/R/zgcamusa_L101.EIA_SEDS.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA101.EIA_SEDS
+#' module_gcamusa_L101.EIA_SEDS
 #'
 #' Produce two ouput tables from the EIA state energy database:
 #' \itemize{
@@ -19,7 +19,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select summarise
 #' @importFrom tidyr fill
 #' @author AS April 2017
-module_gcamusa_LA101.EIA_SEDS <- function(command, ...) {
+module_gcamusa_L101.EIA_SEDS <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/EIA_SEDS_fuels",
              FILE = "gcam-usa/EIA_SEDS_sectors",
diff --git a/input/gcamdata/R/zchunk_L101.nonghg_en_USA_S_T_Y.R b/input/gcamdata/R/zgcamusa_L101.nonghg_en_S_T_Y.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L101.nonghg_en_USA_S_T_Y.R
rename to input/gcamdata/R/zgcamusa_L101.nonghg_en_S_T_Y.R
index 7039f009ff..c3130bf57a 100644
--- a/input/gcamdata/R/zchunk_L101.nonghg_en_USA_S_T_Y.R
+++ b/input/gcamdata/R/zgcamusa_L101.nonghg_en_S_T_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_L101.nonghg_en_USA_S_T_Y
+#' module_gcamusa_L101.nonghg_en_S_T_Y
 #'
 #' Compute historical emissions factors for energy by GCAM technology, from EPA emissions data and IEA energy balances.
 #'
@@ -20,7 +20,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else group_by left_join mutate select summarise
 #' @importFrom tidyr replace_na spread
 #' @author BBL April 2017
-module_emissions_L101.nonghg_en_USA_S_T_Y <- function(command, ...) {
+module_gcamusa_L101.nonghg_en_S_T_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/IEA_flow_sector",
              FILE = "energy/mappings/IEA_product_fuel",
diff --git a/input/gcamdata/R/zchunk_L102.ghg_en_USA_S_T_Y.R b/input/gcamdata/R/zgcamusa_L102.ghg_en_S_T_Y.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L102.ghg_en_USA_S_T_Y.R
rename to input/gcamdata/R/zgcamusa_L102.ghg_en_S_T_Y.R
index f36b65d16c..b78860cee9 100644
--- a/input/gcamdata/R/zchunk_L102.ghg_en_USA_S_T_Y.R
+++ b/input/gcamdata/R/zgcamusa_L102.ghg_en_S_T_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_L102.ghg_en_USA_S_T_Y
+#' module_gcamusa_L102.ghg_en_S_T_Y
 #'
 #' Calculates CH4 and N2O emission factors derived from EPA GHG inventory and GCAM energy balances for the US in 2005.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange filter if_else group_by left_join mutate select summarize summarize_if
 #' @author HCM April 2017
-module_emissions_L102.ghg_en_USA_S_T_Y <- function(command, ...) {
+module_gcamusa_L102.ghg_en_S_T_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/mappings/IEA_flow_sector",
diff --git a/input/gcamdata/R/zchunk_L103.ghg_an_USA_S_T_Y.R b/input/gcamdata/R/zgcamusa_L103.ghg_an_S_T_Y.R
similarity index 97%
rename from input/gcamdata/R/zchunk_L103.ghg_an_USA_S_T_Y.R
rename to input/gcamdata/R/zgcamusa_L103.ghg_an_S_T_Y.R
index b5eaf4df3b..bbc40669a3 100644
--- a/input/gcamdata/R/zchunk_L103.ghg_an_USA_S_T_Y.R
+++ b/input/gcamdata/R/zgcamusa_L103.ghg_an_S_T_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_L103.ghg_an_USA_S_T_Y
+#' module_gcamusa_L103.ghg_an_S_T_Y
 #'
 #' Calculates methane emissions factors for animals by GCAM technology,
 #' computed from EPA emissions data and FAO animal data for the US, 2005
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter group_by left_join mutate select summarise summarise_if
 #' @author RH April 2017
-module_emissions_L103.ghg_an_USA_S_T_Y <- function(command, ...) {
+module_gcamusa_L103.ghg_an_S_T_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "emissions/mappings/EPA_ghg_tech",
diff --git a/input/gcamdata/R/zchunk_L103.water_mapping_USA.R b/input/gcamdata/R/zgcamusa_L103.water_mapping.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L103.water_mapping_USA.R
rename to input/gcamdata/R/zgcamusa_L103.water_mapping.R
index cce8523fc2..5895bdfe5d 100644
--- a/input/gcamdata/R/zchunk_L103.water_mapping_USA.R
+++ b/input/gcamdata/R/zgcamusa_L103.water_mapping.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L103.water_mapping_USA
+#' module_gcamusa_L103.water_mapping
 #'
 #' Calculate percentage shares to map water demands from USA regional level to state and basin.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author NTG Oct 2019
-module_gcamusa_L103.water_mapping_USA <- function(command, ...) {
+module_gcamusa_L103.water_mapping <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/irrigation_shares_0p5degree",
              FILE = "gcam-usa/nonirrigation_shares_0p5degree",
diff --git a/input/gcamdata/R/zchunk_L104.bcoc_en_USA_S_T_Y.R b/input/gcamdata/R/zgcamusa_L104.bcoc_en_S_T_Y.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L104.bcoc_en_USA_S_T_Y.R
rename to input/gcamdata/R/zgcamusa_L104.bcoc_en_S_T_Y.R
index ccad2e6d81..0663eaa32c 100644
--- a/input/gcamdata/R/zchunk_L104.bcoc_en_USA_S_T_Y.R
+++ b/input/gcamdata/R/zgcamusa_L104.bcoc_en_S_T_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_L104.bcoc_en_USA_S_T_Y
+#' module_gcamusa_L104.bcoc_en_S_T_Y
 #'
 #' Creates USA BC and OC emission factors for combustion sectors
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter group_by left_join mutate select summarize summarize_if
 #' @importFrom tidyr replace_na
 #' @author SJS May 2017
-module_emissions_L104.bcoc_en_USA_S_T_Y <- function(command, ...) {
+module_gcamusa_L104.bcoc_en_S_T_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "energy/mappings/IEA_flow_sector",
diff --git a/input/gcamdata/R/zchunk_L105.nh3_an_USA_S_T_Y.R b/input/gcamdata/R/zgcamusa_L105.nh3_an_S_T_Y.R
similarity index 97%
rename from input/gcamdata/R/zchunk_L105.nh3_an_USA_S_T_Y.R
rename to input/gcamdata/R/zgcamusa_L105.nh3_an_S_T_Y.R
index b33eacf946..50c7a0aff3 100644
--- a/input/gcamdata/R/zchunk_L105.nh3_an_USA_S_T_Y.R
+++ b/input/gcamdata/R/zgcamusa_L105.nh3_an_S_T_Y.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_emissions_L105.nh3_an_USA_S_T_Y
+#' module_gcamusa_L105.nh3_an_S_T_Y
 #'
 #' Historical NH3 emissions factors for animals by GCAM technology, computed from EPA emissions data and FAO animal statistics
 #'
@@ -17,7 +17,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter group_by left_join mutate select rename summarize summarize_at vars
 #' @author RMH April 2017
-module_emissions_L105.nh3_an_USA_S_T_Y <- function(command, ...) {
+module_gcamusa_L105.nh3_an_S_T_Y <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "emissions/mappings/EPA_tech",
              "L107.an_Prod_Mt_R_C_Sys_Fd_Y",
diff --git a/input/gcamdata/R/zchunk_LA114.wind_USA.R b/input/gcamdata/R/zgcamusa_L114.wind.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA114.wind_USA.R
rename to input/gcamdata/R/zgcamusa_L114.wind.R
index d455e14805..7ba9e8c3fa 100644
--- a/input/gcamdata/R/zchunk_LA114.wind_USA.R
+++ b/input/gcamdata/R/zgcamusa_L114.wind.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA114.Wind
+#' module_gcamusa_L114.Wind
 #'
 #' Compute capacity factors for wind by US state.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter mutate pull select
 #' @importFrom tidyr complete
 #' @author ST September 2017
-module_gcamusa_LA114.wind <- function(command, ...) {
+module_gcamusa_L114.wind <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c( FILE = "gcam-usa/us_state_wind",
               "L113.globaltech_OMfixed_ATB",
diff --git a/input/gcamdata/R/zchunk_LA115.rooftopPV_USA.R b/input/gcamdata/R/zgcamusa_L115.rooftopPV.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA115.rooftopPV_USA.R
rename to input/gcamdata/R/zgcamusa_L115.rooftopPV.R
index e57d885faf..9fe5b9c411 100644
--- a/input/gcamdata/R/zchunk_LA115.rooftopPV_USA.R
+++ b/input/gcamdata/R/zgcamusa_L115.rooftopPV.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA115.RooftopPV
+#' module_gcamusa_L115.RooftopPV
 #'
 #' Prepare resource curves for rooftop PV (commercial and residential combined).
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter first group_by mutate select summarise
 #' @author ST September 2017
-module_gcamusa_LA115.rooftopPV <- function(command, ...) {
+module_gcamusa_L115.rooftopPV <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/NREL_Com_PV_supply_curve",
diff --git a/input/gcamdata/R/zchunk_LA119.solar_USA.R b/input/gcamdata/R/zgcamusa_L119.solar.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA119.solar_USA.R
rename to input/gcamdata/R/zgcamusa_L119.solar.R
index 485a98cbd4..54faf8a305 100644
--- a/input/gcamdata/R/zchunk_LA119.solar_USA.R
+++ b/input/gcamdata/R/zgcamusa_L119.solar.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA119.Solar
+#' module_gcamusa_L119.Solar
 #'
 #' Compute scalars by state to vary capacity factors by state.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter if_else group_by mutate select summarise summarise_at vars
 #' @importFrom tidyr gather
 #' @author GI, FF, AS Apr 2017
-module_gcamusa_LA119.solar <- function(command, ...) {
+module_gcamusa_L119.solar <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/NREL_us_re_capacity_factors"))
diff --git a/input/gcamdata/R/zchunk_LA120.offshore_wind_reeds_USA.R b/input/gcamdata/R/zgcamusa_L120.offshore_wind_reeds.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA120.offshore_wind_reeds_USA.R
rename to input/gcamdata/R/zgcamusa_L120.offshore_wind_reeds.R
index 43f62e491d..e455c1513b 100644
--- a/input/gcamdata/R/zchunk_LA120.offshore_wind_reeds_USA.R
+++ b/input/gcamdata/R/zgcamusa_L120.offshore_wind_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA120.offshore_wind_reeds_USA
+#' module_gcamusa_L120.offshore_wind_reeds
 #'
 #' Takes in data on country-level offshore wind energy potential and global offshore wind capital cost assumptions and generates tables containing region-level offshore wind data.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr gather
 #' @importFrom stats optimize
 #' @author MB GI AJS March 2019
-module_gcamusa_LA120.offshore_wind_reeds_USA <- function(command, ...) {
+module_gcamusa_L120.offshore_wind_reeds <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/reeds_regions_states",
              FILE = "gcam-usa/A20.offshore_wind_class_depth",
diff --git a/input/gcamdata/R/zchunk_LA122.Refining.R b/input/gcamdata/R/zgcamusa_L122.Refining.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA122.Refining.R
rename to input/gcamdata/R/zgcamusa_L122.Refining.R
index b1827da55e..0aeba39906 100644
--- a/input/gcamdata/R/zchunk_LA122.Refining.R
+++ b/input/gcamdata/R/zgcamusa_L122.Refining.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA122.Refining
+#' module_gcamusa_L122.Refining
 #'
 #' Downscales crude oil, corn ethanol, and biodiesel refining inputs and outputs to state-level.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr bind_rows distinct filter group_by left_join mutate select transmute
 #' @importFrom tidyr replace_na
 #' @author RLH September 2017
-module_gcamusa_LA122.refining <- function(command, ...) {
+module_gcamusa_L122.refining <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L122.in_EJ_R_refining_F_Yh",
              "L122.out_EJ_R_refining_F_Yh",
diff --git a/input/gcamdata/R/zchunk_LB123.Electricity.R b/input/gcamdata/R/zgcamusa_L123.Electricity.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB123.Electricity.R
rename to input/gcamdata/R/zgcamusa_L123.Electricity.R
index 17dfca81c0..978583dc25 100644
--- a/input/gcamdata/R/zchunk_LB123.Electricity.R
+++ b/input/gcamdata/R/zgcamusa_L123.Electricity.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB123.Electricity
+#' module_gcamusa_L123.Electricity
 #'
 #' Calculate electricity fuel consumption, electricity generation, and inputs and outputs of net ownuse
 #' (the electricity used by production/transformation facilities) by state.
@@ -16,7 +16,7 @@
 #' @importFrom dplyr bind_rows filter group_by left_join mutate select summarise transmute
 #' @importFrom tidyr replace_na
 #' @author RLH August 2017
-module_gcamusa_LB123.Electricity <- function(command, ...) {
+module_gcamusa_L123.Electricity <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/NREL_us_re_technical_potential",
diff --git a/input/gcamdata/R/zchunk_LB1231.Elec_tech.R b/input/gcamdata/R/zgcamusa_L1231.Elec_tech.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB1231.Elec_tech.R
rename to input/gcamdata/R/zgcamusa_L1231.Elec_tech.R
index 44a1a778a7..6a4e12d331 100644
--- a/input/gcamdata/R/zchunk_LB1231.Elec_tech.R
+++ b/input/gcamdata/R/zgcamusa_L1231.Elec_tech.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1231.Elec_tech
+#' module_gcamusa_L1231.Elec_tech
 #'
 #' Downscaling electricity by state/fuel to state/fuel/technology
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter left_join mutate select
 #' @importFrom tidyr replace_na
 #' @author RLH August 2017
-module_gcamusa_LB1231.Elec_tech<- function(command, ...) {
+module_gcamusa_L1231.Elec_tech<- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L123.out_EJ_R_elec_F_Yh",
              "L1231.in_EJ_R_elec_F_tech_Yh",
diff --git a/input/gcamdata/R/zchunk_LB1232.Elec_subregions.R b/input/gcamdata/R/zgcamusa_L1232.Elec_subregions.R
similarity index 95%
rename from input/gcamdata/R/zchunk_LB1232.Elec_subregions.R
rename to input/gcamdata/R/zgcamusa_L1232.Elec_subregions.R
index 1b1601f418..5d2d4d7d9f 100644
--- a/input/gcamdata/R/zchunk_LB1232.Elec_subregions.R
+++ b/input/gcamdata/R/zgcamusa_L1232.Elec_subregions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1232.Elec_subregions
+#' module_gcamusa_L1232.Elec_subregions
 #'
 #' Aggregates USA state electricity generation to electricity subregions.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr group_by left_join select summarise
 #' @author RLH September 2017
-module_gcamusa_LB1232.Elec_subregions <- function(command, ...) {
+module_gcamusa_L1232.Elec_subregions <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L1231.out_EJ_state_elec_F_tech"))
diff --git a/input/gcamdata/R/zchunk_LB1233.elec_water_USA.R b/input/gcamdata/R/zgcamusa_L1233.elec_water.R
old mode 100755
new mode 100644
similarity index 99%
rename from input/gcamdata/R/zchunk_LB1233.elec_water_USA.R
rename to input/gcamdata/R/zgcamusa_L1233.elec_water.R
index 7d75473fca..e38bc04d68
--- a/input/gcamdata/R/zchunk_LB1233.elec_water_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1233.elec_water.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1233.elec_water_USA
+#' module_gcamusa_L1233.elec_water
 #'
 #' Compute water withdrawals/consumption by state, fuel, technology, and cooling system type.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author ST October 2017, NTG May 2020
-module_gcamusa_LB1233.elec_water_USA <- function(command, ...) {
+module_gcamusa_L1233.elec_water <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/UCS_tech_names",
diff --git a/input/gcamdata/R/zchunk_LB1234.elec_gridregions_USA.R b/input/gcamdata/R/zgcamusa_L1234.elec_gridregions.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LB1234.elec_gridregions_USA.R
rename to input/gcamdata/R/zgcamusa_L1234.elec_gridregions.R
index 52489a6ef3..399cf737e9 100644
--- a/input/gcamdata/R/zchunk_LB1234.elec_gridregions_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1234.elec_gridregions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1234.elec_gridregions_USA
+#' module_gcamusa_L1234.elec_gridregions
 #'
 #' Calculate electricity fuel consumption and electricity generation by grid region.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter mutate select
 #' @author MTB August 2018
-module_gcamusa_LB1234.elec_gridregions_USA <- function(command, ...) {
+module_gcamusa_L1234.elec_gridregions <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L123.in_EJ_state_elec_F",
diff --git a/input/gcamdata/R/zchunk_LB1235.elec_load_segments_USA.R b/input/gcamdata/R/zgcamusa_L1235.elec_load_segments.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB1235.elec_load_segments_USA.R
rename to input/gcamdata/R/zgcamusa_L1235.elec_load_segments.R
index 9af0e07b57..0a59f8947a 100644
--- a/input/gcamdata/R/zchunk_LB1235.elec_load_segments_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1235.elec_load_segments.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1235.elec_load_segments_USA
+#' module_gcamusa_L1235.elec_load_segments
 #'
 #' Read in demand fraction and time fraction and compute load curve related parameters
 #' Calculate an initial estimate of generation by fuel (EJ) in the horizontal segments
@@ -18,7 +18,7 @@
 #' @importFrom dplyr filter mutate select summarise_at summarise_if
 #' @importFrom tidyr gather
 #' @author MTB August 2018
-module_gcamusa_LB1235.elec_load_segments_USA <- function(command, ...) {
+module_gcamusa_L1235.elec_load_segments <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/elecS_demand_fraction",
              FILE = "gcam-usa/elecS_time_fraction",
diff --git a/input/gcamdata/R/zchunk_LB1236.elec_load_segments_solver_USA.R b/input/gcamdata/R/zgcamusa_L1236.elec_load_segments_solver.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB1236.elec_load_segments_solver_USA.R
rename to input/gcamdata/R/zgcamusa_L1236.elec_load_segments_solver.R
index 84144011b5..bb002c9c7d 100644
--- a/input/gcamdata/R/zchunk_LB1236.elec_load_segments_solver_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1236.elec_load_segments_solver.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1236.elec_load_segments_solver_USA
+#' module_gcamusa_L1236.elec_load_segments_solver
 #'
 #' Calculate the fraction of electricity generation by fuel by horizontal load segment such that the total supply
 #' of electricity in each grid region matches total demand of electricity in that grid region.
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr distinct filter mutate pull select
 #' @author MTB August 2018
-module_gcamusa_LB1236.elec_load_segments_solver_USA <- function(command, ...) {
+module_gcamusa_L1236.elec_load_segments_solver <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/elecS_horizontal_to_vertical_map",
              "L1234.out_EJ_grid_elec_F",
diff --git a/input/gcamdata/R/zchunk_LB1239.elec_state_fractions_USA.R b/input/gcamdata/R/zgcamusa_L1239.elec_state_fractions.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LB1239.elec_state_fractions_USA.R
rename to input/gcamdata/R/zgcamusa_L1239.elec_state_fractions.R
index e61d130de1..323b9f38ef 100644
--- a/input/gcamdata/R/zchunk_LB1239.elec_state_fractions_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1239.elec_state_fractions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB1239.elec_state_fractions_USA
+#' module_gcamusa_L1239.elec_state_fractions
 #'
 #' Map electricity generation by fuel | grid region | horizontal segment to generation by fuel | state | segment.
 #' The fraction of generation by fuel by horizontal segment is assumed to be equal for all states within a grid region.
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr distinct filter left_join mutate select semi_join
 #' @author MTB August 2018
-module_gcamusa_LB1239.elec_state_fractions_USA <- function(command, ...) {
+module_gcamusa_L1239.elec_state_fractions <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L123.out_EJ_state_elec_F",
diff --git a/input/gcamdata/R/zchunk_LB126.Gas_ElecTD.R b/input/gcamdata/R/zgcamusa_L126.Gas_ElecTD.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB126.Gas_ElecTD.R
rename to input/gcamdata/R/zgcamusa_L126.Gas_ElecTD.R
index 880d36b1bd..a0c127c926 100644
--- a/input/gcamdata/R/zchunk_LB126.Gas_ElecTD.R
+++ b/input/gcamdata/R/zgcamusa_L126.Gas_ElecTD.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LB126.Gas_ElecTD
+#' module_gcamusa_L126.Gas_ElecTD
 #'
 #' Calculates inputs and outputs of: gas processing by fuel and state, gas pipeline by state, and transmission and distribution of electricity by state.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter group_by left_join mutate select summarise transmute
 #' @author RLH September 2017
-module_gcamusa_LB126.Gas_ElecTD <- function(command, ...) {
+module_gcamusa_L126.Gas_ElecTD <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L122.in_EJ_state_refining_F",
              "L126.IO_R_electd_F_Yh",
diff --git a/input/gcamdata/R/zchunk_LA131.enduse_noEFW_USA.R b/input/gcamdata/R/zgcamusa_L131.enduse_noEFW.R
similarity index 96%
rename from input/gcamdata/R/zchunk_LA131.enduse_noEFW_USA.R
rename to input/gcamdata/R/zgcamusa_L131.enduse_noEFW.R
index 440aaeab52..1adc0fd94c 100644
--- a/input/gcamdata/R/zchunk_LA131.enduse_noEFW_USA.R
+++ b/input/gcamdata/R/zgcamusa_L131.enduse_noEFW.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA131.enduse_noEFW_USA
+#' module_gcamusa_L131.enduse_noEFW
 #'
 #' Generate the following two tables:
 #' \itemize{
@@ -12,13 +12,13 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{L131.in_EJ_USA_Senduse_F_Yh_noEFW}.
-#' @details This chunk performs the same steps as module_energy_LA131.enduse, but works from the energy balances prior to the
+#' @details This chunk performs the same steps as module_energy_L131.enduse, but works from the energy balances prior to the
 #' energy-for-water deductions, in order to generate information for GCAM-USA which does not have energy-for-water
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter group_by mutate select summarise
 #' @importFrom tidyr replace_na
 #' @author GPK November 2020
-module_gcamusa_LA131.enduse_noEFW_USA <- function(command, ...) {
+module_gcamusa_L131.enduse_noEFW <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/enduse_sector_aggregation",
              "L1011.en_bal_EJ_R_Si_Fi_Yh",
diff --git a/input/gcamdata/R/zchunk_LA132.industry_USA.R b/input/gcamdata/R/zgcamusa_L132.industry.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA132.industry_USA.R
rename to input/gcamdata/R/zgcamusa_L132.industry.R
index 8441375a25..221f0b3cf1 100644
--- a/input/gcamdata/R/zchunk_LA132.industry_USA.R
+++ b/input/gcamdata/R/zgcamusa_L132.industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA132.industry_USA
+#' module_gcamusa_L132.industry
 #'
 #' Provides industrial energy consumption and industrial feedstock consumption by region/fuel/historical year.
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter if_else group_by mutate select summarise
 #' @author ST September 2017. Modified November 2020 GPK
-module_gcamusa_LA132.industry_USA <- function(command, ...) {
+module_gcamusa_L132.industry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/enduse_fuel_aggregation",
              FILE = "energy/mappings/enduse_sector_aggregation",
@@ -72,13 +72,13 @@ module_gcamusa_LA132.industry_USA <- function(command, ...) {
     # ===================================================
 
     # Part 1. Compute industrial energy use by the USA region, to be apportioned to the states
-    # This part replicates the calculations that take place in module_energy_LA132.industry, with subsequent deductions
+    # This part replicates the calculations that take place in module_energy_L132.industry, with subsequent deductions
     # for energy consumption for cement and fertilizer manufacturing. It is re-performed here because GCAM-USA does not
     # have energy-for-water, so the energy quantities in L1322.in_EJ_R_indenergy_F_Yh are too low, and due to scaling
     # factors applied to electricity demand, we can't simply add in the EFW-related energy.
 
     # Part 1a - deductions
-    # See module_energy_LA132.industry for explanations of each flow that contributes to these deductions; for the most
+    # See module_energy_L132.industry for explanations of each flow that contributes to these deductions; for the most
     # part, these reflect activities whose energy is estimated bottom-up, from output multiplied by exogenous energy
     # input-output coefficients, and whose energy is otherwise reported with industrial energy use.
     L132.deduction_unoil <- filter(L121.in_EJ_R_unoil_F_Yh, GCAM_region_ID == gcamusa.USA_REGION_NUMBER & fuel == "gas") %>%
diff --git a/input/gcamdata/R/zchunk_L132.water_demand_industry_USA.R b/input/gcamdata/R/zgcamusa_L132.water_demand_industry.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L132.water_demand_industry_USA.R
rename to input/gcamdata/R/zgcamusa_L132.water_demand_industry.R
diff --git a/input/gcamdata/R/zchunk_LA1321.cement_USA.R b/input/gcamdata/R/zgcamusa_L1321.cement.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA1321.cement_USA.R
rename to input/gcamdata/R/zgcamusa_L1321.cement.R
index 8db0c61022..6910c48e8e 100644
--- a/input/gcamdata/R/zchunk_LA1321.cement_USA.R
+++ b/input/gcamdata/R/zgcamusa_L1321.cement.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA1321.Cement
+#' module_gcamusa_L1321.Cement
 #'
 #' Allocate across the states national cement production, input-output cofficients, and energy inputs to cement production
 #'
@@ -17,7 +17,7 @@
 #' @importFrom dplyr filter mutate pull select summarise
 #' @importFrom tidyr gather
 #' @author AS May 2017
-module_gcamusa_LA1321.cement <- function(command, ...) {
+module_gcamusa_L1321.cement <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/Census_ind_VoS_state",
              "L1321.out_Mt_R_cement_Yh",
diff --git a/input/gcamdata/R/zchunk_LA1322.Fert.R b/input/gcamdata/R/zgcamusa_L1322.Fert.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA1322.Fert.R
rename to input/gcamdata/R/zgcamusa_L1322.Fert.R
index 629595b21c..5138b3eb2d 100644
--- a/input/gcamdata/R/zchunk_LA1322.Fert.R
+++ b/input/gcamdata/R/zgcamusa_L1322.Fert.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA1322.Fert
+#' module_gcamusa_L1322.Fert
 #'
 #' Calculate input-output intensity coefficients and input energy for state fertilizer production
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr distinct filter left_join mutate select
 #' @author KD September 2017
-module_gcamusa_LA1322.Fert <- function(command, ...) {
+module_gcamusa_L1322.Fert <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/Census_ind_VoS_state",
              "L1322.Fert_Prod_MtN_R_F_Y",
diff --git a/input/gcamdata/R/zchunk_LB133.ag_Costs_USA_C_2005.R b/input/gcamdata/R/zgcamusa_L133.ag_Costs_C_2005.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LB133.ag_Costs_USA_C_2005.R
rename to input/gcamdata/R/zgcamusa_L133.ag_Costs_C_2005.R
index a56933e055..1241419b49 100644
--- a/input/gcamdata/R/zchunk_LB133.ag_Costs_USA_C_2005.R
+++ b/input/gcamdata/R/zgcamusa_L133.ag_Costs_C_2005.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB133.ag_Costs_USA_C_2005
+#' module_gcamusa_L133.ag_Costs_C_2005
 #'
 #' This module computes costs for each GCAM commodity (used by each region-GLU) using USDA cost
 #' information for USA when available. For commodities without USDA cost data, the average profit
@@ -22,7 +22,7 @@
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate select summarise
 #' @importFrom tidyr replace_na spread
 #' @author ACS May 2017
-module_aglu_LB133.ag_Costs_USA_C_2005 <- function(command, ...) {
+module_gcamusa_L133.ag_Costs_C_2005 <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "aglu/USDA/USDA_crops",
diff --git a/input/gcamdata/R/zchunk_LA142.Building_USA.R b/input/gcamdata/R/zgcamusa_L142.Building.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LA142.Building_USA.R
rename to input/gcamdata/R/zgcamusa_L142.Building.R
index eee65e4bf1..46ba889f35 100644
--- a/input/gcamdata/R/zchunk_LA142.Building_USA.R
+++ b/input/gcamdata/R/zgcamusa_L142.Building.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA142.Building_USA
+#' module_gcamusa_L142.Building
 #'
 #' Downscaling each state and sector's shares of USA building energy use by fuel
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter group_by mutate select summarise
 #' @author KD September 2017
 
-module_gcamusa_LA142.Building_USA <- function(command, ...) {
+module_gcamusa_L142.Building <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/enduse_fuel_aggregation",
              "L124.in_EJ_R_heat_F_Yh",
diff --git a/input/gcamdata/R/zchunk_LA143.HDDCDD_USA.R b/input/gcamdata/R/zgcamusa_L143.HDDCDD.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA143.HDDCDD_USA.R
rename to input/gcamdata/R/zgcamusa_L143.HDDCDD.R
index 28e689b436..012e4ea41b 100644
--- a/input/gcamdata/R/zchunk_LA143.HDDCDD_USA.R
+++ b/input/gcamdata/R/zgcamusa_L143.HDDCDD.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA143.HDDCDD
+#' module_gcamusa_L143.HDDCDD
 #'
 #' Estimate heating and cooling degree days for gcam-usa.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom tidyr complete nesting separate
 #' @importFrom tibble tibble
 #' @author KRD Nov 2017
-module_gcamusa_LA143.HDDCDD <- function(command, ...) {
+module_gcamusa_L143.HDDCDD <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/Census_pop",
diff --git a/input/gcamdata/R/zchunk_LA144.Commercial.R b/input/gcamdata/R/zgcamusa_L144.Commercial.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA144.Commercial.R
rename to input/gcamdata/R/zgcamusa_L144.Commercial.R
index 0dc2200601..a254bd6f0a 100644
--- a/input/gcamdata/R/zchunk_LA144.Commercial.R
+++ b/input/gcamdata/R/zgcamusa_L144.Commercial.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA144.Commercial
+#' module_gcamusa_L144.Commercial
 #'
 #' Calculates commercial floorspace by state and energy consumption by state/fuel/end use
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else group_by left_join mutate select summarise transmute
 #' @importFrom tidyr gather replace_na
 #' @author RLH September 2017
-module_gcamusa_LA144.Commercial <- function(command, ...) {
+module_gcamusa_L144.Commercial <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/Census_pop",
diff --git a/input/gcamdata/R/zchunk_LA144.Residential.R b/input/gcamdata/R/zgcamusa_L144.Residential.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA144.Residential.R
rename to input/gcamdata/R/zgcamusa_L144.Residential.R
index 7ab426cbbc..3b9e43d2ca 100644
--- a/input/gcamdata/R/zchunk_LA144.Residential.R
+++ b/input/gcamdata/R/zgcamusa_L144.Residential.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA144.Residential
+#' module_gcamusa_L144.Residential
 #'
 #' Calculate residential floorspace by state and residential energy consumption by state/fuel/end use.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter mutate select lead lag
 #' @importFrom tidyr gather spread
 #' @author RLH September 2017; PK and NK, January 2020,   updated for RECS 2015
-module_gcamusa_LA144.Residential <- function(command, ...) {
+module_gcamusa_L144.Residential <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/RECS_variables",
diff --git a/input/gcamdata/R/zchunk_L145.water_demand_municipal_USA.R b/input/gcamdata/R/zgcamusa_L145.water_demand_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L145.water_demand_municipal_USA.R
rename to input/gcamdata/R/zgcamusa_L145.water_demand_municipal.R
diff --git a/input/gcamdata/R/zchunk_LA154.Transport.R b/input/gcamdata/R/zgcamusa_L154.Transport.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA154.Transport.R
rename to input/gcamdata/R/zgcamusa_L154.Transport.R
index d2f6437a6e..126f8d3af3 100644
--- a/input/gcamdata/R/zchunk_LA154.Transport.R
+++ b/input/gcamdata/R/zgcamusa_L154.Transport.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA154.Transport
+#' module_gcamusa_L154.Transport
 #'
 #' Downscale transportation energy consumption and nonmotor data to the state level, generating three ouput tables.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr filter group_by left_join mutate select summarise
 #' @importFrom tidyr complete nesting replace_na
 #' @author AJS June 2017
-module_gcamusa_LA154.Transport <- function(command, ...) {
+module_gcamusa_L154.Transport <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/trnUCD_EIA_mapping",
              FILE="gcam-usa/trnUCD_EIA_mapping_revised",
diff --git a/input/gcamdata/R/zchunk_LA161.Cstorage_USA.R b/input/gcamdata/R/zgcamusa_L161.Cstorage.R
similarity index 97%
rename from input/gcamdata/R/zchunk_LA161.Cstorage_USA.R
rename to input/gcamdata/R/zgcamusa_L161.Cstorage.R
index 7af25547e7..a64e36cd8f 100644
--- a/input/gcamdata/R/zchunk_LA161.Cstorage_USA.R
+++ b/input/gcamdata/R/zgcamusa_L161.Cstorage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA161.Cstorage
+#' module_gcamusa_L161.Cstorage
 #'
 #' Calculates onshore CO2 storage by grid region.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter group_by lag mutate select
 #' @author RLH October 2017
 
-module_gcamusa_LA161.Cstorage <- function(command, ...) {
+module_gcamusa_L161.Cstorage <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/Dooley_CCS_USA"))
diff --git a/input/gcamdata/R/zchunk_LB164.ag_Costs_USA_C_2005_irr.R b/input/gcamdata/R/zgcamusa_L164.ag_Costs_C_2005_irr.R
similarity index 98%
rename from input/gcamdata/R/zchunk_LB164.ag_Costs_USA_C_2005_irr.R
rename to input/gcamdata/R/zgcamusa_L164.ag_Costs_C_2005_irr.R
index 271f810b30..f1e5d369ef 100644
--- a/input/gcamdata/R/zchunk_LB164.ag_Costs_USA_C_2005_irr.R
+++ b/input/gcamdata/R/zgcamusa_L164.ag_Costs_C_2005_irr.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_aglu_LB164.ag_Costs_USA_C_2005_irr
+#' module_gcamusa_L164.ag_Costs_C_2005_irr
 #'
 #' This module calculates production costs of GCAM commodities not including purchased irrigation water.
 #'
@@ -23,7 +23,7 @@
 #' @importFrom tidyr spread
 #' @importFrom stats glm predict
 #' @author ACS June 2017
-module_aglu_LB164.ag_Costs_USA_C_2005_irr <- function(command, ...) {
+module_gcamusa_L164.ag_Costs_C_2005_irr <- function(command, ...) {
 
   MODULE_INPUTS <-
     c(FILE = "common/iso_GCAM_regID",
diff --git a/input/gcamdata/R/zchunk_L171.nonghg_trn_USA.R b/input/gcamdata/R/zgcamusa_L171.nonghg_trn.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L171.nonghg_trn_USA.R
rename to input/gcamdata/R/zgcamusa_L171.nonghg_trn.R
index 4bb5eeff3a..f948d29b0b 100644
--- a/input/gcamdata/R/zchunk_L171.nonghg_trn_USA.R
+++ b/input/gcamdata/R/zgcamusa_L171.nonghg_trn.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L171.nonghg_trn_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L171.nonghg_trn
 #'
 #' Emissions factors for transportation by MARKAL technology in the USA
 #'
@@ -21,7 +23,7 @@
 #' @importFrom tidyr gather spread
 #' @author BY Aug 2019, MAW March 2022
 
-module_gcamusa_L171.nonghg_trn_USA <- function(command, ...) {
+module_gcamusa_L171.nonghg_trn <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE="gcam-usa/emissions/MARKAL_MOVES_class",
              FILE="gcam-usa/emissions/MOVES_vehicle_age_fractions",
@@ -104,7 +106,7 @@ module_gcamusa_L171.nonghg_trn_USA <- function(command, ...) {
       filter(Vintage >= gcamusa.MOVES_MIN_VINTAGE_YEAR & yearID >= min(gcamusa.MOVES_BASE_YEAR_CLASSES)) %>%
       # Assign vintages into five-year bins since emissions factor data is provided in 5 year increments.
       # Each bin gets its year and the 4 years preceding it (i.e. 2010 has 2006-2010).
-      mutate(Vintage = ceiling(Vintage/gcamusa.TRN_EF_timestep)*gcamusa.TRN_EF_timestep) %>%
+      mutate(Vintage = ceiling(Vintage/gcamusa.TRN_EF_TIMESTEP)*gcamusa.TRN_EF_TIMESTEP) %>%
       # Aggregate so the age fractions still add up to one
       group_by(sourceTypeID, yearID, Vintage) %>%
       summarise(ageFraction = sum(ageFraction))%>%
@@ -159,7 +161,7 @@ module_gcamusa_L171.nonghg_trn_USA <- function(command, ...) {
       filter(ageID <= gcamusa.MOVES_MAX_AGE) %>%
       # Assign vintages into five-year bins since emissions factor data is provided in 5 year increments.
       # Each bin gets its year and the 4 years preceding it (i.e. 2010 has 2006-2010).
-      mutate(Vintage = ceiling(Vintage/gcamusa.TRN_EF_timestep)*gcamusa.TRN_EF_timestep) %>%
+      mutate(Vintage = ceiling(Vintage/gcamusa.TRN_EF_TIMESTEP)*gcamusa.TRN_EF_TIMESTEP) %>%
       # Aggregate so the age fractions still add up to one
       group_by(MARKAL_Class, yearID, Vintage) %>%
       summarise(ageFraction = sum(ageFraction))%>%
diff --git a/input/gcamdata/R/zchunk_L201.socioeconomics_USA.R b/input/gcamdata/R/zgcamusa_L201.socioeconomics.R
similarity index 97%
rename from input/gcamdata/R/zchunk_L201.socioeconomics_USA.R
rename to input/gcamdata/R/zgcamusa_L201.socioeconomics.R
index c75967cebd..47f6d8e980 100644
--- a/input/gcamdata/R/zchunk_L201.socioeconomics_USA.R
+++ b/input/gcamdata/R/zgcamusa_L201.socioeconomics.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L201.socioeconomics_USA
+#' module_gcamusa_L201.socioeconomics
 #'
 #' Interest rate, population, and GDP for GCAM-USA.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter lag mutate select rename
 #' @author RLH October 2017
-module_gcamusa_L201.socioeconomics_USA <- function(command, ...) {
+module_gcamusa_L201.socioeconomics <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L100.Pop_thous_state",
@@ -40,7 +40,7 @@ module_gcamusa_L201.socioeconomics_USA <- function(command, ...) {
     L100.GDP_mil90usd_state <- get_data(all_data, "L100.GDP_mil90usd_state", strip_attributes = TRUE)
 
     # ===================================================
-    # NOTE: Socioeconomics for grid regions are dealt with in module_gcamusa_L223.electricity_USA
+    # NOTE: Socioeconomics for grid regions are dealt with in module_gcamusa_L223.electricity
 
     # L201.Pop_GCAMUSA: Population by region from the GCAM 3.0 core scenario
     L201.Pop_GCAMUSA <- L100.Pop_thous_state %>%
diff --git a/input/gcamdata/R/zchunk_L203.water_td_USA.R b/input/gcamdata/R/zgcamusa_L203.water_td.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L203.water_td_USA.R
rename to input/gcamdata/R/zgcamusa_L203.water_td.R
index d880dada6b..e1dfccbc5e 100644
--- a/input/gcamdata/R/zchunk_L203.water_td_USA.R
+++ b/input/gcamdata/R/zgcamusa_L203.water_td.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L203.water_td_USA
+#' module_gcamusa_L203.water_td
 #'
 #' Mapping of water consumption/withdrawal to sectoral demands at the state level.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author NTG May 2020
-module_gcamusa_L203.water_td_USA <- function(command, ...) {
+module_gcamusa_L203.water_td <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "water/basin_to_country_mapping",
              FILE = "water/water_td_sectors",
diff --git a/input/gcamdata/R/zchunk_L210.resources_USA.R b/input/gcamdata/R/zgcamusa_L210.resources.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L210.resources_USA.R
rename to input/gcamdata/R/zgcamusa_L210.resources.R
index 9a8f74a650..2e0813ef1a 100644
--- a/input/gcamdata/R/zchunk_L210.resources_USA.R
+++ b/input/gcamdata/R/zgcamusa_L210.resources.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L210.resources_USA
+#' module_gcamusa_L210.resources
 #'
 #' GCAM-USA resource market information, prices, TechChange parameters, and supply curves.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr anti_join filter if_else group_by lag mutate select summarise bind_rows
 #' @author RLH November 2017
 
-module_gcamusa_L210.resources_USA <- function(command, ...) {
+module_gcamusa_L210.resources <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_L222.en_transformation_USA.R b/input/gcamdata/R/zgcamusa_L222.en_transformation.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L222.en_transformation_USA.R
rename to input/gcamdata/R/zgcamusa_L222.en_transformation.R
index 2919564693..e6bc1b4f67 100644
--- a/input/gcamdata/R/zchunk_L222.en_transformation_USA.R
+++ b/input/gcamdata/R/zgcamusa_L222.en_transformation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L222.en_transformation_USA
+#' module_gcamusa_L222.en_transformation
 #'
 #' Prepare the assumptions and calibrated outputs for energy transformation supplysectors, subsectors, and technologies specific to USA sectors and/or states.
 #'
@@ -23,7 +23,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else group_by left_join mutate one_of pull select summarise
 #' @importFrom tidyr separate unite
 #' @author ACS Nov 2017
-module_gcamusa_L222.en_transformation_USA <- function(command, ...) {
+module_gcamusa_L222.en_transformation <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_L223.electricity_USA.R b/input/gcamdata/R/zgcamusa_L223.electricity.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L223.electricity_USA.R
rename to input/gcamdata/R/zgcamusa_L223.electricity.R
index a112923134..339a8e477c 100644
--- a/input/gcamdata/R/zchunk_L223.electricity_USA.R
+++ b/input/gcamdata/R/zgcamusa_L223.electricity.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L223.electricity_USA
+#' module_gcamusa_L223.electricity
 #'
 #' Generates GCAM-USA model inputs for electrcity sector by grid regions and states.
 #'
@@ -28,7 +28,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange bind_rows filter if_else group_by left_join matches mutate select semi_join summarise transmute rename
 #' @author RC Oct 2017
-module_gcamusa_L223.electricity_USA <- function(command, ...) {
+module_gcamusa_L223.electricity <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_L2231.nonewcoal_USA.R b/input/gcamdata/R/zgcamusa_L2231.nonewcoal.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2231.nonewcoal_USA.R
rename to input/gcamdata/R/zgcamusa_L2231.nonewcoal.R
index 2362aac515..a8596bb518 100644
--- a/input/gcamdata/R/zchunk_L2231.nonewcoal_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2231.nonewcoal.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2231.nonewcoal_USA
+#' module_gcamusa_L2231.nonewcoal
 #'
 #' Generates optional moratorium on new pulverized coal plants in USA states.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr anti_join distinct filter mutate select
 #' @author RC Aug 2018
-module_gcamusa_L2231.nonewcoal_USA <- function(command, ...) {
+module_gcamusa_L2231.nonewcoal <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/A23.elecS_tech_mapping",
              FILE = "gcam-usa/A23.elecS_tech_availability",
diff --git a/input/gcamdata/R/zchunk_L2232.electricity_FERC_USA.R b/input/gcamdata/R/zgcamusa_L2232.electricity_FERC.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2232.electricity_FERC_USA.R
rename to input/gcamdata/R/zgcamusa_L2232.electricity_FERC.R
index 69f7f77426..c28a186e7c 100644
--- a/input/gcamdata/R/zchunk_L2232.electricity_FERC_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2232.electricity_FERC.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2232.electricity_FERC_USA
+#' module_gcamusa_L2232.electricity_FERC
 #'
 #' Generate GCAM-USA model inputs for electrcity trade sectors at the level of grid regions.
 #'
@@ -21,7 +21,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange filter if_else group_by left_join mutate select summarise
 #' @author RC Oct 2017
-module_gcamusa_L2232.electricity_FERC_USA <- function(command, ...) {
+module_gcamusa_L2232.electricity_FERC <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/A23.sector",
diff --git a/input/gcamdata/R/zchunk_LA2233.elec_segments_water_USA.R b/input/gcamdata/R/zgcamusa_L2233.elec_segments_water.R
similarity index 99%
rename from input/gcamdata/R/zchunk_LA2233.elec_segments_water_USA.R
rename to input/gcamdata/R/zgcamusa_L2233.elec_segments_water.R
index 657ada24c5..37b9f31415 100644
--- a/input/gcamdata/R/zchunk_LA2233.elec_segments_water_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2233.elec_segments_water.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_LA2233.elec_segments_water_USA
+#' module_gcamusa_L2233.elec_segments_water
 #'
 #' Generates GCAM-USA model inputs for multiple load segments electricity sector and cooling systems by state.
 #'
@@ -27,7 +27,7 @@
 #' @importFrom dplyr anti_join distinct filter if_else mutate select semi_join summarise_if bind_rows
 #' @importFrom tidyr complete nesting replace_na
 #' @author NTG May 2020
-module_gcamusa_LA2233.elec_segments_water_USA <- function(command, ...) {
+module_gcamusa_L2233.elec_segments_water <- function(command, ...) {
 
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/A23.elecS_tech_mapping_cool",
diff --git a/input/gcamdata/R/zchunk_L2234.elec_segments_USA.R b/input/gcamdata/R/zgcamusa_L2234.elec_segments.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2234.elec_segments_USA.R
rename to input/gcamdata/R/zgcamusa_L2234.elec_segments.R
index 527041abc4..e9ad67e753 100644
--- a/input/gcamdata/R/zchunk_L2234.elec_segments_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2234.elec_segments.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2234.elec_segments_USA
+#' module_gcamusa_L2234.elec_segments
 #'
 #' Generates GCAM-USA model inputs for multiple load segments electricity sector by state.
 #'
@@ -30,7 +30,7 @@
 #' @importFrom tidyr complete nesting replace_na
 #' @importFrom tibble tibble
 #' @author MTB Aug 2018
-module_gcamusa_L2234.elec_segments_USA <- function(command, ...) {
+module_gcamusa_L2234.elec_segments <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/A23.elecS_sector",
diff --git a/input/gcamdata/R/zchunk_L2235.elec_segments_FERC_USA.R b/input/gcamdata/R/zgcamusa_L2235.elec_segments_FERC.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2235.elec_segments_FERC_USA.R
rename to input/gcamdata/R/zgcamusa_L2235.elec_segments_FERC.R
index 6604e9fc34..5dbee6ea63 100644
--- a/input/gcamdata/R/zchunk_L2235.elec_segments_FERC_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2235.elec_segments_FERC.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2235.elec_segments_FERC_USA
+#' module_gcamusa_L2235.elec_segments_FERC
 #'
 #' Creates the vertical segment supplysectors in the grid regions and also the domestic supply and
 #' electricity trade sectors.
@@ -27,7 +27,7 @@
 #' @importFrom dplyr anti_join distinct filter if_else mutate select
 #' @importFrom tibble tibble
 #' @author MTB Aug 2018
-module_gcamusa_L2235.elec_segments_FERC_USA <- function(command, ...) {
+module_gcamusa_L2235.elec_segments_FERC <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/A232.structure",
diff --git a/input/gcamdata/R/zchunk_L2236.elecS_ghg_emissions_USA.R b/input/gcamdata/R/zgcamusa_L2236.elecS_ghg_emissions.R
old mode 100755
new mode 100644
similarity index 98%
rename from input/gcamdata/R/zchunk_L2236.elecS_ghg_emissions_USA.R
rename to input/gcamdata/R/zgcamusa_L2236.elecS_ghg_emissions.R
index 36d53aa8b0..14f9496ff0
--- a/input/gcamdata/R/zchunk_L2236.elecS_ghg_emissions_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2236.elecS_ghg_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L2236.elecS_ghg_emissions_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L2236.elecS_ghg_emissions
 #'
 #' U.S. electricity non CO2 GHG emission and future emission coefficients by sector, fuel and cooling techs
 #'
@@ -14,7 +16,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author KD August 2018 / YO March 2022
-module_gcamusa_L2236.elecS_ghg_emissions_USA <- function(command, ...) {
+module_gcamusa_L2236.elecS_ghg_emissions <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c('L1231.in_EJ_state_elec_F_tech',
              'L201.OutputEmissions_elec',
diff --git a/input/gcamdata/R/zchunk_L2237.wind_reeds_USA.R b/input/gcamdata/R/zgcamusa_L2237.wind_reeds.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2237.wind_reeds_USA.R
rename to input/gcamdata/R/zgcamusa_L2237.wind_reeds.R
index 613c336b53..4c2fb07291 100644
--- a/input/gcamdata/R/zchunk_L2237.wind_reeds_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2237.wind_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2237.wind_reeds_USA
+#' module_gcamusa_L2237.wind_reeds
 #'
 #' Create updated wind resource supply curves consistent with ReEDS.
 #'
@@ -17,7 +17,7 @@
 #' @importFrom dplyr distinct filter lag mutate select row_number semi_join summarise_if group_by bind_rows
 #' @importFrom tidyr gather
 #' @author MTB September 2018
-module_gcamusa_L2237.wind_reeds_USA <- function(command, ...) {
+module_gcamusa_L2237.wind_reeds <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = 'gcam-usa/reeds_regions_states',
              FILE = 'gcam-usa/reeds_wind_curve_capacity',
diff --git a/input/gcamdata/R/zchunk_L2238.PV_reeds_USA.R b/input/gcamdata/R/zgcamusa_L2238.PV_reeds.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2238.PV_reeds_USA.R
rename to input/gcamdata/R/zgcamusa_L2238.PV_reeds.R
index a4bcfb3ebe..65a9a52b8d 100644
--- a/input/gcamdata/R/zchunk_L2238.PV_reeds_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2238.PV_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2238.PV_reeds_USA
+#' module_gcamusa_L2238.PV_reeds
 #'
 #' Create updated solar PV resource supply curves consistent with ReEDS.
 #' Also add non-ReEDS states (AK,DC,HI) based on NREL technical potential data.
@@ -20,7 +20,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author MTB September 2018; AJS June 2019
-module_gcamusa_L2238.PV_reeds_USA <- function(command, ...) {
+module_gcamusa_L2238.PV_reeds <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = 'energy/A10.rsrc_info',
              FILE = 'gcam-usa/states_subregions',
diff --git a/input/gcamdata/R/zchunk_L2239.CSP_reeds_USA.R b/input/gcamdata/R/zgcamusa_L2239.CSP_reeds.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2239.CSP_reeds_USA.R
rename to input/gcamdata/R/zgcamusa_L2239.CSP_reeds.R
index 425255869e..e6ae5314b1 100644
--- a/input/gcamdata/R/zchunk_L2239.CSP_reeds_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2239.CSP_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2239.CSP_reeds_USA
+#' module_gcamusa_L2239.CSP_reeds
 #'
 #' Create updated solar CSP resource supply curves consistent with ReEDS.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author MTB September 2018, AJS June 2019
-module_gcamusa_L2239.CSP_reeds_USA <- function(command, ...) {
+module_gcamusa_L2239.CSP_reeds <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = 'gcam-usa/reeds_regions_states',
              FILE = 'gcam-usa/states_subregions',
diff --git a/input/gcamdata/R/zchunk_L2241.coal_retire_USA.R b/input/gcamdata/R/zgcamusa_L2241.coal_retire.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2241.coal_retire_USA.R
rename to input/gcamdata/R/zgcamusa_L2241.coal_retire.R
index 459a5c3536..557ee0abcb 100644
--- a/input/gcamdata/R/zchunk_L2241.coal_retire_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2241.coal_retire.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2241.coal_retire_USA
+#' module_gcamusa_L2241.coal_retire
 #'
 #' Generates GCAM-USA model input for removing coal capacity retired between 2011 and 2015, 2016 and 2020, and vintaging capacity which continues to operate beyond 2020.
 #'
@@ -24,7 +24,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author RC Aug 2018
-module_gcamusa_L2241.coal_retire_USA <- function(command, ...) {
+module_gcamusa_L2241.coal_retire <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/A23.elec_tech_mapping_coal_retire",
diff --git a/input/gcamdata/R/zchunk_L2242.elec_hydro_USA.R b/input/gcamdata/R/zgcamusa_L2242.elec_hydro.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2242.elec_hydro_USA.R
rename to input/gcamdata/R/zgcamusa_L2242.elec_hydro.R
index 68e3feb7a9..dbbe079c49 100644
--- a/input/gcamdata/R/zchunk_L2242.elec_hydro_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2242.elec_hydro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2242.elec_hydro_USA
+#' module_gcamusa_L2242.elec_hydro
 #'
 #' Update hydro-electricity fixed output to match historical data for 2015 and AEO-2018 for the future.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr distinct filter lag mutate select semi_join
 #' @importFrom tidyr complete nesting
 #' @author MTB September 2018
-module_gcamusa_L2242.elec_hydro_USA <- function(command, ...) {
+module_gcamusa_L2242.elec_hydro <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = 'gcam-usa/EIA_elec_gen_hydro',
              FILE = "gcam-usa/A23.elecS_tech_mapping_cool",
diff --git a/input/gcamdata/R/zchunk_L2244.nuclear_USA.R b/input/gcamdata/R/zgcamusa_L2244.nuclear.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2244.nuclear_USA.R
rename to input/gcamdata/R/zgcamusa_L2244.nuclear.R
index 662d99eca5..7337848df7 100644
--- a/input/gcamdata/R/zchunk_L2244.nuclear_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2244.nuclear.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2244.nuclear_USA
+#' module_gcamusa_L2244.nuclear
 #'
 #' Generates an add-on file to update nuclear assumptions in GCAM-USA.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom dplyr anti_join filter lag mutate select
 #' @importFrom tidyr gather
 #' @author RC Sep 2018; edited MB Sep 2018
-module_gcamusa_L2244.nuclear_USA <- function(command, ...) {
+module_gcamusa_L2244.nuclear <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/nuc_gen2",
              FILE = "gcam-usa/A23.elecS_tech_mapping",
diff --git a/input/gcamdata/R/zchunk_L2245.geothermal_fixed_USA.R b/input/gcamdata/R/zgcamusa_L2245.geothermal_fixed.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2245.geothermal_fixed_USA.R
rename to input/gcamdata/R/zgcamusa_L2245.geothermal_fixed.R
index 32d29d18cc..88aeaca5b6 100644
--- a/input/gcamdata/R/zchunk_L2245.geothermal_fixed_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2245.geothermal_fixed.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2245.geothermal_fixed_USA
+#' module_gcamusa_L2245.geothermal_fixed
 #'
 #' Provide the option for users to fix future geothermal generation capabilities to base year values.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr distinct filter lag mutate select semi_join
 #' @importFrom tidyr complete nesting
 #' @author NTG February 2022
-module_gcamusa_L2245.geothermal_fixed_USA <- function(command, ...) {
+module_gcamusa_L2245.geothermal_fixed <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c('L210.RenewRsrc_USA',
              'L2233.SubsectorShrwt_elecS_cool_USA',
diff --git a/input/gcamdata/R/zchunk_L2247.elecS_tech_costs_USA.R b/input/gcamdata/R/zgcamusa_L2247.elecS_tech_costs.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2247.elecS_tech_costs_USA.R
rename to input/gcamdata/R/zgcamusa_L2247.elecS_tech_costs.R
index 2c9eae33e9..4dbf8650a2 100644
--- a/input/gcamdata/R/zchunk_L2247.elecS_tech_costs_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2247.elecS_tech_costs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2247.elecS_tech_costs_USA
+#' module_gcamusa_L2247.elecS_tech_costs
 #'
 #' Generates add-ons to harmonize reference case generation technology costs for multiple load segments with AEO-2016.
 #'
@@ -23,7 +23,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr complete nesting replace_na
 #' @author RC Sep 2018
-module_gcamusa_L2247.elecS_tech_costs_USA <- function(command, ...) {
+module_gcamusa_L2247.elecS_tech_costs <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/A23.itc_USA",
              FILE = "gcam-usa/A23.ptc_USA",
diff --git a/input/gcamdata/R/zchunk_L225.hydrogen_USA.R b/input/gcamdata/R/zgcamusa_L225.hydrogen.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L225.hydrogen_USA.R
rename to input/gcamdata/R/zgcamusa_L225.hydrogen.R
index f034059a25..05de9f5562 100644
--- a/input/gcamdata/R/zchunk_L225.hydrogen_USA.R
+++ b/input/gcamdata/R/zgcamusa_L225.hydrogen.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L225.hydrogen_USA
+#' module_gcamusa_L225.hydrogen
 #'
 #' Selects the subsectors to be removed from the hydrogen sectors for GCAM USA
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter mutate select
 #' @author KD September 2017
-module_gcamusa_L225.hydrogen_USA <- function(command, ...) {
+module_gcamusa_L225.hydrogen <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L225.Supplysector_h2",
diff --git a/input/gcamdata/R/zchunk_L226.en_distribution_USA.R b/input/gcamdata/R/zgcamusa_L226.en_distribution.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L226.en_distribution_USA.R
rename to input/gcamdata/R/zgcamusa_L226.en_distribution.R
index f4c46e4695..0be5321fc3 100644
--- a/input/gcamdata/R/zchunk_L226.en_distribution_USA.R
+++ b/input/gcamdata/R/zgcamusa_L226.en_distribution.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L226.en_distribution_USA
+#' module_gcamusa_L226.en_distribution
 #'
 #' Create a variety of energy and electricity outputs for USA at the state and/or grid_region level.
 #'
@@ -31,7 +31,7 @@
 #' @importFrom dplyr bind_rows distinct filter if_else group_by left_join mutate select summarize
 #' @importFrom tidyr gather replace_na separate
 #' @author ACS Oct 2017
-module_gcamusa_L226.en_distribution_USA <- function(command, ...) {
+module_gcamusa_L226.en_distribution <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/A21.sector",
diff --git a/input/gcamdata/R/zchunk_L2261.regional_biomass_USA.R b/input/gcamdata/R/zgcamusa_L2261.regional_biomass.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2261.regional_biomass_USA.R
rename to input/gcamdata/R/zgcamusa_L2261.regional_biomass.R
index 3214a67cbc..2595357847 100644
--- a/input/gcamdata/R/zchunk_L2261.regional_biomass_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2261.regional_biomass.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2261.regional_biomass_USA
+#' module_gcamusa_L2261.regional_biomass
 #'
 #' Create biomass supply sectors at the state level.
 #'
@@ -24,7 +24,7 @@
 #' @importFrom dplyr distinct filter inner_join if_else mutate select semi_join
 #' @importFrom tibble tibble
 #' @author MTB Aug 2018
-module_gcamusa_L2261.regional_biomass_USA <- function(command, ...) {
+module_gcamusa_L2261.regional_biomass <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A21.sector",
              FILE = "energy/A26.sector",
diff --git a/input/gcamdata/R/zchunk_L231.proc_sector_USA.R b/input/gcamdata/R/zgcamusa_L231.proc_sector.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L231.proc_sector_USA.R
rename to input/gcamdata/R/zgcamusa_L231.proc_sector.R
index d3405e325b..ebe6ff3a3e 100644
--- a/input/gcamdata/R/zchunk_L231.proc_sector_USA.R
+++ b/input/gcamdata/R/zgcamusa_L231.proc_sector.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L231.proc_sector_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L231.proc_sector
 #'
 #' Writes urban & industrial processing sector outputs for USA.
 #'
@@ -22,7 +24,7 @@
 #' @importFrom tidyr gather spread
 #' @author BY September 2019
 
-module_gcamusa_L231.proc_sector_USA <- function(command, ...) {
+module_gcamusa_L231.proc_sector <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE="emissions/A31.rsrc_info",
              "L231.FinalDemand_urb",
diff --git a/input/gcamdata/R/zchunk_L232.industry_USA.R b/input/gcamdata/R/zgcamusa_L232.industry.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L232.industry_USA.R
rename to input/gcamdata/R/zgcamusa_L232.industry.R
index 775be88948..8014feea5b 100644
--- a/input/gcamdata/R/zchunk_L232.industry_USA.R
+++ b/input/gcamdata/R/zgcamusa_L232.industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L232.industry_USA
+#' module_gcamusa_L232.industry
 #'
 #' Prepare level 2 industry sector files for USA.
 #'
@@ -21,7 +21,7 @@
 #' @importFrom dplyr bind_rows filter if_else group_by left_join mutate select semi_join summarise
 #' @importFrom tidyr complete nesting
 #' @author ST October 2017
-module_gcamusa_L232.industry_USA <- function(command, ...) {
+module_gcamusa_L232.industry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/A32.demand",
diff --git a/input/gcamdata/R/zchunk_L232.water_demand_industry_USA.R b/input/gcamdata/R/zgcamusa_L232.water_demand_industry.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L232.water_demand_industry_USA.R
rename to input/gcamdata/R/zgcamusa_L232.water_demand_industry.R
diff --git a/input/gcamdata/R/zchunk_L2321.cement_USA.R b/input/gcamdata/R/zgcamusa_L2321.cement.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2321.cement_USA.R
rename to input/gcamdata/R/zgcamusa_L2321.cement.R
index b3376ae700..d25bac3cd5 100644
--- a/input/gcamdata/R/zchunk_L2321.cement_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2321.cement.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2321.cement_USA
+#' module_gcamusa_L2321.cement
 #'
 #' Make the logit and input tables for the cement sector in gcam-usa
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr arrange distinct filter if_else group_by left_join mutate select
 #' @importFrom tidyr complete nesting spread
 #' @author KD  November 2017
-module_gcamusa_L2321.cement_USA <- function(command, ...) {
+module_gcamusa_L2321.cement <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_L2322.Fert_USA.R b/input/gcamdata/R/zgcamusa_L2322.Fert.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L2322.Fert_USA.R
rename to input/gcamdata/R/zgcamusa_L2322.Fert.R
index c6aa04f464..65239c0997 100644
--- a/input/gcamdata/R/zchunk_L2322.Fert_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2322.Fert.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2322.Fert_USA
+#' module_gcamusa_L2322.Fert
 #'
 #' Produce tables to create the N fertilizer sector in GCAM-USA.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr distinct filter if_else left_join mutate select
 #' @importFrom tidyr unite
 #' @author KD October 2017
-module_gcamusa_L2322.Fert_USA <- function(command, ...) {
+module_gcamusa_L2322.Fert <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "energy/calibrated_techs",
diff --git a/input/gcamdata/R/zchunk_L2322.industry_vintage_USA.R b/input/gcamdata/R/zgcamusa_L2322.industry_vintage.R
similarity index 97%
rename from input/gcamdata/R/zchunk_L2322.industry_vintage_USA.R
rename to input/gcamdata/R/zgcamusa_L2322.industry_vintage.R
index d72c0737aa..e5c840faf6 100644
--- a/input/gcamdata/R/zchunk_L2322.industry_vintage_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2322.industry_vintage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L2322.industry_vintage_USA
+#' module_gcamusa_L2322.industry_vintage
 #'
 #' Creates a vintage structure and retirement parameters for U.S. industrial energy use
 #'
@@ -14,7 +14,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr filter mutate select
 #' @author KD August 2018; edited MTB October 2018
-module_gcamusa_L2322.industry_vintage_USA <- function(command, ...) {
+module_gcamusa_L2322.industry_vintage <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/A32.ind_retirement_USA",
diff --git a/input/gcamdata/R/zchunk_L244.building_USA.R b/input/gcamdata/R/zgcamusa_L244.building.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L244.building_USA.R
rename to input/gcamdata/R/zgcamusa_L244.building.R
index af80b0a3c6..aa6f6d1743 100644
--- a/input/gcamdata/R/zchunk_L244.building_USA.R
+++ b/input/gcamdata/R/zgcamusa_L244.building.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L244.building_USA
+#' module_gcamusa_L244.building
 #'
 #' Creates GCAM-USA building output files for writing to xml.
 #'
@@ -25,7 +25,7 @@
 #' @importFrom tidyr complete gather nesting replace_na
 #' @author RLH November 2017
 
-module_gcamusa_L244.building_USA <- function(command, ...) {
+module_gcamusa_L244.building <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/A44.gcam_consumer",
              FILE = "energy/A44.sector",
diff --git a/input/gcamdata/R/zchunk_L245.water_demand_municipal_USA.R b/input/gcamdata/R/zgcamusa_L245.water_demand_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L245.water_demand_municipal_USA.R
rename to input/gcamdata/R/zgcamusa_L245.water_demand_municipal.R
diff --git a/input/gcamdata/R/zchunk_L254.transportation_USA.R b/input/gcamdata/R/zgcamusa_L254.transportation.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L254.transportation_USA.R
rename to input/gcamdata/R/zgcamusa_L254.transportation.R
index 0c1f11d6ee..515a00511a 100644
--- a/input/gcamdata/R/zchunk_L254.transportation_USA.R
+++ b/input/gcamdata/R/zgcamusa_L254.transportation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L254.transportation_USA
+#' module_gcamusa_L254.transportation
 #'
 #' Generates GCAM-USA model inputs for transportation sector by states.
 #'
@@ -36,7 +36,7 @@
 #' @importFrom dplyr arrange bind_rows filter if_else group_by left_join mutate select semi_join summarise
 #' @importFrom tidyr replace_na
 #' @author RC Oct 2017
-module_gcamusa_L254.transportation_USA <- function(command, ...) {
+module_gcamusa_L254.transportation <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "energy/mappings/UCD_techs",
              FILE = "energy/A54.globaltech_nonmotor",
diff --git a/input/gcamdata/R/zchunk_L261.carbon_storage_USA.R b/input/gcamdata/R/zgcamusa_L261.carbon_storage.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L261.carbon_storage_USA.R
rename to input/gcamdata/R/zgcamusa_L261.carbon_storage.R
index 48154c8bce..eea4edab9e 100644
--- a/input/gcamdata/R/zchunk_L261.carbon_storage_USA.R
+++ b/input/gcamdata/R/zgcamusa_L261.carbon_storage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L261.carbon_storage_USA
+#' module_gcamusa_L261.carbon_storage
 #'
 #' Generates GCAM-USA input files of carbon storage resource supply curves, shareweights, technology coefficients and costs, and other carbon storage information.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr arrange distinct filter mutate one_of select semi_join
 #' @author RC Nov 2017
-module_gcamusa_L261.carbon_storage_USA <- function(command, ...) {
+module_gcamusa_L261.carbon_storage <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L161.Cstorage_FERC",
diff --git a/input/gcamdata/R/zchunk_L262.dac_USA.R b/input/gcamdata/R/zgcamusa_L262.dac.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L262.dac_USA.R
rename to input/gcamdata/R/zgcamusa_L262.dac.R
index 14f5496414..c9a74edfd7 100644
--- a/input/gcamdata/R/zchunk_L262.dac_USA.R
+++ b/input/gcamdata/R/zgcamusa_L262.dac.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamdata_L262.dac_USA
+#' module_gcamusa_L262.dac
 #'
 #' Compute a variety of final energy keyword, sector, share weight, and technology information for dac-related GCAM-USA inputs.
 #'
@@ -19,7 +19,7 @@
 #' @importFrom dplyr arrange bind_rows distinct filter if_else group_by lag left_join mutate pull select
 #' @importFrom tidyr complete nesting
 #' @author JF March 2021 / YO March 2022
-module_gcamdata_L262.dac_USA <- function(command, ...) {
+module_gcamusa_L262.dac <- function(command, ...) {
 
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
diff --git a/input/gcamdata/R/zchunk_L270.limits_USA.R b/input/gcamdata/R/zgcamusa_L270.limits.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L270.limits_USA.R
rename to input/gcamdata/R/zgcamusa_L270.limits.R
index 15d2db7e50..4844b6d7a6 100644
--- a/input/gcamdata/R/zchunk_L270.limits_USA.R
+++ b/input/gcamdata/R/zgcamusa_L270.limits.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L270.limits_USA
+#' module_gcamusa_L270.limits
 #'
 #' Add the 50 states to the USA market in each of the L270 limits polices.  In
 #' particular to limit the fraction of liquid feedstocks and inputs to electricity
@@ -19,7 +19,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr anti_join filter
 #' @author PLP June 2018
-module_gcamusa_L270.limits_USA <- function(command, ...) {
+module_gcamusa_L270.limits <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              FILE = "gcam-usa/A23.elecS_tech_mapping_cool",
diff --git a/input/gcamdata/R/zchunk_L271.ghg_trn_USA.R b/input/gcamdata/R/zgcamusa_L271.ghg_trn.R
similarity index 96%
rename from input/gcamdata/R/zchunk_L271.ghg_trn_USA.R
rename to input/gcamdata/R/zgcamusa_L271.ghg_trn.R
index d49a3b6fdf..c6bd6b20f0 100644
--- a/input/gcamdata/R/zchunk_L271.ghg_trn_USA.R
+++ b/input/gcamdata/R/zgcamusa_L271.ghg_trn.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L271.ghg_trn_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L271.ghg_trn
 #'
 #' Non-CO2 GHG emissions parameters for transportation technologies in the USA
 #'
@@ -14,7 +16,7 @@
 #' @importFrom tidyr gather
 #' @author BY September 2019 / YO 2022
 
-module_gcamusa_L271.ghg_trn_USA <- function(command, ...) {
+module_gcamusa_L271.ghg_trn <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L201.en_ghg_emissions",
              "L254.StubTranTechCalInput_USA"))
diff --git a/input/gcamdata/R/zchunk_L271.nonghg_trn_USA.R b/input/gcamdata/R/zgcamusa_L271.nonghg_trn.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L271.nonghg_trn_USA.R
rename to input/gcamdata/R/zgcamusa_L271.nonghg_trn.R
index 2bed76095b..e270f23224 100644
--- a/input/gcamdata/R/zchunk_L271.nonghg_trn_USA.R
+++ b/input/gcamdata/R/zgcamusa_L271.nonghg_trn.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L271.nonghg_trn_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L271.nonghg_trn
 #'
 #' Non-GHG emissions parameters for transportation technologies in the USA
 #'
@@ -15,7 +17,7 @@
 #' @importFrom stats lm
 #' @author BY September 2019, MAW March 2022
 
-module_gcamusa_L271.nonghg_trn_USA <- function(command, ...) {
+module_gcamusa_L271.nonghg_trn <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L254.StubTranTech_USA",
              FILE="gcam-usa/emissions/MARKAL_UCD_class",
diff --git a/input/gcamdata/R/zchunk_L272.nonghg_elc_USA.R b/input/gcamdata/R/zgcamusa_L272.nonghg_elc.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L272.nonghg_elc_USA.R
rename to input/gcamdata/R/zgcamusa_L272.nonghg_elc.R
index 0b551bcf59..1723204635 100644
--- a/input/gcamdata/R/zchunk_L272.nonghg_elc_USA.R
+++ b/input/gcamdata/R/zgcamusa_L272.nonghg_elc.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L272.elc_nonghg_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L272.elc_nonghg
 #'
 #' Calculate Non-GHG emissions parameters for electricity technologies in the USA
 #'
@@ -13,7 +15,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author AJS and BY August 2019, MAW March 2022
-  module_gcamusa_L272.elc_nonghg_USA <- function(command, ...) {
+  module_gcamusa_L272.elc_nonghg <- function(command, ...) {
     if(command == driver.DECLARE_INPUTS) {
       return(c(FILE = "gcam-usa/emissions/BC_OC_assumptions",
                FILE = "gcam-usa/emissions/BCOC_PM25_ratios",
diff --git a/input/gcamdata/R/zchunk_L2722.nonghg_elc_linear_control_USA.R b/input/gcamdata/R/zgcamusa_L2722.nonghg_elc_linear_control.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2722.nonghg_elc_linear_control_USA.R
rename to input/gcamdata/R/zgcamusa_L2722.nonghg_elc_linear_control.R
index c70242abac..400888d293 100644
--- a/input/gcamdata/R/zchunk_L2722.nonghg_elc_linear_control_USA.R
+++ b/input/gcamdata/R/zgcamusa_L2722.nonghg_elc_linear_control.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L2722.nonghg_elc_linear_control_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L2722.nonghg_elc_linear_control
 #'
 #' Calculate NOx and SO2 emission factors and linear control parameters for coal - electricity technologies in the USA
 #'
@@ -12,7 +14,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author MAW October 2020
-module_gcamusa_L2722.nonghg_elc_linear_control_USA <- function(command, ...) {
+module_gcamusa_L2722.nonghg_elc_linear_control <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L101.inEIA_EJ_state_S_F_all_years",
              "L270.nonghg_tg_state_elec_F_Yb",
diff --git a/input/gcamdata/R/zchunk_L273.en_ghg_emissions_USA.R b/input/gcamdata/R/zgcamusa_L273.en_ghg_emissions.R
old mode 100755
new mode 100644
similarity index 99%
rename from input/gcamdata/R/zchunk_L273.en_ghg_emissions_USA.R
rename to input/gcamdata/R/zgcamusa_L273.en_ghg_emissions.R
index db13012e02..5c2f0444fb
--- a/input/gcamdata/R/zchunk_L273.en_ghg_emissions_USA.R
+++ b/input/gcamdata/R/zgcamusa_L273.en_ghg_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L273.en_ghg_emissions_USA
+#' module_gcamusa_L273.en_ghg_emissions
 #'
 #' Define non-CO2 GHG emissions for GCAM-USA states, including 1. CH4 and N2O in refinery,
 #' buildings, N fertilizer, industrial energy use; 2. F-gases in cooling and power
@@ -19,7 +19,7 @@
 #' @importFrom tidyr gather spread
 #' @author KRD 2018; MTB 2018; YO 2021
 
-module_gcamusa_L273.en_ghg_emissions_USA <- function(command, ...) {
+module_gcamusa_L273.en_ghg_emissions <- function(command, ...) {
   UCD_tech_map_name <- if_else(energy.TRAN_UCD_MODE == 'rev.mode',
                                "energy/mappings/UCD_techs_revised", "energy/mappings/UCD_techs")
   if(command == driver.DECLARE_INPUTS) {
diff --git a/input/gcamdata/R/zchunk_L273.nonghg_refinery_USA.R b/input/gcamdata/R/zgcamusa_L273.nonghg_refinery.R
similarity index 97%
rename from input/gcamdata/R/zchunk_L273.nonghg_refinery_USA.R
rename to input/gcamdata/R/zgcamusa_L273.nonghg_refinery.R
index 0abaf08c35..54324bb58f 100644
--- a/input/gcamdata/R/zchunk_L273.nonghg_refinery_USA.R
+++ b/input/gcamdata/R/zgcamusa_L273.nonghg_refinery.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L273.nonghg_refinery_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L273.nonghg_refinery
 #'
 #' Non-GHG input emissions parameters for refining sector in the USA
 #'
@@ -13,7 +15,7 @@
 #' @importFrom tidyr gather spread
 #' @author MAW March 2022
 
-module_gcamusa_L273.nonghg_refinery_USA <- function(command, ...) {
+module_gcamusa_L273.nonghg_refinery <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/states_subregions",
              "L270.nonghg_tg_state_refinery_F_Yb",
diff --git a/input/gcamdata/R/zchunk_L274.nonghg_bld_USA.R b/input/gcamdata/R/zgcamusa_L274.nonghg_bld.R
similarity index 96%
rename from input/gcamdata/R/zchunk_L274.nonghg_bld_USA.R
rename to input/gcamdata/R/zgcamusa_L274.nonghg_bld.R
index 600e720b89..47366ca427 100644
--- a/input/gcamdata/R/zchunk_L274.nonghg_bld_USA.R
+++ b/input/gcamdata/R/zgcamusa_L274.nonghg_bld.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L274.nonghg_bld_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L274.nonghg_bld
 #'
 #' Non-GHG input emissions parameters for buildings technologies in the USA
 #'
@@ -14,7 +16,7 @@
 #' @importFrom tidyr gather spread
 #' @author BY Aug 2019, MAW July 2021
 
-module_gcamusa_L274.nonghg_bld_USA <- function(command, ...) {
+module_gcamusa_L274.nonghg_bld <- function(command, ...) {
 if(command == driver.DECLARE_INPUTS) {
   return(c("L244.StubTechCalInput_bld_gcamusa",
            "L244.StubTech_bld_gcamusa",
@@ -170,8 +172,11 @@ if(command == driver.DECLARE_INPUTS) {
   L274.nonghg_bld_tech_coeff_USA_ResWoodF_PM <- EPA_resid_wood_furnace_PM_EF_future_factors %>%
     # need to use left join because we are changing the number of rows in the table, having a row for every region (state)
     filter(year > MODEL_FINAL_BASE_YEAR) %>%
-    left_join((L274.nonghg_bld_tech_coeff_Yb_USA %>% filter(year == MODEL_FINAL_BASE_YEAR)),
-              by = c("supplysector", "stub.technology", "Non.CO2")) %>%
+    left_join((L274.nonghg_bld_tech_coeff_Yb_USA %>% filter(year == if_else( # Want to filter to MODEL_FINAL_BASE_YEAR
+      MODEL_FINAL_BASE_YEAR > max(L274.nonghg_bld_tech_coeff_Yb_USA$year), # But in case not in data, filter to max year
+      max(L274.nonghg_bld_tech_coeff_Yb_USA$year),
+      MODEL_FINAL_BASE_YEAR))),
+      by = c("supplysector", "stub.technology", "Non.CO2")) %>%
     mutate(emiss.coef = factor * emiss.coef) %>%
     rename(year = year.x) %>%
     select(-c(factor, year.y))
diff --git a/input/gcamdata/R/zchunk_L275.nonghg_indenergy_USA.R b/input/gcamdata/R/zgcamusa_L275.nonghg_indenergy.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L275.nonghg_indenergy_USA.R
rename to input/gcamdata/R/zgcamusa_L275.nonghg_indenergy.R
index 8da2af1bf8..bb0e903951 100644
--- a/input/gcamdata/R/zchunk_L275.nonghg_indenergy_USA.R
+++ b/input/gcamdata/R/zgcamusa_L275.nonghg_indenergy.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L275.indenergy_nonghg_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L275.indenergy_nonghg
 #'
 #' Non-GHG input emissions parameters for industrial energy use sector in the USA
 #'
@@ -14,7 +16,7 @@
 #' @importFrom tidyr gather spread
 #' @author BY Aug 2019, MAW March 2022
 
-module_gcamusa_L275.indenergy_nonghg_USA <- function(command, ...) {
+module_gcamusa_L275.indenergy_nonghg <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.StubTechCalInput_indenergy_USA",
              "L270.nonghg_tg_state_indenergy_F_Yb",
diff --git a/input/gcamdata/R/zchunk_L276.nonghg_othertrn_USA.R b/input/gcamdata/R/zgcamusa_L276.nonghg_othertrn.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L276.nonghg_othertrn_USA.R
rename to input/gcamdata/R/zgcamusa_L276.nonghg_othertrn.R
index c5e610151d..58e7d94392 100644
--- a/input/gcamdata/R/zchunk_L276.nonghg_othertrn_USA.R
+++ b/input/gcamdata/R/zgcamusa_L276.nonghg_othertrn.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L276.nonghg_othertrn_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L276.nonghg_othertrn
 #'
 #' Generates GCAM-USA input files of Non-GHG input emissions parameters for domestic aviation, ships, and rail.
 #'
@@ -13,7 +15,7 @@
 #' @importFrom dplyr filter mutate select
 #' @importFrom tidyr gather spread
 #' @author MAW March 2022
-module_gcamusa_L276.nonghg_othertrn_USA <- function(command, ...) {
+module_gcamusa_L276.nonghg_othertrn <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "gcam-usa/emissions/BC_OC_assumptions",
              FILE="gcam-usa/emissions/BCOC_PM25_ratios",
diff --git a/input/gcamdata/R/zchunk_L277.ghg_prc_USA.R b/input/gcamdata/R/zgcamusa_L277.ghg_prc.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L277.ghg_prc_USA.R
rename to input/gcamdata/R/zgcamusa_L277.ghg_prc.R
index 8eb4f879ca..e2552ab549 100644
--- a/input/gcamdata/R/zchunk_L277.ghg_prc_USA.R
+++ b/input/gcamdata/R/zgcamusa_L277.ghg_prc.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_L277.ghg_prc_USA
+#' module_gcamusa_L277.ghg_prc
 #'
 #' Generates input ghg emissions and marginal abatement curves for industrial processes and urban processes by
 #' energy technology for U.S. states
@@ -16,7 +16,7 @@
 #' @importFrom dplyr filter mutate select
 #' @author Yang Ou Feb 2023
 #'
-module_gcamusa_L277.ghg_prc_USA <- function(command, ...) {
+module_gcamusa_L277.ghg_prc <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE="gcam-usa/emissions/EPA_state_ghg_emission_2022",
              FILE="gcam-usa/emissions/EPA_state_ghg_emission_2022_mapping",
diff --git a/input/gcamdata/R/zchunk_L277.nonghg_prc_USA.R b/input/gcamdata/R/zgcamusa_L277.nonghg_prc.R
similarity index 96%
rename from input/gcamdata/R/zchunk_L277.nonghg_prc_USA.R
rename to input/gcamdata/R/zgcamusa_L277.nonghg_prc.R
index 4423c60fe4..91bb117b5e 100644
--- a/input/gcamdata/R/zchunk_L277.nonghg_prc_USA.R
+++ b/input/gcamdata/R/zgcamusa_L277.nonghg_prc.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_L277.nonghg_prc_USA
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_L277.nonghg_prc
 #'
 #' Generates input emissions for process and cement sectors by energy technology for Non.CO2 air pollutants for U.S. states
 #' Writes out max emissions reductions and steepness to all process-related energy technologies and states
@@ -14,7 +16,7 @@
 #' @importFrom tidyr gather spread
 #' @author BY September 2019, MAW May 2021
 #'
-module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
+module_gcamusa_L277.nonghg_prc <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.nonco2_max_reduction",
              "L232.nonco2_steepness",
@@ -150,7 +152,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       write_to_all_states(LEVEL2_DATA_NAMES[["GDPCtrlMax"]]) %>%
       mutate(year = max(MODEL_BASE_YEARS),
              # this is a somewhat arbitrary value, but consistent between pollutants
-             max.reduction = gcamusa.NONGHG_PROC_SECTORS.gdp_max_reduction ) %>%
+             max.reduction = gcamusa.NONGHG_PROC_SECTORS.GDP_MAX_REDUCTION ) %>%
       distinct()
 
     # Adding controls for PM and NH3 emissions
@@ -159,7 +161,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       filter(Non.CO2 == "NMVOC") %>%
       # then removing this column
       select( -Non.CO2 ) %>%
-      repeat_add_columns(tibble(Non.CO2 = gcamusa.NONGHG_PROC_SECTORS.missing_pollutants)) %>%
+      repeat_add_columns(tibble(Non.CO2 = gcamusa.NONGHG_PROC_SECTORS.MISSING_POLLUTANTS)) %>%
       # rebind to table without PMs and NH3
       bind_rows( L277.nonghg_max_reduction_USA_noPM )
 
@@ -169,7 +171,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       filter(subsector == "landfills") %>%
       # then removing this column
       select( -subsector ) %>%
-      repeat_add_columns(tibble(subsector = gcamusa.NONGHG_PROC_SECTORS.missing_subsectors)) %>%
+      repeat_add_columns(tibble(subsector = gcamusa.NONGHG_PROC_SECTORS.MISSING_SUBSECTORS)) %>%
       # making the stub.technology name match the subsector name
       mutate( stub.technology = subsector ) %>%
       # rebind to table without wastewater
@@ -182,7 +184,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       write_to_all_states(LEVEL2_DATA_NAMES[["GDPCtrlSteep"]]) %>%
       mutate(year = max(MODEL_BASE_YEARS),
              # this is the current value for all pollutants anyway
-             steepness = gcamusa.NONGHG_PROC_SECTORS.gdp_steepness) %>%
+             steepness = gcamusa.NONGHG_PROC_SECTORS.GDP_STEEPNESS) %>%
       distinct()
 
     # Adding controls for PM and NH3 emissions
@@ -191,7 +193,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       filter(Non.CO2 == "NMVOC") %>%
       # then removing this column
       select( -Non.CO2 ) %>%
-      repeat_add_columns(tibble(Non.CO2 = gcamusa.NONGHG_PROC_SECTORS.missing_pollutants)) %>%
+      repeat_add_columns(tibble(Non.CO2 = gcamusa.NONGHG_PROC_SECTORS.MISSING_POLLUTANTS)) %>%
       # rebind to table without PMs and NH3
       bind_rows( L277.nonghg_steepness_USA_noPM )
 
@@ -201,7 +203,7 @@ module_gcamusa_L277.nonghg_prc_USA <- function(command, ...) {
       filter(subsector == "landfills") %>%
       # then removing this column
       select( -subsector ) %>%
-      repeat_add_columns(tibble(subsector = gcamusa.NONGHG_PROC_SECTORS.missing_subsectors)) %>%
+      repeat_add_columns(tibble(subsector = gcamusa.NONGHG_PROC_SECTORS.MISSING_SUBSECTORS)) %>%
       # making the stub.technology name match the subsector name
       mutate( stub.technology = subsector ) %>%
       # rebind to table without wastewater
diff --git a/input/gcamdata/R/zchunk_batch_Cstorage_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_Cstorage.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_Cstorage_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_Cstorage.R
index f4881ab5f5..b43ef6ca00 100644
--- a/input/gcamdata/R/zchunk_batch_Cstorage_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_Cstorage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_Cstorage_USA_xml
+#' module_gcamusa_Cstorage_xml
 #'
 #' Construct XML data structure for \code{Cstorage_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{Cstorage_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_Cstorage_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_Cstorage_USA_xml <- function(command, ...) {
+module_gcamusa_Cstorage_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L261.DeleteRsrc_USAC",
              "L261.DeleteSubsector_USAC",
diff --git a/input/gcamdata/R/zchunk_batch_Fert_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_Fert.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_Fert_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_Fert.R
index a611ea0311..682f870527 100644
--- a/input/gcamdata/R/zchunk_batch_Fert_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_Fert.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_Fert_USA_xml
+#' module_gcamusa_Fert_xml
 #'
 #' Construct XML data structure for \code{Fert_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{Fert_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_Fert_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_Fert_USA_xml <- function(command, ...) {
+module_gcamusa_Fert_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2322.DeleteSubsector_USAFert",
              "L2322.FinalEnergyKeyword_Fert_USA",
diff --git a/input/gcamdata/R/zchunk_batch_HDDCDD_A2_GFDL_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_HDDCDD_A2_GFDL.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_HDDCDD_A2_GFDL_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_HDDCDD_A2_GFDL.R
index 5cdc2d1bbe..cf7f82eca6 100644
--- a/input/gcamdata/R/zchunk_batch_HDDCDD_A2_GFDL_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_HDDCDD_A2_GFDL.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_HDDCDD_A2_GFDL_USA.xml
+#' module_gcamusa_HDDCDD_A2_GFDL.xml
 #'
 #' Construct XML data structure for \code{HDDCDD_A2_GFDL_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{HDDCDD_A2_GFDL_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_HDDCDD_A2_GFDL_USA.xml} (gcamusa XML).
-module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml <- function(command, ...) {
+module_gcamusa_HDDCDD_A2_GFDL_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.HDDCDD_A2_GFDL_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_HDDCDD_AEO_2015_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_HDDCDD_AEO_2015.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_HDDCDD_AEO_2015_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_HDDCDD_AEO_2015.R
index a0aa41ec1f..0808983cd3 100644
--- a/input/gcamdata/R/zchunk_batch_HDDCDD_AEO_2015_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_HDDCDD_AEO_2015.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml
+#' module_gcamusa_HDDCDD_AEO_2015_xml
 #'
 #' Construct XML data structure for \code{HDDCDD_AEO_2015_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' The generated outputs: \code{HDDCDD_AEO_2015_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_HDDCDD_QER_QER_USA.xml} (gcamusa XML batch).
-module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml <- function(command, ...) {
+module_gcamusa_HDDCDD_AEO_2015_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.HDDCDD_AEO_2015_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_HDDCDD_constdds_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_HDDCDD_constdds.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_HDDCDD_constdds_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_HDDCDD_constdds.R
index 69d7bb4d8a..084de19131 100644
--- a/input/gcamdata/R/zchunk_batch_HDDCDD_constdds_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_HDDCDD_constdds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_HDDCDD_constdds_USA_xml
+#' module_gcamusa_HDDCDD_constdds_xml
 #'
 #' Construct XML data structure for \code{HDDCDD_constdds_USA.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{HDDCDD_constdds_USA.xml}.
-module_gcamusa_batch_HDDCDD_constdds_USA_xml <- function(command, ...) {
+module_gcamusa_HDDCDD_constdds_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.HDDCDD_constdds_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_bld_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_bld_emissions.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_bld_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_bld_emissions.R
index 2c999beec2..7eea58453a 100644
--- a/input/gcamdata/R/zchunk_batch_bld_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_bld_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_bld_emissions_USA_xml
+#' module_gcamusa_bld_emissions_xml
 #'
 #' Construct XML data structure for \code{bld_emissions_USA.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{bld_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{bld_emissions_USA.xml} (gcamusa XML).
 
-module_gcamusa_batch_bld_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_bld_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L274.nonghg_bld_tech_coeff_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_building_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_building.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_building_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_building.R
index 1864abc27d..79573be397 100644
--- a/input/gcamdata/R/zchunk_batch_building_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_building.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_building_USA_xml
+#' module_gcamusa_building_xml
 #'
 #' Construct XML data structure for \code{building_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{building_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_building_USA.xml} (gcamusa XML).
-module_gcamusa_batch_building_USA_xml <- function(command, ...) {
+module_gcamusa_building_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L244.DeleteConsumer_USAbld",
              "L244.DeleteSupplysector_USAbld",
diff --git a/input/gcamdata/R/zchunk_batch_cement_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_cement.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_cement_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_cement.R
index b6c9620760..fc08cab940 100644
--- a/input/gcamdata/R/zchunk_batch_cement_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_cement.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_cement_USA_xml
+#' module_gcamusa_cement_xml
 #'
 #' Construct XML data structure for \code{cement_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{cement_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_cement_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_cement_USA_xml <- function(command, ...) {
+module_gcamusa_cement_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L210.DeleteUnlimitRsrc_USAlimestone",
              "L210.UnlimitRsrc_limestone_USA",
diff --git a/input/gcamdata/R/zchunk_batch_coal_delay_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_coal_delay.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_coal_delay_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_coal_delay.R
index 94c1484de0..a1dd2dd0c9 100644
--- a/input/gcamdata/R/zchunk_batch_coal_delay_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_coal_delay.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_coal_delay_USA_xml
+#' module_gcamusa_coal_delay_xml
 #'
 #' Construct XML data structure for \code{coal_delay_USA.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{coal_delay_USA.xml}.
-module_gcamusa_batch_coal_delay_USA_xml <- function(command, ...) {
+module_gcamusa_coal_delay_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2231.SubsectorShrwt_coal_delay_elecS_cool_USA",
              "L2231.StubTechShrwt_coal_delay_nongen_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_coal_retire_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_coal_retire.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_coal_retire_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_coal_retire.R
index 14dacfd3ab..3837ef0123 100644
--- a/input/gcamdata/R/zchunk_batch_coal_retire_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_coal_retire.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_coal_retire_USA_xml
+#' module_gcamusa_coal_retire_xml
 #'
 #' Construct XML data structure for \code{coal_retire_vintage_USA.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{coal_retire_vintage_USA.xml}.
-module_gcamusa_batch_coal_retire_USA_xml <- function(command, ...) {
+module_gcamusa_coal_retire_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2241.StubTechProd_elec_coalret_USA",
              "L2241.StubTechEff_elec_coalret_USA",
diff --git a/input/gcamdata/R/zchunk_batch_dac_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_dac.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_dac_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_dac.R
index d9aa4f89ec..fc7ded3bec 100644
--- a/input/gcamdata/R/zchunk_batch_dac_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_dac.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_dac_USA_xml
+#' module_gcamusa_dac_xml
 #'
 #' Construct XML data structure for \code{dac_USA.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{dac_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_dac_USA_xml.R} (gcamusa XML).
 #' @author JF March 2021
-module_gcamusa_batch_dac_USA_xml <- function(command, ...) {
+module_gcamusa_dac_xml <- function(command, ...) {
 
   TECH_PARAMETRIZATION_INPUTS <- paste0("ssp", 1:5)
   if(command == driver.DECLARE_INPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_elc_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_elc_emissions.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_elc_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elc_emissions.R
index 27ea88b617..1df802f4f7 100644
--- a/input/gcamdata/R/zchunk_batch_elc_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elc_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_elc_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_elc_emissions_xml
 #'
 #' Construct XML data structure for \code{elc_emissions_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elc_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_elc_nonghg_USA.R} (gcamusa XML).
-module_gcamusa_batch_elc_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_elc_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L272.nonghg_elec_tech_coeff_USA",
              "L2722.nonghg_elec_tech_coeff_USA_linear_control",
diff --git a/input/gcamdata/R/zchunk_batch_elecS_costs_USA_itc_xml.R b/input/gcamdata/R/zgcamusa_xml_elecS_costs_itc.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_elecS_costs_USA_itc_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elecS_costs_itc.R
index 72a13b055d..c9878652b4 100644
--- a/input/gcamdata/R/zchunk_batch_elecS_costs_USA_itc_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elecS_costs_itc.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_elecS_costs_USA_itc_xml
+#' module_gcamusa_elecS_costs_itc_xml
 #'
 #' Construct XML data structure for \code{elecS_costs_USA_itc.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elecS_costs_USA_itc.xml}. The corresponding file in the
 #' original data system was \code{batch_elecS_costs_USA_itc.xml} (gcamusa xml-batch).
-module_gcamusa_batch_elecS_costs_USA_itc_xml <- function(command, ...) {
+module_gcamusa_elecS_costs_itc_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2247.GlobalTechFCROnly_elecS_itc_USA",
              "L2247.GlobalIntTechFCROnly_elecS_itc_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_elecS_costs_USA_ptc_xml.R b/input/gcamdata/R/zgcamusa_xml_elecS_costs_ptc.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_elecS_costs_USA_ptc_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elecS_costs_ptc.R
index 4192e88597..74cd5c12dc 100644
--- a/input/gcamdata/R/zchunk_batch_elecS_costs_USA_ptc_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elecS_costs_ptc.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_elecS_costs_USA_ptc_xml
+#' module_gcamusa_elecS_costs_ptc_xml
 #'
 #' Construct XML data structure for \code{elecS_costs_USA_ptc.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elecS_costs_USA_ptc.xml}. The corresponding file in the
 #' original data system was \code{batch_elecS_costs_USA_ptc.xml} (gcamusa xml-batch).
-module_gcamusa_batch_elecS_costs_USA_ptc_xml <- function(command, ...) {
+module_gcamusa_elecS_costs_ptc_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2247.GlobalTechCost_ptc_USA",
              "L2247.GlobalIntTechCost_ptc_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_elecS_ghg_emissions_water_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_elecS_ghg_emissions_water.R
old mode 100755
new mode 100644
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_elecS_ghg_emissions_water_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elecS_ghg_emissions_water.R
index b036ade3bc..24d48c2257
--- a/input/gcamdata/R/zchunk_batch_elecS_ghg_emissions_water_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elecS_ghg_emissions_water.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_elecS_ghg_emissions_water_xml
 #'
 #' Construct XML data structure for \code{elecS_ghg_emissions_water_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elecS_ghg_emissions_water_USA.xml}. The corresponding file in the
 #' original data system was \code{elecS_ghg_emissions_water_USA.xml} (gcamusa XML).
-module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml <- function(command, ...) {
+module_gcamusa_elecS_ghg_emissions_water_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2236.elecS_cool_ghg_tech_coeff_USA",
              "L2236.elecS_cool_ghg_emissions_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_elec_hydro_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_elec_hydro.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_elec_hydro_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elec_hydro.R
index 7e3375017d..40f24bfada 100644
--- a/input/gcamdata/R/zchunk_batch_elec_hydro_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elec_hydro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_elec_hydro_USA_xml
+#' module_gcamusa_elec_hydro_xml
 #'
 #' Construct XML data structure for \code{elec_hydro_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elec_hydro_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_elec_hydro_USA.xml} (gcamusa XML batch).
-module_gcamusa_batch_elec_hydro_USA_xml <- function(command, ...) {
+module_gcamusa_elec_hydro_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2242.StubTechFixOut_hydro_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_elec_segments_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_elec_segments.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_elec_segments_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elec_segments.R
index 9a88e6a867..7ab17a3b79 100644
--- a/input/gcamdata/R/zchunk_batch_elec_segments_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elec_segments.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_elec_segments_USA_xml
+#' module_gcamusa_elec_segments_xml
 #'
 #' Construct XML data structure for \code{elec_segments_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{elec_segments_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_elec_segments_USA.xml} (gcamusa xml-batch).
-module_gcamusa_batch_elec_segments_USA_xml <- function(command, ...) {
+module_gcamusa_elec_segments_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2234.Supplysector_elecS_USA",
              "L2234.ElecReserve_elecS_USA",
diff --git a/input/gcamdata/R/zchunk_batch_elec_segments_water_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_elec_segments_water.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_elec_segments_water_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_elec_segments_water.R
index 248393e151..9128b250fd 100644
--- a/input/gcamdata/R/zchunk_batch_elec_segments_water_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_elec_segments_water.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_elec_segments_water_USA_xml
+#' module_gcamusa_elec_segments_water_xml
 #'
 #' Construct XML data structure for \code{elec_segments_water_USA.xml}.
 #'
@@ -11,7 +11,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electricity_water.xml}. The corresponding file in the
 #' original data system was \code{batch_electricity_water.xml.R} (water XML).
-module_gcamusa_batch_elec_segments_water_USA_xml <- function(command, ...) {
+module_gcamusa_elec_segments_water_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2233.GlobalTechEff_elecS_cool_USA",
              "L2233.GlobalTechShrwt_elecS_cool_USA",
diff --git a/input/gcamdata/R/zchunk_batch_electd_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_electd.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_electd_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_electd.R
index 4230bd41cf..03190e9260 100644
--- a/input/gcamdata/R/zchunk_batch_electd_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_electd.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_electd_USA_xml
+#' module_gcamusa_electd_xml
 #'
 #' Construct XML data structure for \code{electd_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electd_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_electd_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_electd_USA_xml <- function(command, ...) {
+module_gcamusa_electd_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L226.DeleteSupplysector_USAelec",
              "L226.Supplysector_electd_USA",
diff --git a/input/gcamdata/R/zchunk_batch_electricity_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_electricity.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_electricity_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_electricity.R
index fcfa4b7a0f..09ef624fca 100644
--- a/input/gcamdata/R/zchunk_batch_electricity_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_electricity.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_electricity_USA_xml
+#' module_gcamusa_electricity_xml
 #'
 #' Construct XML data structure for \code{electricity_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electricity_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_electricity_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_electricity_USA_xml <- function(command, ...) {
+module_gcamusa_electricity_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.PassthroughSector_elec_USA",
              "L223.PassthroughTech_elec_FERC",
diff --git a/input/gcamdata/R/zchunk_batch_en_prices_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_en_prices.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_en_prices_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_en_prices.R
index 4cb5ede4b8..a9cf97d5e7 100644
--- a/input/gcamdata/R/zchunk_batch_en_prices_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_en_prices.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_en_prices_USA_xml
+#' module_gcamusa_en_prices_xml
 #'
 #' Construct XML data structure for \code{en_prices_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_prices_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_en_prices_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_en_prices_USA_xml <- function(command, ...) {
+module_gcamusa_en_prices_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L226.Supplysector_en_USA",
              "L226.SubsectorShrwtFllt_en_USA",
diff --git a/input/gcamdata/R/zchunk_batch_en_transformation_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_en_transformation.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_en_transformation_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_en_transformation.R
index a531459650..bd95577c8f 100644
--- a/input/gcamdata/R/zchunk_batch_en_transformation_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_en_transformation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_en_transformation_USA_xml
+#' module_gcamusa_en_transformation_xml
 #'
 #' Construct XML data structure for \code{en_transformation_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{en_transformation_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_en_transformation_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_en_transformation_USA_xml <- function(command, ...) {
+module_gcamusa_en_transformation_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L222.DeleteStubTech_USAen",
              "L222.PassThroughSector_USAen",
diff --git a/input/gcamdata/R/zchunk_batch_geothermal_fixed_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_geothermal_fixed.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_geothermal_fixed_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_geothermal_fixed.R
index b1880d098f..6b3058c890 100644
--- a/input/gcamdata/R/zchunk_batch_geothermal_fixed_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_geothermal_fixed.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_geothermal_fixed_USA_xml
+#' module_gcamusa_geothermal_fixed_xml
 #'
 #' Construct XML data structure for \code{geothermal_fixed_USA.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{geothermal_fixed_USA.xml}.
-module_gcamusa_batch_geothermal_fixed_USA_xml <- function(command, ...) {
+module_gcamusa_geothermal_fixed_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2245.DeleteRenewRsrc_USAgeo",
              "L2245.DeleteNestingSubsector1_USAgeo",
diff --git a/input/gcamdata/R/zchunk_batch_ghg_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_ghg_emissions.R
old mode 100755
new mode 100644
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_ghg_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_ghg_emissions.R
index 0665f5dd1e..cef716c70e
--- a/input/gcamdata/R/zchunk_batch_ghg_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_ghg_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_ghg_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_ghg_emissions_xml
 #'
 #' Construct XML data structure for \code{ghg_emissions_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ghg_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_ghg_emissions_USA.xml} (gcamusa XML).
-module_gcamusa_batch_ghg_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_ghg_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L273.en_ghg_tech_coeff_USA",
              "L273.en_ghg_emissions_USA",
diff --git a/input/gcamdata/R/zchunk_batch_hydrogen_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_hydrogen.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_hydrogen_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_hydrogen.R
index b7d11c5acd..6ce57af588 100644
--- a/input/gcamdata/R/zchunk_batch_hydrogen_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_hydrogen.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_hydrogen_USA_xml
+#' module_gcamusa_hydrogen_xml
 #'
 #' Construct XML data structure for \code{hydrogen_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{hydrogen_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_hydrogen_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_hydrogen_USA_xml <- function(command, ...) {
+module_gcamusa_hydrogen_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L225.DeleteSupplysector_h2_USA",
              "L225.Supplysector_h2_USA",
diff --git a/input/gcamdata/R/zchunk_batch_ind_urb_proc_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_ind_urb_proc_emissions.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_ind_urb_proc_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_ind_urb_proc_emissions.R
index 30bb852e7a..e48356d214 100644
--- a/input/gcamdata/R/zchunk_batch_ind_urb_proc_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_ind_urb_proc_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_ind_urb_proc_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_ind_urb_proc_emissions_xml
 #'
 #' Construct XML data structure for \code{ind_urb_proc_emissions_USA.xml}.
 #'
@@ -7,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ind_urb_proc_emissions_USA.xml}, \code{ind_urb_proc_ghg_emissions_USA.xml}.
-module_gcamusa_batch_ind_urb_proc_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_ind_urb_proc_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L277.nonghg_prc_USA",
              "L277.nonghg_max_reduction_USA",
diff --git a/input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_ind_urb_processing_sectors.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_ind_urb_processing_sectors.R
index e57bc0dbf3..72e9126790 100644
--- a/input/gcamdata/R/zchunk_batch_ind_urb_processing_sectors_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_ind_urb_processing_sectors.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_ind_urb_processing_sectors_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_ind_urb_processing_sectors_xml
 #'
 #' Construct XML data structure for \code{ind_urb_processing_sectors_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{ind_urb_processing_sectors.xml}. The corresponding file in the
 #' original data system was \code{batch_ind_urb_processing_sectors.xml} (emissions XML).
-module_gcamusa_batch_ind_urb_processing_sectors_USA_xml <- function(command, ...) {
+module_gcamusa_ind_urb_processing_sectors_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L231.DeleteSupplysector_industry_USA",
              "L231.DeleteSupplysector_urban_processes_USA",
diff --git a/input/gcamdata/R/zchunk_batch_indenergy_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_indenergy_emissions.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_indenergy_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_indenergy_emissions.R
index c556e0a98c..832f36ce81 100644
--- a/input/gcamdata/R/zchunk_batch_indenergy_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_indenergy_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_indenergy_emissions_USA_xml
+#' module_gcamusa_indenergy_emissions_xml
 #'
 #' Construct XML data structure for \code{indenergy_emissions_USA.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{indenergy_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{indenergy_emissions_USA.xml} (gcamusa XML)
 
-module_gcamusa_batch_indenergy_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_indenergy_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L275.nonghg_indenergy_tech_coeff_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_industry_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_industry.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_industry_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_industry.R
index 40c914f935..d03954cf1d 100644
--- a/input/gcamdata/R/zchunk_batch_industry_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_industry_USA_xml
+#' module_gcamusa_industry_xml
 #'
 #' Construct XML data structure for \code{industry_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{industry_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_industry_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_industry_USA_xml <- function(command, ...) {
+module_gcamusa_industry_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.DeleteSupplysector_USAind",
              "L232.DeleteFinalDemand_USAind",
diff --git a/input/gcamdata/R/zchunk_batch_industry_vintage_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_industry_vintage.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_industry_vintage_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_industry_vintage.R
index 5ad7a2d6bc..d9a563706c 100644
--- a/input/gcamdata/R/zchunk_batch_industry_vintage_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_industry_vintage.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_industry_vintage_USA_xml
+#' module_gcamusa_industry_vintage_xml
 #'
 #' Construct XML data structure for \code{industry_vintage_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{industry_vintage_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_industry_vintage_USA.xml.R} (gcamusa XML).
-module_gcamusa_batch_industry_vintage_USA_xml <- function(command, ...) {
+module_gcamusa_industry_vintage_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2322.StubTechSCurve_industry_USA",
              "L2322.StubTechProfitShutdown_industry_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_liquids_limits_usa_xml.R b/input/gcamdata/R/zgcamusa_xml_liquids_limits_usa.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_liquids_limits_usa_xml.R
rename to input/gcamdata/R/zgcamusa_xml_liquids_limits_usa.R
index 11ef486517..ab933c3a03 100644
--- a/input/gcamdata/R/zchunk_batch_liquids_limits_usa_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_liquids_limits_usa.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_liquids_limits_usa_xml
+#' module_gcamusa_liquids_limits_usa_xml
 #'
 #' Construct XML data structure for \code{liquids_limits.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{liquids_limits_USA.xml}.
-module_gcamusa_batch_liquids_limits_usa_xml <- function(command, ...) {
+module_gcamusa_liquids_limits_usa_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c( "L270.CreditMkt_USA",
               "L270.CreditOutput_USA",
diff --git a/input/gcamdata/R/zchunk_batch_negative_emissions_budget_usa_xml.R b/input/gcamdata/R/zgcamusa_xml_negative_emissions_budget_usa.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_negative_emissions_budget_usa_xml.R
rename to input/gcamdata/R/zgcamusa_xml_negative_emissions_budget_usa.R
index a7e6ff7a11..3d9c519a0f 100644
--- a/input/gcamdata/R/zchunk_batch_negative_emissions_budget_usa_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_negative_emissions_budget_usa.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_negative_emissions_budget_usa_xml
+#' module_gcamusa_negative_emissions_budget_usa_xml
 #'
 #' Construct XML data structure for \code{paste0("negative_emissions_budget_USA_", c("GCAM3", paste0("SSP", 1:5), paste0("gSSP", 1:5)), ".xml")}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{paste0("negative_emissions_budget_USA_", c("GCAM3", paste0("SSP", 1:5), paste0("gSSP", 1:5)), ".xml")}.
-module_gcamusa_batch_negative_emissions_budget_usa_xml <- function(command, ...) {
+module_gcamusa_negative_emissions_budget_usa_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L270.NegEmissBudget_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_nonewcoal_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_nonewcoal.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_nonewcoal_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_nonewcoal.R
index 2f1c928956..c09a9ba367 100644
--- a/input/gcamdata/R/zchunk_batch_nonewcoal_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_nonewcoal.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_nonewcoal_USA_xml
+#' module_gcamusa_nonewcoal_xml
 #'
 #' Construct XML data structure for \code{nonewcoal_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{nonewcoal_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_nonewcoal_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_nonewcoal_USA_xml <- function(command, ...) {
+module_gcamusa_nonewcoal_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2231.SubsectorShrwt_nonewcoal_elecS_cool_USA",
              "L2231.StubTechShrwt_nonewcoal_nongen_USA" ))
diff --git a/input/gcamdata/R/zchunk_batch_nuclear_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_nuclear.R
similarity index 93%
rename from input/gcamdata/R/zchunk_batch_nuclear_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_nuclear.R
index e9a47408e9..67a7097f64 100644
--- a/input/gcamdata/R/zchunk_batch_nuclear_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_nuclear.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_nuclear_USA_xml
+#' module_gcamusa_nuclear_xml
 #'
 #' Construct XML data structure for \code{nuclear_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{nuclear_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_nuclear_USA.xml} (gcamusa XML batch).
-module_gcamusa_batch_nuclear_USA_xml <- function(command, ...) {
+module_gcamusa_nuclear_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2244.StubTechSCurve_nuc_gen2_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_othertrn_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_othertrn_emissions.R
similarity index 87%
rename from input/gcamdata/R/zchunk_batch_othertrn_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_othertrn_emissions.R
index 8119545b1b..c55b5b53bd 100644
--- a/input/gcamdata/R/zchunk_batch_othertrn_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_othertrn_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_othertrn_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_othertrn_emissions_xml
 #'
 #' Construct XML data structure for \code{othertrn_emissions_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{othertrn_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_othertrn_emissions_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_othertrn_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_othertrn_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L276.nonghg_othertrn_tech_coeff_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_refinery_nonghg_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_refinery_nonghg_emissions.R
similarity index 87%
rename from input/gcamdata/R/zchunk_batch_refinery_nonghg_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_refinery_nonghg_emissions.R
index 384ef30ed8..27664b3488 100644
--- a/input/gcamdata/R/zchunk_batch_refinery_nonghg_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_refinery_nonghg_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_refinery_nonghg_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_refinery_nonghg_emissions_xml
 #'
 #' Construct XML data structure for \code{refinery_emissions_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{refinery_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_en_nonghg_emissions_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_refinery_nonghg_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_refinery_nonghg_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L273.nonghg_state_refinery_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_regional_biomass_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_regional_biomass.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_regional_biomass_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_regional_biomass.R
index 1caf7c6f4e..0a15ea4c49 100644
--- a/input/gcamdata/R/zchunk_batch_regional_biomass_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_regional_biomass.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_regional_biomass_USA_xml
+#' module_gcamusa_regional_biomass_xml
 #'
 #' Construct XML data structure for \code{regional_biomass_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{regional_biomass_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_regional_biomass_USA.xml} (gcamusa XML batch).
-module_gcamusa_batch_regional_biomass_USA_xml <- function(command, ...) {
+module_gcamusa_regional_biomass_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2261.DeleteSupplysector_bio_USA",
              "L2261.Supplysector_bio_USA",
diff --git a/input/gcamdata/R/zchunk_batch_resources_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_resources.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_resources_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_resources.R
index bdef87683f..75ef4855ad 100644
--- a/input/gcamdata/R/zchunk_batch_resources_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_resources.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_resources_USA_xml
+#' module_gcamusa_resources_xml
 #'
 #' Construct XML data structure for \code{resources_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{resources_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_resources_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_resources_USA_xml <- function(command, ...) {
+module_gcamusa_resources_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L210.DeleteRenewRsrc_USArsrc",
              "L210.DeleteUnlimitRsrc_USArsrc",
diff --git a/input/gcamdata/R/zchunk_batch_socioeconomics_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_socioeconomics.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_socioeconomics_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_socioeconomics.R
index 51b8a3e367..e92ec43d03 100644
--- a/input/gcamdata/R/zchunk_batch_socioeconomics_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_socioeconomics.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_socioeconomics_USA_xml
+#' module_gcamusa_socioeconomics_xml
 #'
 #' Construct XML data structure for \code{socioeconomics_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{socioeconomics_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_socioeconomics_USA.xml} (gcamusa XML).
-module_gcamusa_batch_socioeconomics_USA_xml <- function(command, ...) {
+module_gcamusa_socioeconomics_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L201.Pop_GCAMUSA",
              "L201.GDP_GCAMUSA",
diff --git a/input/gcamdata/R/zchunk_batch_solar_reeds_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_solar_reeds.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_solar_reeds_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_solar_reeds.R
index d1f7adb975..20e8730488 100644
--- a/input/gcamdata/R/zchunk_batch_solar_reeds_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_solar_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_solar_reeds_USA_xml
+#' module_gcamusa_solar_reeds_xml
 #'
 #' Construct XML data structure for \code{solar_reeds_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{solar_reeds_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_solar_USA_reeds.xml} (gcamusa XML batch).
-module_gcamusa_batch_solar_reeds_USA_xml <- function(command, ...) {
+module_gcamusa_solar_reeds_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2238.DeleteStubTechMinicamEnergyInput_PV_reeds_USA",
              "L2238.RenewRsrc_PV_reeds_USA",
diff --git a/input/gcamdata/R/zchunk_batch_transport_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_transport_emissions.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_transport_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_transport_emissions.R
index 20f6fc55fb..52ab6922a1 100644
--- a/input/gcamdata/R/zchunk_batch_transport_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_transport_emissions.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_transport_emissions_USA_xml
+#' module_gcamusa_transport_emissions_xml
 #'
 #' Construct XML data structure for \code{transport_emissions_USA.xml}.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs: \code{transport_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{transport_emissions_USA.xml} (gcamusa XML).
 
-module_gcamusa_batch_transport_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_transport_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L271.nonco2_trn_tech_coeff_USA",
              "L271.nonco2_trn_emiss_control_USA"))
diff --git a/input/gcamdata/R/zchunk_batch_transportation_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_transportation.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_transportation_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_transportation.R
index c089638dbd..3621920e08 100644
--- a/input/gcamdata/R/zchunk_batch_transportation_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_transportation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_transportation_USA_xml
+#' module_gcamusa_transportation_xml
 #'
 #' Construct XML data structure for \code{transportation_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{transportation_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_transportation_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_transportation_USA_xml <- function(command, ...) {
+module_gcamusa_transportation_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L254.DeleteSupplysector_USAtrn",
              "L254.DeleteFinalDemand_USAtrn",
diff --git a/input/gcamdata/R/zchunk_batch_trn_ghg_emissions_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_trn_ghg_emissions.R
similarity index 87%
rename from input/gcamdata/R/zchunk_batch_trn_ghg_emissions_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_trn_ghg_emissions.R
index e94c6dc2ef..07e73aaa5c 100644
--- a/input/gcamdata/R/zchunk_batch_trn_ghg_emissions_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_trn_ghg_emissions.R
@@ -1,4 +1,6 @@
-#' module_gcamusa_batch_trn_ghg_emissions_USA_xml
+# Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
+
+#' module_gcamusa_trn_ghg_emissions_xml
 #'
 #' Construct XML data structure for \code{othertrn_emissions_USA.xml}.
 #'
@@ -8,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{trn_ghg_emissions_USA.xml}. The corresponding file in the
 #' original data system was \code{batch_transport_emissions_USA_xml.R} (gcamusa XML).
-module_gcamusa_batch_trn_ghg_emissions_USA_xml <- function(command, ...) {
+module_gcamusa_trn_ghg_emissions_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L271.ghg_trn_tech_coeff_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_industry_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_water_demand_industry.R
similarity index 89%
rename from input/gcamdata/R/zchunk_batch_water_demand_industry_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_water_demand_industry.R
index b2d1d09abf..2b2e077646 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_industry_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_water_demand_industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_water_demand_industry_USA_xml
+#' module_gcamusa_water_demand_industry_xml
 #'
 #' Construct XML data structure for \code{water_demand_industry_USA.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_industry_USA.xml}.
-module_gcamusa_batch_water_demand_industry_USA_xml <- function(command, ...) {
+module_gcamusa_water_demand_industry_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.TechCoef_USA"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_municipal_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_water_demand_municipal.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_water_demand_municipal_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_water_demand_municipal.R
index fdbcc089eb..f0325d0e09 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_municipal_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_water_demand_municipal.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_water_demand_municipal_xml
+#' module_gcamusa_water_demand_municipal_xml
 #'
 #' Construct XML data structure for \code{water_demand_municipal.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_municipal_USA.xml}.
-module_gcamusa_batch_water_demand_municipal_xml <- function(command, ...) {
+module_gcamusa_water_demand_municipal_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L245.Supplysector_USA",
               "L245.SubsectorLogit_USA",
diff --git a/input/gcamdata/R/zchunk_batch_water_td_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_water_td.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_water_td_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_water_td.R
index 4c50973d1a..7fad8e069d 100644
--- a/input/gcamdata/R/zchunk_batch_water_td_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_water_td.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_water_td_USA_xml
+#' module_gcamusa_water_td_xml
 #'
 #' Construct XML data structure for \code{water_mapping.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_td_USA.xml}.
-module_gcamusa_batch_water_td_USA_xml <- function(command, ...) {
+module_gcamusa_water_td_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L203.Supplysector_USA",
              "L203.SubsectorLogit_USA",
diff --git a/input/gcamdata/R/zchunk_batch_wind_reeds_USA_xml.R b/input/gcamdata/R/zgcamusa_xml_wind_reeds.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_wind_reeds_USA_xml.R
rename to input/gcamdata/R/zgcamusa_xml_wind_reeds.R
index 400b44bb2d..93224e5206 100644
--- a/input/gcamdata/R/zchunk_batch_wind_reeds_USA_xml.R
+++ b/input/gcamdata/R/zgcamusa_xml_wind_reeds.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_gcamusa_batch_wind_reeds_USA_xml
+#' module_gcamusa_wind_reeds_xml
 #'
 #' Construct XML data structure for \code{wind_reeds_USA.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{wind_reeds_USA.xml}.
 #' The corresponding file in the original data system was \code{batch_wind_USA_reeds.xml} (gcamusa XML batch).
-module_gcamusa_batch_wind_reeds_USA_xml <- function(command, ...) {
+module_gcamusa_wind_reeds_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2237.SmthRenewRsrcCurves_wind_reeds_USA",
              "L2237.StubTechCapFactor_wind_reeds_USA",
diff --git a/input/gcamdata/R/zchunk_L200.modeltime.R b/input/gcamdata/R/zmodeltime_L200.modeltime.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L200.modeltime.R
rename to input/gcamdata/R/zmodeltime_L200.modeltime.R
diff --git a/input/gcamdata/R/zchunk_batch_modeltime_xml.R b/input/gcamdata/R/zmodeltime_xml_modeltime.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_modeltime_xml.R
rename to input/gcamdata/R/zmodeltime_xml_modeltime.R
index 68c0d03ede..662bf3ad98 100644
--- a/input/gcamdata/R/zchunk_batch_modeltime_xml.R
+++ b/input/gcamdata/R/zmodeltime_xml_modeltime.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_modeltime_batch_modeltime_xml
+#' module_modeltime_modeltime_xml
 #'
 #' Construct XML data structure for \code{modeltime.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{modeltime.xml}. The corresponding file in the
 #' original data system was \code{batch_modeltime_xml.R} (modeltime XML).
-module_modeltime_batch_modeltime_xml <- function(command, ...) {
+module_modeltime_modeltime_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L200.ModelTime",
               "L200.ModelTimeInterYears"))
diff --git a/input/gcamdata/R/zchunk_L100.GDP_hist.R b/input/gcamdata/R/zsocio_L100.GDP_hist.R
similarity index 96%
rename from input/gcamdata/R/zchunk_L100.GDP_hist.R
rename to input/gcamdata/R/zsocio_L100.GDP_hist.R
index 33a53af96b..b68835c87d 100644
--- a/input/gcamdata/R/zchunk_L100.GDP_hist.R
+++ b/input/gcamdata/R/zsocio_L100.GDP_hist.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L100.GDP_hist
+#' module_socio_L100.GDP_hist
 #'
 #' Prepare GDP database for later use: filter missing values and convert units to 1990 USD.
 #'
@@ -18,7 +18,7 @@
 #' @importFrom tibble tibble
 #' @importFrom dplyr filter mutate select
 #' @author BBL February 2017
-module_socioeconomics_L100.GDP_hist <- function(command, ...) {
+module_socio_L100.GDP_hist <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "socioeconomics/USDA_GDP_MER",
              FILE = "socioeconomics/WB_ExtraCountries_GDP_MER"))
diff --git a/input/gcamdata/R/zchunk_L100.Population_downscale_ctry.R b/input/gcamdata/R/zsocio_L100.Population_downscale_ctry.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L100.Population_downscale_ctry.R
rename to input/gcamdata/R/zsocio_L100.Population_downscale_ctry.R
index 636ffe9c1c..c648638e98 100644
--- a/input/gcamdata/R/zchunk_L100.Population_downscale_ctry.R
+++ b/input/gcamdata/R/zsocio_L100.Population_downscale_ctry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L100.Population_downscale_ctry
+#' module_socio_L100.Population_downscale_ctry
 #'
 #'  Clean and interpolate both Maddison historical population data (1700-2010) and SSP population scenarios.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr bind_rows filter full_join if_else group_by left_join mutate order_by select summarize
 #' @importFrom tidyr complete nesting replace_na
 #' @author STW May 2017
-module_socioeconomics_L100.Population_downscale_ctry <- function(command, ...) {
+module_socio_L100.Population_downscale_ctry <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "socioeconomics/socioeconomics_ctry",
              "Maddison_population",
diff --git a/input/gcamdata/R/zchunk_L101.Population.R b/input/gcamdata/R/zsocio_L101.Population.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L101.Population.R
rename to input/gcamdata/R/zsocio_L101.Population.R
index 186cc3b8ad..35418db0a4 100644
--- a/input/gcamdata/R/zchunk_L101.Population.R
+++ b/input/gcamdata/R/zsocio_L101.Population.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L101.Population
+#' module_socio_L101.Population
 #'
 #' Compute population for historical and future years, by region and SSP.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr arrange bind_rows filter group_by mutate select summarise
 #' @importFrom tidyr complete nesting spread
 #' @author BBL April 2017
-module_socioeconomics_L101.Population <- function(command, ...) {
+module_socio_L101.Population <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "socioeconomics/GCAM3_population",
diff --git a/input/gcamdata/R/zchunk_L102.GDP.R b/input/gcamdata/R/zsocio_L102.GDP.R
similarity index 84%
rename from input/gcamdata/R/zchunk_L102.GDP.R
rename to input/gcamdata/R/zsocio_L102.GDP.R
index 4113e0402b..b1774ae1f9 100644
--- a/input/gcamdata/R/zchunk_L102.GDP.R
+++ b/input/gcamdata/R/zsocio_L102.GDP.R
@@ -1,94 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' Join past GDP time series to future.
-#'
-#' When we have to join two GDP time series, we usually find that they don't
-#' match up at year of overlap (the "base year").  What we do in these cases is
-#' we compute, for the later time series, ratios of GDPs in the future years to
-#' those in the base year.  We then multiply the future ratios by the past base
-#' year value.  That future time series can then be grafted onto the past
-#' without leaving a seam.
-#'
-#' In practice, the past is often a single time series, while the future is
-#' often a collection of scenarios.  Therefore, we assume that the past time
-#' series has no scenario column.  If the future does not have a scenario
-#' column, it is given a dummy one, which is dropped before the new table is
-#' returned.  Note that we look for lower-case 'scenario' for this.
-#'
-#' The base year is calculated automatically.  It is the maximum of the years
-#' that overlap between the two data sets.
-#'
-#' We also have to know how to group the data for calculating the gdp ratios.
-#' Normally this will be either by country ('iso') or by GCAM region
-#' ('GCAM_region_ID').  The choice of which is passed in as the 'grouping'
-#' argument.
-#'
-#' Finally, although we have discussed this function in terms of joining two GDP
-#' time series, in the future time series we use only the ratios of GDP to base
-#' year GDP.  Therefore, any time series with the correct ratios will work.  For
-#' example, if we have a time series of growth rates, we can convert those to
-#' ratios using \code{\link[base]{cumprod}} and pass those ratios as the future
-#' time series.  For similar reasons, even if the two time series have different
-#' units (e.g., different dollar-years or PPP vs. MER), they can still be
-#' joined.  The units of the output time series will be the same as the units of
-#' \code{past}.
-#'
-#' @param past Tibble with the past time series (year, gdp, and grouping).
-#' @param future Tibble with the future data (year, gdp, scenario, and
-#' grouping).
-#' @param grouping Name of the grouping column (generally either 'iso' or
-#' 'GCAM_region_ID', but could be anything
-#' @return Time series with the past and future joined as described in details.
-join.gdp.ts <- function(past, future, grouping) {
-
-  year <- gdp <- base.gdp <- gdp.ratio <- . <- scenario <-
-    NULL                            # silence notes on package check.
-
-  if(! 'scenario' %in% names(future)) {
-    ## This saves us having to make a bunch of exceptions below when we
-    ## include 'scenario' among the columns to join by.
-    future$scenario <- 'scen'
-    drop.scenario <- TRUE
-  }
-  else {
-    drop.scenario <- FALSE
-  }
-
-  ## Find the base year
-  base.year <- max(intersect(past$year, future$year))
-  assert_that(is.finite(base.year))
-
-  ## Base year gdp from the future dataset
-  baseyear.future.gdp <- filter(future, year == base.year) %>%
-    rename(base.gdp = gdp) %>%
-    select(-year)
-
-  gdp.future.ratio <- filter(future, year > base.year) %>%
-    left_join_error_no_match(baseyear.future.gdp, by = c('scenario', grouping)) %>%
-    mutate(gdp.ratio = gdp / base.gdp) %>%
-    select('scenario', grouping, 'year', 'gdp.ratio')
-
-  ## add the scenario column to the past
-  gdp.past <- tidyr::crossing(past, scenario = unique(gdp.future.ratio[['scenario']]))
-  baseyear.past.gdp <- filter(gdp.past, year == base.year) %>%
-    rename(base.gdp = gdp) %>%
-    select(-year)
-
-  rslt <- left_join(baseyear.past.gdp, gdp.future.ratio,
-                    by = c('scenario', grouping)) %>%
-    mutate(gdp = base.gdp * gdp.ratio) %>%
-    select('scenario', grouping, 'year', 'gdp') %>%
-    bind_rows(gdp.past, .)
-
-  if(drop.scenario) {
-    select(rslt, -scenario)
-  }
-  else {
-    rslt
-  }
-}
-
-#' module_socioeconomics_L102.GDP
+#' module_socio_L102.GDP
 #'
 #' Prepare historical and future GDP time series.  On the historical side, this
 #' amounts to aggregating country-level GDP to GCAM regions.  On the future side
@@ -111,7 +23,7 @@ join.gdp.ts <- function(past, future, grouping) {
 #' @importFrom dplyr arrange bind_rows distinct filter full_join if_else intersect group_by left_join mutate one_of select summarise transmute
 #' @importFrom tidyr complete gather nesting replace_na
 #' @author RPL March 2017
-module_socioeconomics_L102.GDP <- function(command, ...) {
+module_socio_L102.GDP <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "socioeconomics/SSP_database_v9",
diff --git a/input/gcamdata/R/zchunk_L180.GDP_macro.R b/input/gcamdata/R/zsocio_L180.GDP_macro.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L180.GDP_macro.R
rename to input/gcamdata/R/zsocio_L180.GDP_macro.R
index 9582946d1c..464670a5e2 100644
--- a/input/gcamdata/R/zchunk_L180.GDP_macro.R
+++ b/input/gcamdata/R/zsocio_L180.GDP_macro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_L180.GDP_macro
+#' module_socio_L180.GDP_macro
 #'
 #' National accounts information for GDP macro.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter lag mutate mutate_at select rename
 #' @author SHK October 2020
 #'
-module_socioeconomics_L180.GDP_macro <- function(command, ...) {
+module_socio_L180.GDP_macro <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/iso_GCAM_regID",
              FILE = "common/GCAM_region_names",
diff --git a/input/gcamdata/R/zchunk_L201.Pop_GDP_scenarios.R b/input/gcamdata/R/zsocio_L201.Pop_GDP_scenarios.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L201.Pop_GDP_scenarios.R
rename to input/gcamdata/R/zsocio_L201.Pop_GDP_scenarios.R
index 78576bcc32..5a5181d046 100644
--- a/input/gcamdata/R/zchunk_L201.Pop_GDP_scenarios.R
+++ b/input/gcamdata/R/zsocio_L201.Pop_GDP_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L201.Pop_GDP_scenarios
+#' module_socio_L201.Pop_GDP_scenarios
 #'
 #' Labor productivity and population by scenario and region.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom assertthat assert_that
 #' @importFrom dplyr bind_rows filter group_by lag mutate order_by select transmute
 #' @author HM & RH June 2017
-module_socioeconomics_L201.Pop_GDP_scenarios <- function(command, ...) {
+module_socio_L201.Pop_GDP_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/gcam_macro_TFP_open",
diff --git a/input/gcamdata/R/zchunk_L2323.iron_steel_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L2323.iron_steel_Inc_Elas_scenarios.R
similarity index 94%
rename from input/gcamdata/R/zchunk_L2323.iron_steel_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L2323.iron_steel_Inc_Elas_scenarios.R
index bbe967c723..7d64a76258 100644
--- a/input/gcamdata/R/zchunk_L2323.iron_steel_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L2323.iron_steel_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios
+#' module_socio_L2323.iron_steel_Inc_Elas_scenarios
 #'
 #' Calculates iron and steel income elasticity for each GCAM region by linear interpolation of assumption data
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr gather spread
 #' @importFrom stats approx
 #' @author RH April 2017
-module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L2323.iron_steel_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A323.inc_elas",
@@ -25,6 +25,7 @@ module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios <- function(command, .
              "L102.pcgdp_thous90USD_Scen_R_Y",
              "L102.pcgdp_thous90USD_GCAM3_R_Y",
              "L101.Pop_thous_Scen_R_Yfut",
+             "L101.Pop_thous_R_Yh",
              "L101.Pop_thous_GCAM3_R_Y",
              "L102.gdp_mil90usd_GCAM3_R_Y",
              "LB1092.Tradebalance_iron_steel_Mt_R_Y"))
@@ -67,6 +68,10 @@ module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios <- function(command, .
       mutate(year = as.integer(year)) %>%
       left_join_error_no_match(GCAM_region_names, by = "GCAM_region_ID")
 
+    L101.Pop_thous_R_Yh <- get_data(all_data, "L101.Pop_thous_R_Yh", strip_attributes = TRUE) %>%
+      rename(population = value) %>%
+      left_join_error_no_match(GCAM_region_names, by = "GCAM_region_ID")
+
     L101.Pop_thous_Scen_R_Yfut <- get_data(all_data, "L101.Pop_thous_Scen_R_Yfut", strip_attributes = TRUE) %>%
       ungroup() %>%
       rename(population = value) %>%
@@ -109,10 +114,17 @@ module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios <- function(command, .
 
 
     # ===================================================
+    # Create one population dataset to pass timeshift tests
+    # This is required because L101.Pop_thous_Scen_R_Yfut uses FUTURE_YEARS,
+    # but here we want to create a dataset from MODEL_FUTURE_YEARS, which may start before FUTURE_YEARS
+    L101_Pop_hist_and_fut <- L101.Pop_thous_R_Yh %>%
+      repeat_add_columns(distinct(L101.Pop_thous_Scen_R_Yfut, scenario)) %>%
+      bind_rows(L101.Pop_thous_Scen_R_Yfut)
+
     #First calculate the per capita steel consumption
     L2323.pcgdp_thous90USD_Scen_R_Y  <- L102.pcgdp_thous90USD_Scen_R_Y %>%
       filter(year %in%  MODEL_FUTURE_YEARS) %>%
-      left_join_error_no_match(L101.Pop_thous_Scen_R_Yfut, by = c("scenario", "GCAM_region_ID", "year", "region")) %>%
+      left_join_error_no_match(L101_Pop_hist_and_fut, by = c("scenario", "GCAM_region_ID", "year", "region")) %>%
       left_join_error_no_match(A323.inc_elas_parameter, by = c( "region")) %>%
       mutate(per_capita_steel = a * exp(b/(pcgdp_90thousUSD * 1000)) * (1-m) ^ (year- 1990),
              steel_cons = per_capita_steel * population*0.000001)
diff --git a/input/gcamdata/R/zchunk_L2324.Off_road_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L2324.Off_road_Inc_Elas_scenarios.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2324.Off_road_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L2324.Off_road_Inc_Elas_scenarios.R
index c3de22577c..839716540c 100644
--- a/input/gcamdata/R/zchunk_L2324.Off_road_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L2324.Off_road_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios
+#' module_socio_L2324.Off_road_Inc_Elas_scenarios
 #'
 #' Calculates Off_road income elasticity for each GCAM region by linear interpolation of assumption data
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr gather spread
 #' @importFrom stats approx
 #' @author RH April 2017
-module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L2324.Off_road_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A324.inc_elas",
diff --git a/input/gcamdata/R/zchunk_L2325.chemical_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L2325.chemical_Inc_Elas_scenarios.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L2325.chemical_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L2325.chemical_Inc_Elas_scenarios.R
index aa1470ea73..8f7a6e94f6 100644
--- a/input/gcamdata/R/zchunk_L2325.chemical_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L2325.chemical_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L2325.chemical_Inc_Elas_scenarios
+#' module_socio_L2325.chemical_Inc_Elas_scenarios
 #'
 #' Calculates chemical income elasticity for each GCAM region by linear interpolation of assumption data
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr gather spread
 #' @importFrom stats approx
 #' @author Yang Liu  Dec 2019
-module_socioeconomics_L2325.chemical_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L2325.chemical_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A325.inc_elas",
diff --git a/input/gcamdata/R/zchunk_L2326.aluminum_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L2326.aluminum_Inc_Elas_scenarios.R
similarity index 94%
rename from input/gcamdata/R/zchunk_L2326.aluminum_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L2326.aluminum_Inc_Elas_scenarios.R
index 8c02325862..35d51c0b6c 100644
--- a/input/gcamdata/R/zchunk_L2326.aluminum_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L2326.aluminum_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios
+#' module_socio_L2326.aluminum_Inc_Elas_scenarios
 #'
 #' Calculates aluminum income elasticity for each GCAM region by linear interpolation of assumption data
 #'
@@ -17,7 +17,7 @@
 #' @importFrom tidyr gather spread
 #' @importFrom stats approx
 #' @author Yang Liu  Dec 2019
-module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L2326.aluminum_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A326.inc_elas",
@@ -25,6 +25,7 @@ module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios <- function(command, ...
              "L102.pcgdp_thous90USD_Scen_R_Y",
              "L102.pcgdp_thous90USD_GCAM3_R_Y",
              "L101.Pop_thous_Scen_R_Yfut",
+             "L101.Pop_thous_R_Yh",
              "L101.Pop_thous_GCAM3_R_Y",
              "L102.gdp_mil90usd_GCAM3_R_Y",
              "L1326.out_Mt_R_aluminum_Yh"))
@@ -68,6 +69,10 @@ module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios <- function(command, ...
       mutate(year = as.integer(year)) %>%
       left_join_error_no_match(GCAM_region_names, by = "GCAM_region_ID")
 
+    L101.Pop_thous_R_Yh <- get_data(all_data, "L101.Pop_thous_R_Yh", strip_attributes = TRUE) %>%
+      rename(population = value) %>%
+      left_join_error_no_match(GCAM_region_names, by = "GCAM_region_ID")
+
     L101.Pop_thous_Scen_R_Yfut <- get_data(all_data, "L101.Pop_thous_Scen_R_Yfut", strip_attributes = TRUE) %>%
       ungroup() %>%
       rename(population = value) %>%
@@ -115,10 +120,17 @@ module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios <- function(command, ...
       select( GCAM_region_ID, year,population_2015 )
 
     # ===================================================
+    # Create one population dataset to pass timeshift tests
+    # This is required because L101.Pop_thous_Scen_R_Yfut uses FUTURE_YEARS,
+    # but here we want to create a dataset from MODEL_FUTURE_YEARS, which may start before FUTURE_YEARS
+    L101_Pop_hist_and_fut <- L101.Pop_thous_R_Yh %>%
+      repeat_add_columns(distinct(L101.Pop_thous_Scen_R_Yfut, scenario)) %>%
+      bind_rows(L101.Pop_thous_Scen_R_Yfut)
+
     #First calculate the per capita aluminum consumption
     L2326.pcgdp_thous90USD_Scen_R_Y  <- L102.pcgdp_thous90USD_Scen_R_Y %>%
       filter(year %in%  MODEL_FUTURE_YEARS) %>%
-      left_join_error_no_match(L101.Pop_thous_Scen_R_Yfut, by = c("scenario", "GCAM_region_ID", "year", "region")) %>%
+      left_join_error_no_match(L101_Pop_hist_and_fut, by = c("scenario", "GCAM_region_ID", "year", "region")) %>%
       left_join_error_no_match(A326.inc_elas_parameter, by = c( "region")) %>%
       mutate(per_capita_aluminum = a * exp(b/(pcgdp_90thousUSD * 1000 * COV_1990USD_2005USD)) * (1-m) ^ (year- 2015),
              aluminum_pro = per_capita_aluminum * population*0.000001)
diff --git a/input/gcamdata/R/zchunk_L242.Bld_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L242.Bld_Inc_Elas_scenarios.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L242.Bld_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L242.Bld_Inc_Elas_scenarios.R
index 2a78fe233d..6a1d0bae2b 100644
--- a/input/gcamdata/R/zchunk_L242.Bld_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L242.Bld_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L242.Bld_Inc_Elas_scenarios
+#' module_socio_L242.Bld_Inc_Elas_scenarios
 #'
 #' Calculates building income elasticity for each GCAM region by linear interpolation of assumption data
 #'
@@ -16,7 +16,7 @@
 #' @importFrom dplyr arrange filter left_join mutate select transmute
 #' @importFrom stats approx
 #' @author RH April 2017
-module_socioeconomics_L242.Bld_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L242.Bld_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A42.inc_elas",
diff --git a/input/gcamdata/R/zchunk_L252.Trn_Inc_Elas_scenarios.R b/input/gcamdata/R/zsocio_L252.Trn_Inc_Elas_scenarios.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L252.Trn_Inc_Elas_scenarios.R
rename to input/gcamdata/R/zsocio_L252.Trn_Inc_Elas_scenarios.R
index c7948200ea..5f851ee34d 100644
--- a/input/gcamdata/R/zchunk_L252.Trn_Inc_Elas_scenarios.R
+++ b/input/gcamdata/R/zsocio_L252.Trn_Inc_Elas_scenarios.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L252.Trn_Inc_Elas_scenarios
+#' module_socio_L252.Trn_Inc_Elas_scenarios
 #'
 #' Calculates transportation income elasticity for SSP scenarios using linear interpolation of assumption data
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter left_join mutate select transmute
 #' @importFrom stats approx
 #' @author RH May 2017
-module_socioeconomics_L252.Trn_Inc_Elas_scenarios <- function(command, ...) {
+module_socio_L252.Trn_Inc_Elas_scenarios <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A52.inc_elas",
diff --git a/input/gcamdata/R/zchunk_L280.GDP_macro.R b/input/gcamdata/R/zsocio_L280.GDP_macro.R
similarity index 98%
rename from input/gcamdata/R/zchunk_L280.GDP_macro.R
rename to input/gcamdata/R/zsocio_L280.GDP_macro.R
index 17bc03f832..dc0feb6b4b 100644
--- a/input/gcamdata/R/zchunk_L280.GDP_macro.R
+++ b/input/gcamdata/R/zsocio_L280.GDP_macro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_L280.GDP_macro
+#' module_socio_L280.GDP_macro
 #'
 #' National accounts information for GDP macro.
 #'
@@ -15,7 +15,7 @@
 #' @importFrom dplyr filter lag mutate mutate_at select rename
 #' @author SHK October 2020
 #'
-module_socioeconomics_L280.GDP_macro <- function(command, ...) {
+module_socio_L280.GDP_macro <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "socioeconomics/A81.factor_productivity",
@@ -244,8 +244,8 @@ module_socioeconomics_L280.GDP_macro <- function(command, ...) {
     #calculate gdp per capita growthrate and lagged savings rate
     savings.rate.hist %>% arrange(GCAM_region_ID, period) %>%
       group_by(GCAM_region_ID) %>%
-      mutate(gdp.cap.gr = gdp.cap.pwt / lag(gdp.cap.pwt) - 1) %>%
-      mutate(savings.rate.lag = lag(savings.rate)) %>%
+      mutate(gdp.cap.gr = gdp.cap.pwt / lag(gdp.cap.pwt) - 1,
+             savings.rate.lag = lag(savings.rate)) %>%
       ungroup() -> savings.rate.hist
 
     # LM Regressions using 5-year average periods
@@ -258,8 +258,9 @@ module_socioeconomics_L280.GDP_macro <- function(command, ...) {
     savRate.b1 <- coef.est["gdp.cap.gr", "Estimate"]
     savRate.b2 <- coef.est["savings.rate.lag", "Estimate"]
 
-    national.accounts.FutureYrs %>% mutate(gdp.cap = gdp/pop) %>%
-      mutate( gdp.cap.gr=0, savings.rate = 0, savings.rate.lag = 0, savings.rate.fit = 0 ) %>%
+    national.accounts.FutureYrs %>%
+      mutate(gdp.cap = gdp/pop,
+             gdp.cap.gr=0, savings.rate = 0, savings.rate.lag = 0, savings.rate.fit = 0 ) %>%
       select(GCAM_region_ID, region, period=year, gdp.cap, savings.rate, gdp.cap.gr,
              savings.rate.lag, savings.rate.fit) -> savings.rate.future
 
@@ -279,8 +280,8 @@ module_socioeconomics_L280.GDP_macro <- function(command, ...) {
 
     savings.rate.all %>% arrange(GCAM_region_ID, period) %>%
       group_by(GCAM_region_ID) %>%
-      mutate(gdp.cap.gr2 = gdp.cap/lag(gdp.cap) - 1 ) %>%
-      mutate(savings.rate.fit2 = savings.rate) %>%
+      mutate(gdp.cap.gr2 = gdp.cap/lag(gdp.cap) - 1,
+             savings.rate.fit2 = savings.rate) %>%
       ungroup() -> savings.rate.all
 
     #Function for predicting savings rate.
diff --git a/input/gcamdata/R/zchunk_L281.macro_account_tracking.R b/input/gcamdata/R/zsocio_L281.macro_account_tracking.R
similarity index 99%
rename from input/gcamdata/R/zchunk_L281.macro_account_tracking.R
rename to input/gcamdata/R/zsocio_L281.macro_account_tracking.R
index 36b086aaa1..89d33b6381 100644
--- a/input/gcamdata/R/zchunk_L281.macro_account_tracking.R
+++ b/input/gcamdata/R/zsocio_L281.macro_account_tracking.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socioeconomics_L281.macro_account_tracking
+#' module_socio_L281.macro_account_tracking
 #'
 #' Generate tibbles to add "hooks" into GCAM to be able to track certain accounts such as
 #' final energy service and net energy trade.  In addition generate the trial value market/resources
@@ -19,7 +19,7 @@
 #' @importFrom dplyr filter lag mutate mutate_at select rename
 #' @author SHK October 2020
 #'
-module_socioeconomics_L281.macro_account_tracking <- function(command, ...) {
+module_socio_L281.macro_account_tracking <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c(FILE = "common/GCAM_region_names",
              FILE = "energy/A54.sector",
diff --git a/input/gcamdata/R/zchunk_data_Maddison_population.R b/input/gcamdata/R/zsocio_data_Maddison_population.R
similarity index 95%
rename from input/gcamdata/R/zchunk_data_Maddison_population.R
rename to input/gcamdata/R/zsocio_data_Maddison_population.R
index 53a2096525..2f21486586 100644
--- a/input/gcamdata/R/zchunk_data_Maddison_population.R
+++ b/input/gcamdata/R/zsocio_data_Maddison_population.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_data_Maddison_population
+#' module_socio_data_Maddison_population
 #'
 #' Dedicated data chunk to read \code{Maddison_population.csv} file.
 #'
@@ -16,7 +16,7 @@
 #' @importFrom tibble tibble
 #' @importFrom dplyr filter mutate select
 #' @author BBL
-module_data_Maddison_population <- function(command, ...) {
+module_socio_data_Maddison_population <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(NULL)
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_bld_agg_xml.R b/input/gcamdata/R/zsocio_xml_bld_agg.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_bld_agg_xml.R
rename to input/gcamdata/R/zsocio_xml_bld_agg.R
index 46e0d40457..733137a3ec 100644
--- a/input/gcamdata/R/zchunk_batch_bld_agg_xml.R
+++ b/input/gcamdata/R/zsocio_xml_bld_agg.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socio_batch_bld_agg_xml
+#' module_socio_bld_agg_xml
 #'
 #' Construct XML data structure for \code{bld_agg.xml} and all the SSP and gSSP ones as well.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{bld_agg.xml}. The corresponding file in the
 #' original data system was \code{batch_bld_agg.xml.R} (socio XML).
-module_socio_batch_bld_agg_xml <- function(command, ...) {
+module_socio_bld_agg_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L242.IncomeElasticity_bld_gSSP1",
              "L242.IncomeElasticity_bld_gSSP2",
diff --git a/input/gcamdata/R/zchunk_batch_socioeconomics_SSP_xml.R b/input/gcamdata/R/zsocio_xml_socioeconomics_SSP.R
similarity index 98%
rename from input/gcamdata/R/zchunk_batch_socioeconomics_SSP_xml.R
rename to input/gcamdata/R/zsocio_xml_socioeconomics_SSP.R
index 6d32f766ac..f9bcfbeaab 100644
--- a/input/gcamdata/R/zchunk_batch_socioeconomics_SSP_xml.R
+++ b/input/gcamdata/R/zsocio_xml_socioeconomics_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_socio_batch_SSP_xml
+#' module_socio_SSP_xml
 #'
 #' Construct XML data structure for all the \code{socioeconomics_[g]SSP[1-5].xml} files.
 #'
@@ -12,7 +12,7 @@
 #' \code{socioeconomics_gSSP4.xml}, \code{socioeconomics_gSSP5.xml}, \code{socioeconomics_SSP1.xml},
 #' \code{socioeconomics_SSP2.xml}, \code{socioeconomics_SSP3.xml},
 #' \code{socioeconomics_SSP4.xml}, and \code{socioeconomics_SSP5.xml}.
-module_socio_batch_SSP_xml <- function(command, ...) {
+module_socio_SSP_xml <- function(command, ...) {
 
   SSP_NUMS <- 1:5
 
diff --git a/input/gcamdata/R/zchunk_batch_socioeconomics_macro_xml.R b/input/gcamdata/R/zsocio_xml_socioeconomics_macro.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_socioeconomics_macro_xml.R
rename to input/gcamdata/R/zsocio_xml_socioeconomics_macro.R
index 87ab69bf04..b06e3bf789 100644
--- a/input/gcamdata/R/zchunk_batch_socioeconomics_macro_xml.R
+++ b/input/gcamdata/R/zsocio_xml_socioeconomics_macro.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_batch_socioeconomics_macro_xml
+#' module_socio_macro_xml
 #'
 #' Construct XML data structure for \code{socioeconomics_macro.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{socioeconomics_macro.xml}. There is no corresponding file in the
 #' original data system.
-module_batch_socioeconomics_macro_xml <- function(command, ...) {
+module_socioeconomics_macro_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L280.nationalAccounts",
              "L280.SavingsRateParams",
diff --git a/input/gcamdata/R/zchunk_L100.water_supply_runoff.R b/input/gcamdata/R/zwater_L100.water_supply_runoff.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L100.water_supply_runoff.R
rename to input/gcamdata/R/zwater_L100.water_supply_runoff.R
diff --git a/input/gcamdata/R/zchunk_L101.water_supply_groundwater.R b/input/gcamdata/R/zwater_L101.water_supply_groundwater.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L101.water_supply_groundwater.R
rename to input/gcamdata/R/zwater_L101.water_supply_groundwater.R
diff --git a/input/gcamdata/R/zchunk_L102.water_supply_unlimited.R b/input/gcamdata/R/zwater_L102.water_supply_unlimited.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L102.water_supply_unlimited.R
rename to input/gcamdata/R/zwater_L102.water_supply_unlimited.R
diff --git a/input/gcamdata/R/zchunk_L103.water_basin_mapping.R b/input/gcamdata/R/zwater_L103.water_basin_mapping.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L103.water_basin_mapping.R
rename to input/gcamdata/R/zwater_L103.water_basin_mapping.R
diff --git a/input/gcamdata/R/zchunk_L110.water_demand_primary.R b/input/gcamdata/R/zwater_L110.water_demand_primary.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L110.water_demand_primary.R
rename to input/gcamdata/R/zwater_L110.water_demand_primary.R
diff --git a/input/gcamdata/R/zchunk_L1233.Elec_water.R b/input/gcamdata/R/zwater_L1233.Elec_water.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L1233.Elec_water.R
rename to input/gcamdata/R/zwater_L1233.Elec_water.R
diff --git a/input/gcamdata/R/zchunk_L132.water_demand_manufacturing.R b/input/gcamdata/R/zwater_L132.water_demand_manufacturing.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L132.water_demand_manufacturing.R
rename to input/gcamdata/R/zwater_L132.water_demand_manufacturing.R
diff --git a/input/gcamdata/R/zchunk_L133.water_demand_livestock.R b/input/gcamdata/R/zwater_L133.water_demand_livestock.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L133.water_demand_livestock.R
rename to input/gcamdata/R/zwater_L133.water_demand_livestock.R
diff --git a/input/gcamdata/R/zchunk_L145.water_demand_municipal.R b/input/gcamdata/R/zwater_L145.water_demand_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L145.water_demand_municipal.R
rename to input/gcamdata/R/zwater_L145.water_demand_municipal.R
diff --git a/input/gcamdata/R/zchunk_L171.desalination.R b/input/gcamdata/R/zwater_L171.desalination.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L171.desalination.R
rename to input/gcamdata/R/zwater_L171.desalination.R
diff --git a/input/gcamdata/R/zchunk_L172.EFW_irrigation.R b/input/gcamdata/R/zwater_L172.EFW_irrigation.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L172.EFW_irrigation.R
rename to input/gcamdata/R/zwater_L172.EFW_irrigation.R
diff --git a/input/gcamdata/R/zchunk_L173.EFW_manufacturing.R b/input/gcamdata/R/zwater_L173.EFW_manufacturing.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L173.EFW_manufacturing.R
rename to input/gcamdata/R/zwater_L173.EFW_manufacturing.R
diff --git a/input/gcamdata/R/zchunk_L174.EFW_municipal.R b/input/gcamdata/R/zwater_L174.EFW_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L174.EFW_municipal.R
rename to input/gcamdata/R/zwater_L174.EFW_municipal.R
diff --git a/input/gcamdata/R/zchunk_L201.water_resources_constrained.R b/input/gcamdata/R/zwater_L201.water_resources_constrained.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L201.water_resources_constrained.R
rename to input/gcamdata/R/zwater_L201.water_resources_constrained.R
diff --git a/input/gcamdata/R/zchunk_L202.water_resources_unlimited.R b/input/gcamdata/R/zwater_L202.water_resources_unlimited.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L202.water_resources_unlimited.R
rename to input/gcamdata/R/zwater_L202.water_resources_unlimited.R
diff --git a/input/gcamdata/R/zchunk_L203.water_td.R b/input/gcamdata/R/zwater_L203.water_td.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L203.water_td.R
rename to input/gcamdata/R/zwater_L203.water_td.R
diff --git a/input/gcamdata/R/zchunk_L210.water_demand_primary.R b/input/gcamdata/R/zwater_L210.water_demand_primary.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L210.water_demand_primary.R
rename to input/gcamdata/R/zwater_L210.water_demand_primary.R
diff --git a/input/gcamdata/R/zchunk_L2233.electricity_water.R b/input/gcamdata/R/zwater_L2233.electricity_water.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L2233.electricity_water.R
rename to input/gcamdata/R/zwater_L2233.electricity_water.R
diff --git a/input/gcamdata/R/zchunk_L232.water_demand_manufacturing.R b/input/gcamdata/R/zwater_L232.water_demand_manufacturing.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L232.water_demand_manufacturing.R
rename to input/gcamdata/R/zwater_L232.water_demand_manufacturing.R
diff --git a/input/gcamdata/R/zchunk_L233.water_demand_livestock.R b/input/gcamdata/R/zwater_L233.water_demand_livestock.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L233.water_demand_livestock.R
rename to input/gcamdata/R/zwater_L233.water_demand_livestock.R
diff --git a/input/gcamdata/R/zchunk_L245.water_demand_municipal.R b/input/gcamdata/R/zwater_L245.water_demand_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L245.water_demand_municipal.R
rename to input/gcamdata/R/zwater_L245.water_demand_municipal.R
diff --git a/input/gcamdata/R/zchunk_L270.EFW_input_coefs.R b/input/gcamdata/R/zwater_L270.EFW_input_coefs.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L270.EFW_input_coefs.R
rename to input/gcamdata/R/zwater_L270.EFW_input_coefs.R
diff --git a/input/gcamdata/R/zchunk_L271.desalination.R b/input/gcamdata/R/zwater_L271.desalination.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L271.desalination.R
rename to input/gcamdata/R/zwater_L271.desalination.R
diff --git a/input/gcamdata/R/zchunk_L272.EFW_irrigation.R b/input/gcamdata/R/zwater_L272.EFW_irrigation.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L272.EFW_irrigation.R
rename to input/gcamdata/R/zwater_L272.EFW_irrigation.R
diff --git a/input/gcamdata/R/zchunk_L273.EFW_manufacturing.R b/input/gcamdata/R/zwater_L273.EFW_manufacturing.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L273.EFW_manufacturing.R
rename to input/gcamdata/R/zwater_L273.EFW_manufacturing.R
diff --git a/input/gcamdata/R/zchunk_L274.EFW_municipal.R b/input/gcamdata/R/zwater_L274.EFW_municipal.R
similarity index 100%
rename from input/gcamdata/R/zchunk_L274.EFW_municipal.R
rename to input/gcamdata/R/zwater_L274.EFW_municipal.R
diff --git a/input/gcamdata/R/zchunk_batch_EFW_WWtrt_coefs_SSP_xml.R b/input/gcamdata/R/zwater_xml_EFW_WWtrt_coefs_SSP.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_EFW_WWtrt_coefs_SSP_xml.R
rename to input/gcamdata/R/zwater_xml_EFW_WWtrt_coefs_SSP.R
index d4484d1b0a..d51846144f 100644
--- a/input/gcamdata/R/zchunk_batch_EFW_WWtrt_coefs_SSP_xml.R
+++ b/input/gcamdata/R/zwater_xml_EFW_WWtrt_coefs_SSP.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_EFW_WWtrt_coefs_SSP_xml
+#' module_water_EFW_WWtrt_coefs_SSP_xml
 #'
 #' Construct XML data structure for all the \code{EFW_WWtrt_coefs_[g]SSP[1-5].xml} files.
 #'
@@ -11,7 +11,7 @@
 #' the generated outputs:\code{EFW_WWtrt_coefs_SSP1.xml},
 #' \code{EFW_WWtrt_coefs_SSP2.xml}, \code{EFW_WWtrt_coefs_SSP3.xml},
 #' \code{EFW_WWtrt_coefs_SSP4.xml}, and \code{EFW_WWtrt_coefs_SSP5.xml}.
-module_water_batch_EFW_WWtrt_coefs_SSP_xml <- function(command, ...) {
+module_water_EFW_WWtrt_coefs_SSP_xml <- function(command, ...) {
 
   SSP_NUMS <- 1:5
 
diff --git a/input/gcamdata/R/zchunk_batch_EFW_input_coefs_xml.R b/input/gcamdata/R/zwater_xml_EFW_input_coefs.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_EFW_input_coefs_xml.R
rename to input/gcamdata/R/zwater_xml_EFW_input_coefs.R
index 7fe667f835..de52206134 100644
--- a/input/gcamdata/R/zchunk_batch_EFW_input_coefs_xml.R
+++ b/input/gcamdata/R/zwater_xml_EFW_input_coefs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_EFW_input_coefs_xml
+#' module_water_EFW_input_coefs_xml
 #'
 #' Construct XML data structure for \code{EFW_input_coefs.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{EFW_input_coefs.xml}.
-module_water_batch_EFW_input_coefs_xml <- function(command, ...) {
+module_water_EFW_input_coefs_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L270.TechCoef_EFW"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_EFW_irrigation_xml.R b/input/gcamdata/R/zwater_xml_EFW_irrigation.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_EFW_irrigation_xml.R
rename to input/gcamdata/R/zwater_xml_EFW_irrigation.R
index 007074058d..22ba4b5ac5 100644
--- a/input/gcamdata/R/zchunk_batch_EFW_irrigation_xml.R
+++ b/input/gcamdata/R/zwater_xml_EFW_irrigation.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_EFW_irrigation_xml
+#' module_water_EFW_irrigation_xml
 #'
 #' Construct XML data structure for \code{EFW_irrigation.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{EFW_irrigation.xml}.
-module_water_batch_EFW_irrigation_xml <- function(command, ...) {
+module_water_EFW_irrigation_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L272.Supplysector_irr",
              "L272.FinalEnergyKeyword_irr",
diff --git a/input/gcamdata/R/zchunk_batch_EFW_manufacturing_xml.R b/input/gcamdata/R/zwater_xml_EFW_manufacturing.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_EFW_manufacturing_xml.R
rename to input/gcamdata/R/zwater_xml_EFW_manufacturing.R
index a983ad8d5a..74ff4b7818 100644
--- a/input/gcamdata/R/zchunk_batch_EFW_manufacturing_xml.R
+++ b/input/gcamdata/R/zwater_xml_EFW_manufacturing.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_EFW_manufacturing_xml
+#' module_water_EFW_manufacturing_xml
 #'
 #' Construct XML data structure for \code{EFW_manufacturing.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{EFW_manufacturing.xml}.
-module_water_batch_EFW_manufacturing_xml <- function(command, ...) {
+module_water_EFW_manufacturing_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L273.Supplysector_ind",
              "L273.FinalEnergyKeyword_ind",
diff --git a/input/gcamdata/R/zchunk_batch_EFW_municipal_xml.R b/input/gcamdata/R/zwater_xml_EFW_municipal.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_EFW_municipal_xml.R
rename to input/gcamdata/R/zwater_xml_EFW_municipal.R
index 9953b230ab..3f7dd7485d 100644
--- a/input/gcamdata/R/zchunk_batch_EFW_municipal_xml.R
+++ b/input/gcamdata/R/zwater_xml_EFW_municipal.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_EFW_municipal_xml
+#' module_water_EFW_municipal_xml
 #'
 #' Construct XML data structure for \code{EFW_municipal.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{EFW_municipal.xml}.
-module_water_batch_EFW_municipal_xml <- function(command, ...) {
+module_water_EFW_municipal_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L274.Supplysector_muni",
              "L274.FinalEnergyKeyword_muni",
diff --git a/input/gcamdata/R/zchunk_batch_desalination_xml.R b/input/gcamdata/R/zwater_xml_desalination.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_desalination_xml.R
rename to input/gcamdata/R/zwater_xml_desalination.R
index 62d06c0181..5f85d2a121 100644
--- a/input/gcamdata/R/zchunk_batch_desalination_xml.R
+++ b/input/gcamdata/R/zwater_xml_desalination.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_desalination_xml
+#' module_water_desalination_xml
 #'
 #' Construct XML data structure for \code{desalination.xml}.
 #'
@@ -9,7 +9,7 @@
 #' @return Depends on \code{command}: either a vector of required inputs,
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{desalination.xml}.
-module_water_batch_desalination_xml <- function(command, ...) {
+module_water_desalination_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L271.Supplysector_desal",
              "L271.FinalEnergyKeyword_desal",
diff --git a/input/gcamdata/R/zchunk_batch_electricity_water_xml.R b/input/gcamdata/R/zwater_xml_electricity_water.R
similarity index 99%
rename from input/gcamdata/R/zchunk_batch_electricity_water_xml.R
rename to input/gcamdata/R/zwater_xml_electricity_water.R
index 87a06d16cb..9ad7fcdd16 100644
--- a/input/gcamdata/R/zchunk_batch_electricity_water_xml.R
+++ b/input/gcamdata/R/zwater_xml_electricity_water.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_electricity_water_xml
+#' module_water_electricity_water_xml
 #'
 #' Construct XML data structure for \code{electricity_water.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electricity_water.xml}. The corresponding file in the
 #' original data system was \code{batch_electricity_water.xml.R} (water XML).
-module_water_batch_electricity_water_xml <- function(command, ...) {
+module_water_electricity_water_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L223.Supplysector_elec",
              "L223.SubsectorShrwtFllt_elec",
diff --git a/input/gcamdata/R/zchunk_batch_electricity_water_coefs_xml.R b/input/gcamdata/R/zwater_xml_electricity_water_coefs.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_electricity_water_coefs_xml.R
rename to input/gcamdata/R/zwater_xml_electricity_water_coefs.R
index 9974bd92af..de4474a824 100644
--- a/input/gcamdata/R/zchunk_batch_electricity_water_coefs_xml.R
+++ b/input/gcamdata/R/zwater_xml_electricity_water_coefs.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_electricity_water_coefs_xml
+#' module_water_electricity_water_coefs_xml
 #'
 #' Construct XML data structure for \code{electricity_water_coefs.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{electricity_water_coefs.xml}. The corresponding file in the
 #' original data system was \code{batch_electricity_water_coefs.xml.R} (water XML).
-module_water_batch_electricity_water_coefs_xml <- function(command, ...) {
+module_water_electricity_water_coefs_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2233.GlobalTechCoef_elec_cool",
               "L2233.GlobalIntTechCoef_elec_cool"))
diff --git a/input/gcamdata/R/zchunk_batch_unlimited_water_supply_xml.R b/input/gcamdata/R/zwater_xml_unlimited_water_supply.R
similarity index 94%
rename from input/gcamdata/R/zchunk_batch_unlimited_water_supply_xml.R
rename to input/gcamdata/R/zwater_xml_unlimited_water_supply.R
index 665f6c9bea..a9478bee18 100644
--- a/input/gcamdata/R/zchunk_batch_unlimited_water_supply_xml.R
+++ b/input/gcamdata/R/zwater_xml_unlimited_water_supply.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_unlimited_water_supply_xml
+#' module_water_unlimited_water_supply_xml
 #'
 #' Construct XML data structure for \code{unlimited_water_supply.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{unlimited_water_supply.xml}. The corresponding file in the
 #' original data system was \code{batch_unlimited_water_supply.xml.R} (water XML).
-module_water_batch_unlimited_water_supply_xml <- function(command, ...) {
+module_water_unlimited_water_supply_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L202.UnlimitRsrc_mapped",
              "L202.Rsrc_mapped",
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_industry_xml.R b/input/gcamdata/R/zwater_xml_water_demand_industry.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_water_demand_industry_xml.R
rename to input/gcamdata/R/zwater_xml_water_demand_industry.R
index a52b992c33..13e589cc46 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_industry_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_demand_industry.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_demand_industry_xml
+#' module_water_water_demand_industry_xml
 #'
 #' Construct XML data structure for \code{water_demand_industry.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_industry.xml}. The corresponding file in the
 #' original data system was \code{batch_water_demand_industry.xml.R} (water XML).
-module_water_batch_water_demand_industry_xml <- function(command, ...) {
+module_water_water_demand_industry_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L232.TechCoef"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_livestock_xml.R b/input/gcamdata/R/zwater_xml_water_demand_livestock.R
similarity index 90%
rename from input/gcamdata/R/zchunk_batch_water_demand_livestock_xml.R
rename to input/gcamdata/R/zwater_xml_water_demand_livestock.R
index 1178a29572..11a63ac52d 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_livestock_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_demand_livestock.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_demand_livestock_xml
+#' module_water_water_demand_livestock_xml
 #'
 #' Construct XML data structure for \code{water_demand_livestock.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_livestock.xml}. The corresponding file in the
 #' original data system was \code{batch_water_demand_livestock.xml.R} (water XML).
-module_water_batch_water_demand_livestock_xml <- function(command, ...) {
+module_water_water_demand_livestock_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L233.TechCoef"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_municipal_xml.R b/input/gcamdata/R/zwater_xml_water_demand_municipal.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_water_demand_municipal_xml.R
rename to input/gcamdata/R/zwater_xml_water_demand_municipal.R
index d28cc6fe8a..e873d162dd 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_municipal_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_demand_municipal.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_demand_municipal_xml
+#' module_water_water_demand_municipal_xml
 #'
 #' Construct XML data structure for \code{water_demand_municipal.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_municipal.xml}. The corresponding file in the
 #' original data system was \code{batch_water_demand_municipal.xml.R} (water XML).
-module_water_batch_water_demand_municipal_xml <- function(command, ...) {
+module_water_water_demand_municipal_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L245.Supplysector",
               "L245.SubsectorLogit",
diff --git a/input/gcamdata/R/zchunk_batch_water_demand_primary_xml.R b/input/gcamdata/R/zwater_xml_water_demand_primary.R
similarity index 91%
rename from input/gcamdata/R/zchunk_batch_water_demand_primary_xml.R
rename to input/gcamdata/R/zwater_xml_water_demand_primary.R
index ac8ba7ec7c..dbaf4e026d 100644
--- a/input/gcamdata/R/zchunk_batch_water_demand_primary_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_demand_primary.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_demand_primary_xml
+#' module_water_water_demand_primary_xml
 #'
 #' Construct XML data structure for \code{water_demand_primary.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_demand_primary.xml}. The corresponding file in the
 #' original data system was \code{batch_water_demand_primary.xml.R} (water XML).
-module_water_batch_water_demand_primary_xml <- function(command, ...) {
+module_water_water_demand_primary_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L210.TechCoef"))
   } else if(command == driver.DECLARE_OUTPUTS) {
diff --git a/input/gcamdata/R/zchunk_batch_water_elec_liquids_limits_xml.R b/input/gcamdata/R/zwater_xml_water_elec_liquids_limits.R
similarity index 92%
rename from input/gcamdata/R/zchunk_batch_water_elec_liquids_limits_xml.R
rename to input/gcamdata/R/zwater_xml_water_elec_liquids_limits.R
index 40d01533db..50428180a7 100644
--- a/input/gcamdata/R/zchunk_batch_water_elec_liquids_limits_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_elec_liquids_limits.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_elec_liquids_limits_xml
+#' module_water_water_elec_liquids_limits_xml
 #'
 #' Construct XML data structure for \code{water_elec_liquids_limits.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_elec_liquids_limits.xml}. The corresponding file in the
 #' original data system was \code{batch_water_elec_liquids_limits_xml.R} (water XML).
-module_water_batch_water_elec_liquids_limits_xml <- function(command, ...) {
+module_water_water_elec_liquids_limits_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L2233.DeleteCreditInput_elec",
               "L2233.CreditInput_elec"))
diff --git a/input/gcamdata/R/zchunk_batch_water_supply_constrained_xml.R b/input/gcamdata/R/zwater_xml_water_supply_constrained.R
similarity index 96%
rename from input/gcamdata/R/zchunk_batch_water_supply_constrained_xml.R
rename to input/gcamdata/R/zwater_xml_water_supply_constrained.R
index bd2469257a..3cc0706c9b 100644
--- a/input/gcamdata/R/zchunk_batch_water_supply_constrained_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_supply_constrained.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_supply_constrained_xml
+#' module_water_water_supply_constrained_xml
 #'
 #' Construct XML data structure for \code{water_supply_constrained.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_supply_constrained.xml}. The corresponding file in the
 #' original data system was \code{batch_water_supply_x.xml} (water XML).
-module_water_batch_water_supply_constrained_xml <- function(command, ...) {
+module_water_water_supply_constrained_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L201.DeleteUnlimitRsrc",
              "L201.Rsrc",
diff --git a/input/gcamdata/R/zchunk_batch_water_supply_uncalibrated_xml.R b/input/gcamdata/R/zwater_xml_water_supply_uncalibrated.R
similarity index 95%
rename from input/gcamdata/R/zchunk_batch_water_supply_uncalibrated_xml.R
rename to input/gcamdata/R/zwater_xml_water_supply_uncalibrated.R
index b6765e653f..0edd2301fe 100644
--- a/input/gcamdata/R/zchunk_batch_water_supply_uncalibrated_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_supply_uncalibrated.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_supply_uncalibrated_xml
+#' module_water_water_supply_uncalibrated_xml
 #'
 #' Construct XML data structure for \code{water_supply_uncalibrated.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_supply_uncalibrated.xml}. The corresponding file in the
 #' original data system was \code{batch_water_supply_uncalibrated.xml} (water XML).
-module_water_batch_water_supply_uncalibrated_xml <- function(command, ...) {
+module_water_water_supply_uncalibrated_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L201.DeleteUnlimitRsrc",
              "L201.Rsrc",
diff --git a/input/gcamdata/R/zchunk_batch_water_td_xml.R b/input/gcamdata/R/zwater_xml_water_td.R
similarity index 97%
rename from input/gcamdata/R/zchunk_batch_water_td_xml.R
rename to input/gcamdata/R/zwater_xml_water_td.R
index cebb6b317d..7bb73eb931 100644
--- a/input/gcamdata/R/zchunk_batch_water_td_xml.R
+++ b/input/gcamdata/R/zwater_xml_water_td.R
@@ -1,6 +1,6 @@
 # Copyright 2019 Battelle Memorial Institute; see the LICENSE file.
 
-#' module_water_batch_water_td_xml
+#' module_water_water_td_xml
 #'
 #' Construct XML data structure for \code{water_td.xml}.
 #'
@@ -10,7 +10,7 @@
 #' a vector of output names, or (if \code{command} is "MAKE") all
 #' the generated outputs: \code{water_td.xml}. The corresponding file in the
 #' original data system was \code{batch_water_mapping.xml.R} (water XML).
-module_water_batch_water_td_xml <- function(command, ...) {
+module_water_water_td_xml <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
     return(c("L203.Supplysector_watertd",
              "L203.SubsectorLogit_watertd",
diff --git a/input/gcamdata/man/PREBUILT_DATA.Rd b/input/gcamdata/man/PREBUILT_DATA.Rd
deleted file mode 100644
index 318b3c03b8..0000000000
--- a/input/gcamdata/man/PREBUILT_DATA.Rd
+++ /dev/null
@@ -1,24 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.R
-\docType{data}
-\name{PREBUILT_DATA}
-\alias{PREBUILT_DATA}
-\title{A list of prebuilt data objects. These are used when the proprietary IEA
-energy data files are not available, and thus
-\code{\link{module_energy_LA100.IEA_downscale_ctry}} is not able to run.
-Its immediate downstream dependencies then used the prebuilt versions of
-their outputs stored in this object.}
-\format{
-A list object where [[object_name]] <- tibble:
-}
-\usage{
-PREBUILT_DATA
-}
-\description{
-A list of prebuilt data objects. These are used when the proprietary IEA
-energy data files are not available, and thus
-\code{\link{module_energy_LA100.IEA_downscale_ctry}} is not able to run.
-Its immediate downstream dependencies then used the prebuilt versions of
-their outputs stored in this object.
-}
-\keyword{datasets}
diff --git a/input/gcamdata/man/chunk_readylist.Rd b/input/gcamdata/man/chunk_readylist.Rd
deleted file mode 100644
index ee1971f2fd..0000000000
--- a/input/gcamdata/man/chunk_readylist.Rd
+++ /dev/null
@@ -1,14 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/admin.R
-\name{chunk_readylist}
-\alias{chunk_readylist}
-\title{chunk_readylist}
-\usage{
-chunk_readylist()
-}
-\value{
-Returns a list of disabled chunks: their lines of code, inputs and available inputs, dependencies
-}
-\description{
-chunk_readylist
-}
diff --git a/input/gcamdata/man/join.gdp.ts.Rd b/input/gcamdata/man/join.gdp.ts.Rd
index e6b1f8f436..370aeb1976 100644
--- a/input/gcamdata/man/join.gdp.ts.Rd
+++ b/input/gcamdata/man/join.gdp.ts.Rd
@@ -1,8 +1,8 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L102.GDP.R
+% Please edit documentation in R/module-helpers.R
 \name{join.gdp.ts}
 \alias{join.gdp.ts}
-\title{Join past GDP time series to future.}
+\title{join.gdp.ts}
 \usage{
 join.gdp.ts(past, future, grouping)
 }
@@ -19,14 +19,16 @@ grouping).}
 Time series with the past and future joined as described in details.
 }
 \description{
+Join past GDP time series to future.
+}
+\details{
 When we have to join two GDP time series, we usually find that they don't
 match up at year of overlap (the "base year").  What we do in these cases is
 we compute, for the later time series, ratios of GDPs in the future years to
 those in the base year.  We then multiply the future ratios by the past base
 year value.  That future time series can then be grafted onto the past
 without leaving a seam.
-}
-\details{
+
 In practice, the past is often a single time series, while the future is
 often a collection of scenarios.  Therefore, we assume that the past time
 series has no scenario column.  If the future does not have a scenario
diff --git a/input/gcamdata/man/module_aglu_LA100.0_LDS_preprocessing.Rd b/input/gcamdata/man/module_aglu_L100.0_LDS_preprocessing.Rd
similarity index 80%
rename from input/gcamdata/man/module_aglu_LA100.0_LDS_preprocessing.Rd
rename to input/gcamdata/man/module_aglu_L100.0_LDS_preprocessing.Rd
index 177d98fa45..ea867d2486 100644
--- a/input/gcamdata/man/module_aglu_LA100.0_LDS_preprocessing.Rd
+++ b/input/gcamdata/man/module_aglu_L100.0_LDS_preprocessing.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.0_LDS_preprocessing.R
-\name{module_aglu_LA100.0_LDS_preprocessing}
-\alias{module_aglu_LA100.0_LDS_preprocessing}
-\title{module_aglu_LA100.0_LDS_preprocessing}
+% Please edit documentation in R/zaglu_L100.0_LDS_preprocessing.R
+\name{module_aglu_L100.0_LDS_preprocessing}
+\alias{module_aglu_L100.0_LDS_preprocessing}
+\title{module_aglu_L100.0_LDS_preprocessing}
 \usage{
-module_aglu_LA100.0_LDS_preprocessing(command, ...)
+module_aglu_L100.0_LDS_preprocessing(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA100.FAO_downscale_ctry.Rd b/input/gcamdata/man/module_aglu_L100.FAO_downscale_ctry.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LA100.FAO_downscale_ctry.Rd
rename to input/gcamdata/man/module_aglu_L100.FAO_downscale_ctry.Rd
index 34bec59026..bb840a6fb0 100644
--- a/input/gcamdata/man/module_aglu_LA100.FAO_downscale_ctry.Rd
+++ b/input/gcamdata/man/module_aglu_L100.FAO_downscale_ctry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.FAO_downscale_ctry.R
-\name{module_aglu_LA100.FAO_downscale_ctry}
-\alias{module_aglu_LA100.FAO_downscale_ctry}
-\title{module_aglu_LA100.FAO_downscale_ctry}
+% Please edit documentation in R/zaglu_L100.FAO_downscale_ctry.R
+\name{module_aglu_L100.FAO_downscale_ctry}
+\alias{module_aglu_L100.FAO_downscale_ctry}
+\title{module_aglu_L100.FAO_downscale_ctry}
 \usage{
-module_aglu_LA100.FAO_downscale_ctry(command, ...)
+module_aglu_L100.FAO_downscale_ctry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA100.GTAP_downscale_ctry.Rd b/input/gcamdata/man/module_aglu_L100.GTAP_downscale_ctry.Rd
similarity index 73%
rename from input/gcamdata/man/module_aglu_LA100.GTAP_downscale_ctry.Rd
rename to input/gcamdata/man/module_aglu_L100.GTAP_downscale_ctry.Rd
index b32ee98010..32436647d4 100644
--- a/input/gcamdata/man/module_aglu_LA100.GTAP_downscale_ctry.Rd
+++ b/input/gcamdata/man/module_aglu_L100.GTAP_downscale_ctry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.GTAP_downscale_ctry.R
-\name{module_aglu_LA100.GTAP_downscale_ctry}
-\alias{module_aglu_LA100.GTAP_downscale_ctry}
-\title{module_aglu_LA100.GTAP_downscale_ctry}
+% Please edit documentation in R/zaglu_L100.GTAP_downscale_ctry.R
+\name{module_aglu_L100.GTAP_downscale_ctry}
+\alias{module_aglu_L100.GTAP_downscale_ctry}
+\title{module_aglu_L100.GTAP_downscale_ctry}
 \usage{
-module_aglu_LA100.GTAP_downscale_ctry(command, ...)
+module_aglu_L100.GTAP_downscale_ctry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA100.IMAGE_downscale_ctry_yr.Rd b/input/gcamdata/man/module_aglu_L100.IMAGE_downscale_ctry_yr.Rd
similarity index 74%
rename from input/gcamdata/man/module_aglu_LA100.IMAGE_downscale_ctry_yr.Rd
rename to input/gcamdata/man/module_aglu_L100.IMAGE_downscale_ctry_yr.Rd
index 8637be32d5..e74585f8db 100644
--- a/input/gcamdata/man/module_aglu_LA100.IMAGE_downscale_ctry_yr.Rd
+++ b/input/gcamdata/man/module_aglu_L100.IMAGE_downscale_ctry_yr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.IMAGE_downscale_ctry_yr.R
-\name{module_aglu_LA100.IMAGE_downscale_ctry_yr}
-\alias{module_aglu_LA100.IMAGE_downscale_ctry_yr}
-\title{module_aglu_LA100.IMAGE_downscale_ctry_yr}
+% Please edit documentation in R/zaglu_L100.IMAGE_downscale_ctry_yr.R
+\name{module_aglu_L100.IMAGE_downscale_ctry_yr}
+\alias{module_aglu_L100.IMAGE_downscale_ctry_yr}
+\title{module_aglu_L100.IMAGE_downscale_ctry_yr}
 \usage{
-module_aglu_LA100.IMAGE_downscale_ctry_yr(command, ...)
+module_aglu_L100.IMAGE_downscale_ctry_yr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA101.ag_FAO_R_C_Y.Rd b/input/gcamdata/man/module_aglu_L101.ag_FAO_R_C_Y.Rd
similarity index 85%
rename from input/gcamdata/man/module_aglu_LA101.ag_FAO_R_C_Y.Rd
rename to input/gcamdata/man/module_aglu_L101.ag_FAO_R_C_Y.Rd
index c87020b75e..5da94f8aaa 100644
--- a/input/gcamdata/man/module_aglu_LA101.ag_FAO_R_C_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L101.ag_FAO_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA101.ag_FAO_R_C_Y.R
-\name{module_aglu_LA101.ag_FAO_R_C_Y}
-\alias{module_aglu_LA101.ag_FAO_R_C_Y}
-\title{module_aglu_LA101.ag_FAO_R_C_Y}
+% Please edit documentation in R/zaglu_L101.ag_FAO_R_C_Y.R
+\name{module_aglu_L101.ag_FAO_R_C_Y}
+\alias{module_aglu_L101.ag_FAO_R_C_Y}
+\title{module_aglu_L101.ag_FAO_R_C_Y}
 \usage{
-module_aglu_LA101.ag_FAO_R_C_Y(command, ...)
+module_aglu_L101.ag_FAO_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA105.an_FAO_R_C_Y.Rd b/input/gcamdata/man/module_aglu_L105.an_FAO_R_C_Y.Rd
similarity index 80%
rename from input/gcamdata/man/module_aglu_LA105.an_FAO_R_C_Y.Rd
rename to input/gcamdata/man/module_aglu_L105.an_FAO_R_C_Y.Rd
index 79a2bec42d..28f94e20e5 100644
--- a/input/gcamdata/man/module_aglu_LA105.an_FAO_R_C_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L105.an_FAO_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA105.an_FAO_R_C_Y.R
-\name{module_aglu_LA105.an_FAO_R_C_Y}
-\alias{module_aglu_LA105.an_FAO_R_C_Y}
-\title{module_aglu_LA105.an_FAO_R_C_Y}
+% Please edit documentation in R/zaglu_L105.an_FAO_R_C_Y.R
+\name{module_aglu_L105.an_FAO_R_C_Y}
+\alias{module_aglu_L105.an_FAO_R_C_Y}
+\title{module_aglu_L105.an_FAO_R_C_Y}
 \usage{
-module_aglu_LA105.an_FAO_R_C_Y(command, ...)
+module_aglu_L105.an_FAO_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y.Rd b/input/gcamdata/man/module_aglu_L106.ag_an_NetExp_FAO_R_C_Y.Rd
similarity index 76%
rename from input/gcamdata/man/module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y.Rd
rename to input/gcamdata/man/module_aglu_L106.ag_an_NetExp_FAO_R_C_Y.Rd
index 5f42e9c663..4d31088f6f 100644
--- a/input/gcamdata/man/module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L106.ag_an_NetExp_FAO_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA106.ag_an_NetExp_FAO_R_C_Y.R
-\name{module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y}
-\alias{module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y}
-\title{module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y}
+% Please edit documentation in R/zaglu_L106.ag_an_NetExp_FAO_R_C_Y.R
+\name{module_aglu_L106.ag_an_NetExp_FAO_R_C_Y}
+\alias{module_aglu_L106.ag_an_NetExp_FAO_R_C_Y}
+\title{module_aglu_L106.ag_an_NetExp_FAO_R_C_Y}
 \usage{
-module_aglu_LA106.ag_an_NetExp_FAO_R_C_Y(command, ...)
+module_aglu_L106.ag_an_NetExp_FAO_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y.Rd b/input/gcamdata/man/module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y.Rd
rename to input/gcamdata/man/module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y.Rd
index b61c27a718..f87a4bc026 100644
--- a/input/gcamdata/man/module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA107.an_IMAGE_R_C_Sys_Fd_Y.R
-\name{module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y}
-\alias{module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y}
-\title{module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y}
+% Please edit documentation in R/zaglu_L107.an_IMAGE_R_C_Sys_Fd_Y.R
+\name{module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y}
+\alias{module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y}
+\title{module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y}
 \usage{
-module_aglu_LA107.an_IMAGE_R_C_Sys_Fd_Y(command, ...)
+module_aglu_L107.an_IMAGE_R_C_Sys_Fd_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LA108.ag_Feed_R_C_Y.Rd b/input/gcamdata/man/module_aglu_L108.ag_Feed_R_C_Y.Rd
similarity index 82%
rename from input/gcamdata/man/module_aglu_LA108.ag_Feed_R_C_Y.Rd
rename to input/gcamdata/man/module_aglu_L108.ag_Feed_R_C_Y.Rd
index 719dcee599..8d8a496450 100644
--- a/input/gcamdata/man/module_aglu_LA108.ag_Feed_R_C_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L108.ag_Feed_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA108.ag_Feed_R_C_Y.R
-\name{module_aglu_LA108.ag_Feed_R_C_Y}
-\alias{module_aglu_LA108.ag_Feed_R_C_Y}
-\title{module_aglu_LA108.ag_Feed_R_C_Y}
+% Please edit documentation in R/zaglu_L108.ag_Feed_R_C_Y.R
+\name{module_aglu_L108.ag_Feed_R_C_Y}
+\alias{module_aglu_L108.ag_Feed_R_C_Y}
+\title{module_aglu_L108.ag_Feed_R_C_Y}
 \usage{
-module_aglu_LA108.ag_Feed_R_C_Y(command, ...)
+module_aglu_L108.ag_Feed_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB109.ag_an_ALL_R_C_Y.Rd b/input/gcamdata/man/module_aglu_L109.ag_an_ALL_R_C_Y.Rd
similarity index 78%
rename from input/gcamdata/man/module_aglu_LB109.ag_an_ALL_R_C_Y.Rd
rename to input/gcamdata/man/module_aglu_L109.ag_an_ALL_R_C_Y.Rd
index d6ecefdbfd..111ccbc3b7 100644
--- a/input/gcamdata/man/module_aglu_LB109.ag_an_ALL_R_C_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L109.ag_an_ALL_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB109.ag_an_ALL_R_C_Y.R
-\name{module_aglu_LB109.ag_an_ALL_R_C_Y}
-\alias{module_aglu_LB109.ag_an_ALL_R_C_Y}
-\title{module_aglu_LB109.ag_an_ALL_R_C_Y}
+% Please edit documentation in R/zaglu_L109.ag_an_ALL_R_C_Y.R
+\name{module_aglu_L109.ag_an_ALL_R_C_Y}
+\alias{module_aglu_L109.ag_an_ALL_R_C_Y}
+\title{module_aglu_L109.ag_an_ALL_R_C_Y}
 \usage{
-module_aglu_LB109.ag_an_ALL_R_C_Y(command, ...)
+module_aglu_L109.ag_an_ALL_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB1091.ag_GrossTrade.Rd b/input/gcamdata/man/module_aglu_L1091.ag_GrossTrade.Rd
similarity index 75%
rename from input/gcamdata/man/module_aglu_LB1091.ag_GrossTrade.Rd
rename to input/gcamdata/man/module_aglu_L1091.ag_GrossTrade.Rd
index d68047cbdf..239fb946da 100644
--- a/input/gcamdata/man/module_aglu_LB1091.ag_GrossTrade.Rd
+++ b/input/gcamdata/man/module_aglu_L1091.ag_GrossTrade.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1091.ag_GrossTrade.R
-\name{module_aglu_LB1091.ag_GrossTrade}
-\alias{module_aglu_LB1091.ag_GrossTrade}
-\title{module_aglu_LB1091.ag_GrossTrade}
+% Please edit documentation in R/zaglu_L1091.ag_GrossTrade.R
+\name{module_aglu_L1091.ag_GrossTrade}
+\alias{module_aglu_L1091.ag_GrossTrade}
+\title{module_aglu_L1091.ag_GrossTrade}
 \usage{
-module_aglu_LB1091.ag_GrossTrade(command, ...)
+module_aglu_L1091.ag_GrossTrade(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB110.For_FAO_R_Y.Rd b/input/gcamdata/man/module_aglu_L110.For_FAO_R_Y.Rd
similarity index 81%
rename from input/gcamdata/man/module_aglu_LB110.For_FAO_R_Y.Rd
rename to input/gcamdata/man/module_aglu_L110.For_FAO_R_Y.Rd
index cd0206238e..0a05aee300 100644
--- a/input/gcamdata/man/module_aglu_LB110.For_FAO_R_Y.Rd
+++ b/input/gcamdata/man/module_aglu_L110.For_FAO_R_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB110.For_FAO_R_Y.R
-\name{module_aglu_LB110.For_FAO_R_Y}
-\alias{module_aglu_LB110.For_FAO_R_Y}
-\title{module_aglu_LB110.For_FAO_R_Y}
+% Please edit documentation in R/zaglu_L110.For_FAO_R_Y.R
+\name{module_aglu_L110.For_FAO_R_Y}
+\alias{module_aglu_L110.For_FAO_R_Y}
+\title{module_aglu_L110.For_FAO_R_Y}
 \usage{
-module_aglu_LB110.For_FAO_R_Y(command, ...)
+module_aglu_L110.For_FAO_R_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB111.ag_resbio_R_C.Rd b/input/gcamdata/man/module_aglu_L111.ag_resbio_R_C.Rd
similarity index 75%
rename from input/gcamdata/man/module_aglu_LB111.ag_resbio_R_C.Rd
rename to input/gcamdata/man/module_aglu_L111.ag_resbio_R_C.Rd
index a528a85281..3ca4a95c7d 100644
--- a/input/gcamdata/man/module_aglu_LB111.ag_resbio_R_C.Rd
+++ b/input/gcamdata/man/module_aglu_L111.ag_resbio_R_C.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB111.ag_resbio_R_C.R
-\name{module_aglu_LB111.ag_resbio_R_C}
-\alias{module_aglu_LB111.ag_resbio_R_C}
-\title{module_aglu_LB111.ag_resbio_R_C}
+% Please edit documentation in R/zaglu_L111.ag_resbio_R_C.R
+\name{module_aglu_L111.ag_resbio_R_C}
+\alias{module_aglu_L111.ag_resbio_R_C}
+\title{module_aglu_L111.ag_resbio_R_C}
 \usage{
-module_aglu_LB111.ag_resbio_R_C(command, ...)
+module_aglu_L111.ag_resbio_R_C(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB112.ag_prodchange_R_C_Y_GLU.Rd b/input/gcamdata/man/module_aglu_L112.ag_prodchange_R_C_Y_GLU.Rd
similarity index 79%
rename from input/gcamdata/man/module_aglu_LB112.ag_prodchange_R_C_Y_GLU.Rd
rename to input/gcamdata/man/module_aglu_L112.ag_prodchange_R_C_Y_GLU.Rd
index cae28808ad..4fee6c89c6 100644
--- a/input/gcamdata/man/module_aglu_LB112.ag_prodchange_R_C_Y_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L112.ag_prodchange_R_C_Y_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB112.ag_prodchange_R_C_Y_GLU.R
-\name{module_aglu_LB112.ag_prodchange_R_C_Y_GLU}
-\alias{module_aglu_LB112.ag_prodchange_R_C_Y_GLU}
-\title{module_aglu_LB112.ag_prodchange_R_C_Y_GLU}
+% Please edit documentation in R/zaglu_L112.ag_prodchange_R_C_Y_GLU.R
+\name{module_aglu_L112.ag_prodchange_R_C_Y_GLU}
+\alias{module_aglu_L112.ag_prodchange_R_C_Y_GLU}
+\title{module_aglu_L112.ag_prodchange_R_C_Y_GLU}
 \usage{
-module_aglu_LB112.ag_prodchange_R_C_Y_GLU(command, ...)
+module_aglu_L112.ag_prodchange_R_C_Y_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU.Rd b/input/gcamdata/man/module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU.Rd
similarity index 79%
rename from input/gcamdata/man/module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU.Rd
rename to input/gcamdata/man/module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU.Rd
index a0ad9ee9b2..4db6ac9de3 100644
--- a/input/gcamdata/man/module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB120.LC_GIS_R_LTgis_Yh_GLU.R
-\name{module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU}
-\alias{module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU}
-\title{module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU}
+% Please edit documentation in R/zaglu_L120.LC_GIS_R_LTgis_Yh_GLU.R
+\name{module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU}
+\alias{module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU}
+\title{module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU}
 \usage{
-module_aglu_LB120.LC_GIS_R_LTgis_Yh_GLU(command, ...)
+module_aglu_L120.LC_GIS_R_LTgis_Yh_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB121.Carbon_LT.Rd b/input/gcamdata/man/module_aglu_L121.Carbon_LT.Rd
similarity index 80%
rename from input/gcamdata/man/module_aglu_LB121.Carbon_LT.Rd
rename to input/gcamdata/man/module_aglu_L121.Carbon_LT.Rd
index 09b828e869..de498a228f 100644
--- a/input/gcamdata/man/module_aglu_LB121.Carbon_LT.Rd
+++ b/input/gcamdata/man/module_aglu_L121.Carbon_LT.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB121.Carbon_LT.R
-\name{module_aglu_LB121.Carbon_LT}
-\alias{module_aglu_LB121.Carbon_LT}
-\title{module_aglu_LB121.Carbon_LT}
+% Please edit documentation in R/zaglu_L121.Carbon_LT.R
+\name{module_aglu_L121.Carbon_LT}
+\alias{module_aglu_L121.Carbon_LT}
+\title{module_aglu_L121.Carbon_LT}
 \usage{
-module_aglu_LB121.Carbon_LT(command, ...)
+module_aglu_L121.Carbon_LT(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB122.LC_R_Cropland_Yh_GLU.Rd b/input/gcamdata/man/module_aglu_L122.LC_R_Cropland_Yh_GLU.Rd
similarity index 88%
rename from input/gcamdata/man/module_aglu_LB122.LC_R_Cropland_Yh_GLU.Rd
rename to input/gcamdata/man/module_aglu_L122.LC_R_Cropland_Yh_GLU.Rd
index 4efd3ef2f3..8828f41485 100644
--- a/input/gcamdata/man/module_aglu_LB122.LC_R_Cropland_Yh_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L122.LC_R_Cropland_Yh_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB122.LC_R_Cropland_Yh_GLU.R
-\name{module_aglu_LB122.LC_R_Cropland_Yh_GLU}
-\alias{module_aglu_LB122.LC_R_Cropland_Yh_GLU}
-\title{module_aglu_LB122.LC_R_Cropland_Yh_GLU}
+% Please edit documentation in R/zaglu_L122.LC_R_Cropland_Yh_GLU.R
+\name{module_aglu_L122.LC_R_Cropland_Yh_GLU}
+\alias{module_aglu_L122.LC_R_Cropland_Yh_GLU}
+\title{module_aglu_L122.LC_R_Cropland_Yh_GLU}
 \usage{
-module_aglu_LB122.LC_R_Cropland_Yh_GLU(command, ...)
+module_aglu_L122.LC_R_Cropland_Yh_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU.Rd b/input/gcamdata/man/module_aglu_L123.LC_R_MgdPastFor_Yh_GLU.Rd
similarity index 81%
rename from input/gcamdata/man/module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU.Rd
rename to input/gcamdata/man/module_aglu_L123.LC_R_MgdPastFor_Yh_GLU.Rd
index c70af2dc24..eb59d95d3d 100644
--- a/input/gcamdata/man/module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L123.LC_R_MgdPastFor_Yh_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB123.LC_R_MgdPastFor_Yh_GLU.R
-\name{module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU}
-\alias{module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU}
-\title{module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU}
+% Please edit documentation in R/zaglu_L123.LC_R_MgdPastFor_Yh_GLU.R
+\name{module_aglu_L123.LC_R_MgdPastFor_Yh_GLU}
+\alias{module_aglu_L123.LC_R_MgdPastFor_Yh_GLU}
+\title{module_aglu_L123.LC_R_MgdPastFor_Yh_GLU}
 \usage{
-module_aglu_LB123.LC_R_MgdPastFor_Yh_GLU(command, ...)
+module_aglu_L123.LC_R_MgdPastFor_Yh_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB124.LC_R_UnMgd_Yh_GLU.Rd b/input/gcamdata/man/module_aglu_L124.LC_R_UnMgd_Yh_GLU.Rd
similarity index 88%
rename from input/gcamdata/man/module_aglu_LB124.LC_R_UnMgd_Yh_GLU.Rd
rename to input/gcamdata/man/module_aglu_L124.LC_R_UnMgd_Yh_GLU.Rd
index 8839f3c4c1..a146b71e69 100644
--- a/input/gcamdata/man/module_aglu_LB124.LC_R_UnMgd_Yh_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L124.LC_R_UnMgd_Yh_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB124.LC_R_UnMgd_Yh_GLU.R
-\name{module_aglu_LB124.LC_R_UnMgd_Yh_GLU}
-\alias{module_aglu_LB124.LC_R_UnMgd_Yh_GLU}
-\title{module_aglu_LB124.LC_R_UnMgd_Yh_GLU}
+% Please edit documentation in R/zaglu_L124.LC_R_UnMgd_Yh_GLU.R
+\name{module_aglu_L124.LC_R_UnMgd_Yh_GLU}
+\alias{module_aglu_L124.LC_R_UnMgd_Yh_GLU}
+\title{module_aglu_L124.LC_R_UnMgd_Yh_GLU}
 \usage{
-module_aglu_LB124.LC_R_UnMgd_Yh_GLU(command, ...)
+module_aglu_L124.LC_R_UnMgd_Yh_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB125.LC_tot.Rd b/input/gcamdata/man/module_aglu_L125.LC_tot.Rd
similarity index 84%
rename from input/gcamdata/man/module_aglu_LB125.LC_tot.Rd
rename to input/gcamdata/man/module_aglu_L125.LC_tot.Rd
index a401125e19..103c09f423 100644
--- a/input/gcamdata/man/module_aglu_LB125.LC_tot.Rd
+++ b/input/gcamdata/man/module_aglu_L125.LC_tot.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB125.LC_tot.R
-\name{module_aglu_LB125.LC_tot}
-\alias{module_aglu_LB125.LC_tot}
-\title{module_aglu_LB125.LC_tot}
+% Please edit documentation in R/zaglu_L125.LC_tot.R
+\name{module_aglu_L125.LC_tot}
+\alias{module_aglu_L125.LC_tot}
+\title{module_aglu_L125.LC_tot}
 \usage{
-module_aglu_LB125.LC_tot(command, ...)
+module_aglu_L125.LC_tot(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB131.LV_R_GLU.Rd b/input/gcamdata/man/module_aglu_L131.LV_R_GLU.Rd
similarity index 75%
rename from input/gcamdata/man/module_aglu_LB131.LV_R_GLU.Rd
rename to input/gcamdata/man/module_aglu_L131.LV_R_GLU.Rd
index baeb934688..ad54bbd404 100644
--- a/input/gcamdata/man/module_aglu_LB131.LV_R_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L131.LV_R_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB131.LV_R_GLU.R
-\name{module_aglu_LB131.LV_R_GLU}
-\alias{module_aglu_LB131.LV_R_GLU}
-\title{module_aglu_LB131.LV_R_GLU}
+% Please edit documentation in R/zaglu_L131.LV_R_GLU.R
+\name{module_aglu_L131.LV_R_GLU}
+\alias{module_aglu_L131.LV_R_GLU}
+\title{module_aglu_L131.LV_R_GLU}
 \usage{
-module_aglu_LB131.LV_R_GLU(command, ...)
+module_aglu_L131.LV_R_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB132.ag_an_For_Prices_USA_C_2005.Rd b/input/gcamdata/man/module_aglu_L132.ag_an_For_Prices_USA_C_2005.Rd
similarity index 71%
rename from input/gcamdata/man/module_aglu_LB132.ag_an_For_Prices_USA_C_2005.Rd
rename to input/gcamdata/man/module_aglu_L132.ag_an_For_Prices_USA_C_2005.Rd
index 9611a3fb9c..7e95183895 100644
--- a/input/gcamdata/man/module_aglu_LB132.ag_an_For_Prices_USA_C_2005.Rd
+++ b/input/gcamdata/man/module_aglu_L132.ag_an_For_Prices_USA_C_2005.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB132.ag_an_For_Prices_USA_C_2005.R
-\name{module_aglu_LB132.ag_an_For_Prices_USA_C_2005}
-\alias{module_aglu_LB132.ag_an_For_Prices_USA_C_2005}
-\title{module_aglu_LB132.ag_an_For_Prices_USA_C_2005}
+% Please edit documentation in R/zaglu_L132.ag_an_For_Prices_USA_C_2005.R
+\name{module_aglu_L132.ag_an_For_Prices_USA_C_2005}
+\alias{module_aglu_L132.ag_an_For_Prices_USA_C_2005}
+\title{module_aglu_L132.ag_an_For_Prices_USA_C_2005}
 \usage{
-module_aglu_LB132.ag_an_For_Prices_USA_C_2005(command, ...)
+module_aglu_L132.ag_an_For_Prices_USA_C_2005(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB1321.regional_ag_prices.Rd b/input/gcamdata/man/module_aglu_L1321.regional_ag_prices.Rd
similarity index 74%
rename from input/gcamdata/man/module_aglu_LB1321.regional_ag_prices.Rd
rename to input/gcamdata/man/module_aglu_L1321.regional_ag_prices.Rd
index 70255674d4..3018da3bd7 100644
--- a/input/gcamdata/man/module_aglu_LB1321.regional_ag_prices.Rd
+++ b/input/gcamdata/man/module_aglu_L1321.regional_ag_prices.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1321.regional_ag_prices.R
-\name{module_aglu_LB1321.regional_ag_prices}
-\alias{module_aglu_LB1321.regional_ag_prices}
-\title{module_aglu_LB1321.regional_ag_prices}
+% Please edit documentation in R/zaglu_L1321.regional_ag_prices.R
+\name{module_aglu_L1321.regional_ag_prices}
+\alias{module_aglu_L1321.regional_ag_prices}
+\title{module_aglu_L1321.regional_ag_prices}
 \usage{
-module_aglu_LB1321.regional_ag_prices(command, ...)
+module_aglu_L1321.regional_ag_prices(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB133.ag_Costs_USA_C_2005.Rd b/input/gcamdata/man/module_aglu_L133.ag_Costs_USA_C_2005.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB133.ag_Costs_USA_C_2005.Rd
rename to input/gcamdata/man/module_aglu_L133.ag_Costs_USA_C_2005.Rd
index ec2c4aea5e..d9878156df 100644
--- a/input/gcamdata/man/module_aglu_LB133.ag_Costs_USA_C_2005.Rd
+++ b/input/gcamdata/man/module_aglu_L133.ag_Costs_USA_C_2005.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB133.ag_Costs_USA_C_2005.R
-\name{module_aglu_LB133.ag_Costs_USA_C_2005}
-\alias{module_aglu_LB133.ag_Costs_USA_C_2005}
-\title{module_aglu_LB133.ag_Costs_USA_C_2005}
+% Please edit documentation in R/zaglu_L133.ag_Costs_USA_C_2005.R
+\name{module_aglu_L133.ag_Costs_USA_C_2005}
+\alias{module_aglu_L133.ag_Costs_USA_C_2005}
+\title{module_aglu_L133.ag_Costs_USA_C_2005}
 \usage{
-module_aglu_LB133.ag_Costs_USA_C_2005(command, ...)
+module_aglu_L133.ag_Costs_USA_C_2005(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB141.ag_Fert_IFA_ctry_crop.Rd b/input/gcamdata/man/module_aglu_L141.ag_Fert_IFA_ctry_crop.Rd
similarity index 79%
rename from input/gcamdata/man/module_aglu_LB141.ag_Fert_IFA_ctry_crop.Rd
rename to input/gcamdata/man/module_aglu_L141.ag_Fert_IFA_ctry_crop.Rd
index df23506b34..ccb6f3eb09 100644
--- a/input/gcamdata/man/module_aglu_LB141.ag_Fert_IFA_ctry_crop.Rd
+++ b/input/gcamdata/man/module_aglu_L141.ag_Fert_IFA_ctry_crop.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB141.ag_Fert_IFA_ctry_crop.R
-\name{module_aglu_LB141.ag_Fert_IFA_ctry_crop}
-\alias{module_aglu_LB141.ag_Fert_IFA_ctry_crop}
-\title{module_aglu_LB141.ag_Fert_IFA_ctry_crop}
+% Please edit documentation in R/zaglu_L141.ag_Fert_IFA_ctry_crop.R
+\name{module_aglu_L141.ag_Fert_IFA_ctry_crop}
+\alias{module_aglu_L141.ag_Fert_IFA_ctry_crop}
+\title{module_aglu_L141.ag_Fert_IFA_ctry_crop}
 \usage{
-module_aglu_LB141.ag_Fert_IFA_ctry_crop(command, ...)
+module_aglu_L141.ag_Fert_IFA_ctry_crop(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU.Rd b/input/gcamdata/man/module_aglu_L142.ag_Fert_IO_R_C_Y_GLU.Rd
similarity index 79%
rename from input/gcamdata/man/module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU.Rd
rename to input/gcamdata/man/module_aglu_L142.ag_Fert_IO_R_C_Y_GLU.Rd
index e5576e5d72..a2e0996342 100644
--- a/input/gcamdata/man/module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU.Rd
+++ b/input/gcamdata/man/module_aglu_L142.ag_Fert_IO_R_C_Y_GLU.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB142.ag_Fert_IO_R_C_Y_GLU.R
-\name{module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU}
-\alias{module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU}
-\title{module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU}
+% Please edit documentation in R/zaglu_L142.ag_Fert_IO_R_C_Y_GLU.R
+\name{module_aglu_L142.ag_Fert_IO_R_C_Y_GLU}
+\alias{module_aglu_L142.ag_Fert_IO_R_C_Y_GLU}
+\title{module_aglu_L142.ag_Fert_IO_R_C_Y_GLU}
 \usage{
-module_aglu_LB142.ag_Fert_IO_R_C_Y_GLU(command, ...)
+module_aglu_L142.ag_Fert_IO_R_C_Y_GLU(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr.Rd
similarity index 79%
rename from input/gcamdata/man/module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr.Rd
index 2681368bce..e7e009683e 100644
--- a/input/gcamdata/man/module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB151.ag_MIRCA_ctry_C_GLU_irr.R
-\name{module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr}
-\alias{module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr}
-\title{module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr}
+% Please edit documentation in R/zaglu_L151.ag_MIRCA_ctry_C_GLU_irr.R
+\name{module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr}
+\alias{module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr}
+\title{module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr}
 \usage{
-module_aglu_LB151.ag_MIRCA_ctry_C_GLU_irr(command, ...)
+module_aglu_L151.ag_MIRCA_ctry_C_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB152.ag_GTAP_R_C_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L152.ag_GTAP_R_C_GLU_irr.Rd
similarity index 77%
rename from input/gcamdata/man/module_aglu_LB152.ag_GTAP_R_C_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L152.ag_GTAP_R_C_GLU_irr.Rd
index 3678b10e6b..aaadeafd55 100644
--- a/input/gcamdata/man/module_aglu_LB152.ag_GTAP_R_C_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L152.ag_GTAP_R_C_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB152.ag_GTAP_R_C_GLU_irr.R
-\name{module_aglu_LB152.ag_GTAP_R_C_GLU_irr}
-\alias{module_aglu_LB152.ag_GTAP_R_C_GLU_irr}
-\title{module_aglu_LB152.ag_GTAP_R_C_GLU_irr}
+% Please edit documentation in R/zaglu_L152.ag_GTAP_R_C_GLU_irr.R
+\name{module_aglu_L152.ag_GTAP_R_C_GLU_irr}
+\alias{module_aglu_L152.ag_GTAP_R_C_GLU_irr}
+\title{module_aglu_L152.ag_GTAP_R_C_GLU_irr}
 \usage{
-module_aglu_LB152.ag_GTAP_R_C_GLU_irr(command, ...)
+module_aglu_L152.ag_GTAP_R_C_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB161.ag_R_C_Y_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L161.ag_R_C_Y_GLU_irr.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB161.ag_R_C_Y_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L161.ag_R_C_Y_GLU_irr.Rd
index f27b56e26d..2e2b5f1f34 100644
--- a/input/gcamdata/man/module_aglu_LB161.ag_R_C_Y_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L161.ag_R_C_Y_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB161.ag_R_C_Y_GLU_irr.R
-\name{module_aglu_LB161.ag_R_C_Y_GLU_irr}
-\alias{module_aglu_LB161.ag_R_C_Y_GLU_irr}
-\title{module_aglu_LB161.ag_R_C_Y_GLU_irr}
+% Please edit documentation in R/zaglu_L161.ag_R_C_Y_GLU_irr.R
+\name{module_aglu_L161.ag_R_C_Y_GLU_irr}
+\alias{module_aglu_L161.ag_R_C_Y_GLU_irr}
+\title{module_aglu_L161.ag_R_C_Y_GLU_irr}
 \usage{
-module_aglu_LB161.ag_R_C_Y_GLU_irr(command, ...)
+module_aglu_L161.ag_R_C_Y_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr.Rd
index 42bc29718a..e06f9eb97c 100644
--- a/input/gcamdata/man/module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB162.ag_prodchange_R_C_Y_GLU_irr.R
-\name{module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr}
-\alias{module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr}
-\title{module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr}
+% Please edit documentation in R/zaglu_L162.ag_prodchange_R_C_Y_GLU_irr.R
+\name{module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr}
+\alias{module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr}
+\title{module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr}
 \usage{
-module_aglu_LB162.ag_prodchange_R_C_Y_GLU_irr(command, ...)
+module_aglu_L162.ag_prodchange_R_C_Y_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB163.bio_Yield_R_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L163.bio_Yield_R_GLU_irr.Rd
similarity index 84%
rename from input/gcamdata/man/module_aglu_LB163.bio_Yield_R_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L163.bio_Yield_R_GLU_irr.Rd
index 4dee79b442..22688aa72d 100644
--- a/input/gcamdata/man/module_aglu_LB163.bio_Yield_R_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L163.bio_Yield_R_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB163.bio_Yield_R_GLU_irr.R
-\name{module_aglu_LB163.bio_Yield_R_GLU_irr}
-\alias{module_aglu_LB163.bio_Yield_R_GLU_irr}
-\title{module_aglu_LB163.bio_Yield_R_GLU_irr}
+% Please edit documentation in R/zaglu_L163.bio_Yield_R_GLU_irr.R
+\name{module_aglu_L163.bio_Yield_R_GLU_irr}
+\alias{module_aglu_L163.bio_Yield_R_GLU_irr}
+\title{module_aglu_L163.bio_Yield_R_GLU_irr}
 \usage{
-module_aglu_LB163.bio_Yield_R_GLU_irr(command, ...)
+module_aglu_L163.bio_Yield_R_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB164.ag_Costs_USA_C_2005_irr.Rd b/input/gcamdata/man/module_aglu_L164.ag_Costs_USA_C_2005_irr.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB164.ag_Costs_USA_C_2005_irr.Rd
rename to input/gcamdata/man/module_aglu_L164.ag_Costs_USA_C_2005_irr.Rd
index 9886546306..210fb2896a 100644
--- a/input/gcamdata/man/module_aglu_LB164.ag_Costs_USA_C_2005_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L164.ag_Costs_USA_C_2005_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB164.ag_Costs_USA_C_2005_irr.R
-\name{module_aglu_LB164.ag_Costs_USA_C_2005_irr}
-\alias{module_aglu_LB164.ag_Costs_USA_C_2005_irr}
-\title{module_aglu_LB164.ag_Costs_USA_C_2005_irr}
+% Please edit documentation in R/zaglu_L164.ag_Costs_USA_C_2005_irr.R
+\name{module_aglu_L164.ag_Costs_USA_C_2005_irr}
+\alias{module_aglu_L164.ag_Costs_USA_C_2005_irr}
+\title{module_aglu_L164.ag_Costs_USA_C_2005_irr}
 \usage{
-module_aglu_LB164.ag_Costs_USA_C_2005_irr(command, ...)
+module_aglu_L164.ag_Costs_USA_C_2005_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB165.ag_water_R_C_Y_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L165.ag_water_R_C_Y_GLU_irr.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB165.ag_water_R_C_Y_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L165.ag_water_R_C_Y_GLU_irr.Rd
index 43a1b31276..685eae32c0 100644
--- a/input/gcamdata/man/module_aglu_LB165.ag_water_R_C_Y_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L165.ag_water_R_C_Y_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB165.ag_water_R_C_Y_GLU_irr.R
-\name{module_aglu_LB165.ag_water_R_C_Y_GLU_irr}
-\alias{module_aglu_LB165.ag_water_R_C_Y_GLU_irr}
-\title{module_aglu_LB165.ag_water_R_C_Y_GLU_irr}
+% Please edit documentation in R/zaglu_L165.ag_water_R_C_Y_GLU_irr.R
+\name{module_aglu_L165.ag_water_R_C_Y_GLU_irr}
+\alias{module_aglu_L165.ag_water_R_C_Y_GLU_irr}
+\title{module_aglu_L165.ag_water_R_C_Y_GLU_irr}
 \usage{
-module_aglu_LB165.ag_water_R_C_Y_GLU_irr(command, ...)
+module_aglu_L165.ag_water_R_C_Y_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr.Rd b/input/gcamdata/man/module_aglu_L171.LC_R_Cropland_Yh_GLU_irr.Rd
similarity index 78%
rename from input/gcamdata/man/module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr.Rd
rename to input/gcamdata/man/module_aglu_L171.LC_R_Cropland_Yh_GLU_irr.Rd
index 8c836e2b37..4cb962428d 100644
--- a/input/gcamdata/man/module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L171.LC_R_Cropland_Yh_GLU_irr.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB171.LC_R_Cropland_Yh_GLU_irr.R
-\name{module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr}
-\alias{module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr}
-\title{module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr}
+% Please edit documentation in R/zaglu_L171.LC_R_Cropland_Yh_GLU_irr.R
+\name{module_aglu_L171.LC_R_Cropland_Yh_GLU_irr}
+\alias{module_aglu_L171.LC_R_Cropland_Yh_GLU_irr}
+\title{module_aglu_L171.LC_R_Cropland_Yh_GLU_irr}
 \usage{
-module_aglu_LB171.LC_R_Cropland_Yh_GLU_irr(command, ...)
+module_aglu_L171.LC_R_Cropland_Yh_GLU_irr(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt.Rd
similarity index 83%
rename from input/gcamdata/man/module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt.Rd
rename to input/gcamdata/man/module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt.Rd
index 4e985445ee..389fe1e692 100644
--- a/input/gcamdata/man/module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB181.ag_R_C_Y_GLU_irr_mgmt.R
-\name{module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt}
-\alias{module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt}
-\title{module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt}
+% Please edit documentation in R/zaglu_L181.ag_R_C_Y_GLU_irr_mgmt.R
+\name{module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt}
+\alias{module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt}
+\title{module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt}
 \usage{
-module_aglu_LB181.ag_R_C_Y_GLU_irr_mgmt(command, ...)
+module_aglu_L181.ag_R_C_Y_GLU_irr_mgmt(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt.Rd
index 00913166b1..3973f987cb 100644
--- a/input/gcamdata/man/module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2012.ag_For_Past_bio_input_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2012.ag_For_Past_bio_input_irr_mgmt.R
 \name{module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt}
 \alias{module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt}
 \title{module_aglu_L2012.ag_For_Past_bio_input_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L202.an_input.Rd b/input/gcamdata/man/module_aglu_L202.an_input.Rd
index defe48517a..7a874586f0 100644
--- a/input/gcamdata/man/module_aglu_L202.an_input.Rd
+++ b/input/gcamdata/man/module_aglu_L202.an_input.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L202.an_input.R
+% Please edit documentation in R/zaglu_L202.an_input.R
 \name{module_aglu_L202.an_input}
 \alias{module_aglu_L202.an_input}
 \title{module_aglu_L202.an_input}
diff --git a/input/gcamdata/man/module_aglu_L203.ag_an_demand_input.Rd b/input/gcamdata/man/module_aglu_L203.ag_an_demand_input.Rd
index b1828a063a..947ab1ef5b 100644
--- a/input/gcamdata/man/module_aglu_L203.ag_an_demand_input.Rd
+++ b/input/gcamdata/man/module_aglu_L203.ag_an_demand_input.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L203.ag_an_demand_input.R
+% Please edit documentation in R/zaglu_L203.ag_an_demand_input.R
 \name{module_aglu_L203.ag_an_demand_input}
 \alias{module_aglu_L203.ag_an_demand_input}
 \title{module_aglu_L203.ag_an_demand_input}
diff --git a/input/gcamdata/man/module_aglu_L2042.resbio_input_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2042.resbio_input_irr_mgmt.Rd
index 68c11c704a..a7880c811f 100644
--- a/input/gcamdata/man/module_aglu_L2042.resbio_input_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2042.resbio_input_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2042.resbio_input_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2042.resbio_input_irr_mgmt.R
 \name{module_aglu_L2042.resbio_input_irr_mgmt}
 \alias{module_aglu_L2042.resbio_input_irr_mgmt}
 \title{module_aglu_L2042.resbio_input_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L2052.ag_prodchange_cost_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2052.ag_prodchange_cost_irr_mgmt.Rd
index 4e5b9f1167..3a4a496dc9 100644
--- a/input/gcamdata/man/module_aglu_L2052.ag_prodchange_cost_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2052.ag_prodchange_cost_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2052.ag_prodchange_cost_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2052.ag_prodchange_cost_irr_mgmt.R
 \name{module_aglu_L2052.ag_prodchange_cost_irr_mgmt}
 \alias{module_aglu_L2052.ag_prodchange_cost_irr_mgmt}
 \title{module_aglu_L2052.ag_prodchange_cost_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L2062.ag_Fert_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2062.ag_Fert_irr_mgmt.Rd
index d6997b3beb..c0452f0347 100644
--- a/input/gcamdata/man/module_aglu_L2062.ag_Fert_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2062.ag_Fert_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2062.ag_Fert_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2062.ag_Fert_irr_mgmt.R
 \name{module_aglu_L2062.ag_Fert_irr_mgmt}
 \alias{module_aglu_L2062.ag_Fert_irr_mgmt}
 \title{module_aglu_L2062.ag_Fert_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L2072.ag_water_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2072.ag_water_irr_mgmt.Rd
index 121284fedf..1b8dad5788 100644
--- a/input/gcamdata/man/module_aglu_L2072.ag_water_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2072.ag_water_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2072.ag_water_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2072.ag_water_irr_mgmt.R
 \name{module_aglu_L2072.ag_water_irr_mgmt}
 \alias{module_aglu_L2072.ag_water_irr_mgmt}
 \title{module_aglu_L2072.ag_water_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L221.land_input_1.Rd b/input/gcamdata/man/module_aglu_L221.land_input_1.Rd
index 44c0105da5..c6290a6d5f 100644
--- a/input/gcamdata/man/module_aglu_L221.land_input_1.Rd
+++ b/input/gcamdata/man/module_aglu_L221.land_input_1.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L221.land_input_1.R
+% Please edit documentation in R/zaglu_L221.land_input_1.R
 \name{module_aglu_L221.land_input_1}
 \alias{module_aglu_L221.land_input_1}
 \title{module_aglu_L221.land_input_1}
diff --git a/input/gcamdata/man/module_aglu_L222.land_input_2.Rd b/input/gcamdata/man/module_aglu_L222.land_input_2.Rd
index 0f6ad966de..79b66242c3 100644
--- a/input/gcamdata/man/module_aglu_L222.land_input_2.Rd
+++ b/input/gcamdata/man/module_aglu_L222.land_input_2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L222.land_input_2.R
+% Please edit documentation in R/zaglu_L222.land_input_2.R
 \name{module_aglu_L222.land_input_2}
 \alias{module_aglu_L222.land_input_2}
 \title{module_aglu_L222.land_input_2}
diff --git a/input/gcamdata/man/module_aglu_L2231.land_input_3_irr.Rd b/input/gcamdata/man/module_aglu_L2231.land_input_3_irr.Rd
index 8cc77c4c44..f22ad1739e 100644
--- a/input/gcamdata/man/module_aglu_L2231.land_input_3_irr.Rd
+++ b/input/gcamdata/man/module_aglu_L2231.land_input_3_irr.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2231.land_input_3_irr.R
+% Please edit documentation in R/zaglu_L2231.land_input_3_irr.R
 \name{module_aglu_L2231.land_input_3_irr}
 \alias{module_aglu_L2231.land_input_3_irr}
 \title{module_aglu_L2231.land_input_3_irr}
diff --git a/input/gcamdata/man/module_aglu_L2242.land_input_4_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2242.land_input_4_irr_mgmt.Rd
index 0f870d0413..1a7cd970e2 100644
--- a/input/gcamdata/man/module_aglu_L2242.land_input_4_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2242.land_input_4_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2242.land_input_4_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2242.land_input_4_irr_mgmt.R
 \name{module_aglu_L2242.land_input_4_irr_mgmt}
 \alias{module_aglu_L2242.land_input_4_irr_mgmt}
 \title{module_aglu_L2242.land_input_4_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L2252.land_input_5_irr_mgmt.Rd b/input/gcamdata/man/module_aglu_L2252.land_input_5_irr_mgmt.Rd
index 0423ba276a..9755c76795 100644
--- a/input/gcamdata/man/module_aglu_L2252.land_input_5_irr_mgmt.Rd
+++ b/input/gcamdata/man/module_aglu_L2252.land_input_5_irr_mgmt.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2252.land_input_5_irr_mgmt.R
+% Please edit documentation in R/zaglu_L2252.land_input_5_irr_mgmt.R
 \name{module_aglu_L2252.land_input_5_irr_mgmt}
 \alias{module_aglu_L2252.land_input_5_irr_mgmt}
 \title{module_aglu_L2252.land_input_5_irr_mgmt}
diff --git a/input/gcamdata/man/module_aglu_L240.ag_trade.Rd b/input/gcamdata/man/module_aglu_L240.ag_trade.Rd
index e261f717d0..245d95e1ec 100644
--- a/input/gcamdata/man/module_aglu_L240.ag_trade.Rd
+++ b/input/gcamdata/man/module_aglu_L240.ag_trade.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L240.ag_trade.R
+% Please edit documentation in R/zaglu_L240.ag_trade.R
 \name{module_aglu_L240.ag_trade}
 \alias{module_aglu_L240.ag_trade}
 \title{module_aglu_L240.ag_trade}
diff --git a/input/gcamdata/man/module_aglu_L242.ssp34_pasture.Rd b/input/gcamdata/man/module_aglu_L242.ssp34_pasture.Rd
index 1768d5d784..f2529f47b0 100644
--- a/input/gcamdata/man/module_aglu_L242.ssp34_pasture.Rd
+++ b/input/gcamdata/man/module_aglu_L242.ssp34_pasture.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L242.ssp34_pasture.R
+% Please edit documentation in R/zaglu_L242.ssp34_pasture.R
 \name{module_aglu_L242.ssp34_pasture}
 \alias{module_aglu_L242.ssp34_pasture}
 \title{module_aglu_L242.ssp34_pasture}
diff --git a/input/gcamdata/man/module_aglu_L243.bio_trade_input.Rd b/input/gcamdata/man/module_aglu_L243.bio_trade_input.Rd
index 91eb99565b..39c5ca1f14 100644
--- a/input/gcamdata/man/module_aglu_L243.bio_trade_input.Rd
+++ b/input/gcamdata/man/module_aglu_L243.bio_trade_input.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L243.bio_trade_input.R
+% Please edit documentation in R/zaglu_L243.bio_trade_input.R
 \name{module_aglu_L243.bio_trade_input}
 \alias{module_aglu_L243.bio_trade_input}
 \title{module_aglu_L243.bio_trade_input}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_Fert_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_Fert_IRR_MGMT_xml.Rd
index be6d20ed54..dc4487a8c6 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_Fert_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_Fert_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_Fert_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_Fert_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_Fert_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_Fert_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_Fert_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml.Rd
index d8a556d94a..8428d172d5 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml.Rd
@@ -1,6 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in
-%   R/zchunk_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_For_Past_bio_base_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_an_demand_input_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_an_demand_input_xml.Rd
index 70c68ff342..48064c0d52 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_an_demand_input_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_an_demand_input_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_an_demand_input_xml.R
+% Please edit documentation in R/zaglu_batch_ag_an_demand_input_xml.R
 \name{module_aglu_batch_ag_an_demand_input_xml}
 \alias{module_aglu_batch_ag_an_demand_input_xml}
 \title{module_aglu_batch_ag_an_demand_input_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_cost_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_cost_IRR_MGMT_xml.Rd
index 35c3b7d0c9..7a6dd884cd 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_cost_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_cost_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_cost_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_cost_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_cost_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_cost_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_cost_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml.Rd
index aaf4b4ab2f..2420058ae9 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ref_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ref_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ref_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml.Rd
index 9499379d2b..180647ef5d 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ssp1_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml.Rd
index 23b4997c79..87a7e8324a 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ssp2_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml.Rd
index 80e7c2c6ec..88bc802b8c 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ssp3_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml.Rd
index 7c580ce453..8d72f62aa0 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ssp4_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml.Rd
index 5411a8a592..b032aca0d2 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_prodchange_ssp5_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_trade_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_trade_xml.Rd
index 50765eb631..67406a4fa5 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_trade_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_trade_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_trade_xml.R
+% Please edit documentation in R/zaglu_batch_ag_trade_xml.R
 \name{module_aglu_batch_ag_trade_xml}
 \alias{module_aglu_batch_ag_trade_xml}
 \title{module_aglu_batch_ag_trade_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ag_water_input_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_ag_water_input_IRR_MGMT_xml.Rd
index 829cccf95d..7101ffaee0 100644
--- a/input/gcamdata/man/module_aglu_batch_ag_water_input_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ag_water_input_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ag_water_input_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_ag_water_input_IRR_MGMT_xml.R
 \name{module_aglu_batch_ag_water_input_IRR_MGMT_xml}
 \alias{module_aglu_batch_ag_water_input_IRR_MGMT_xml}
 \title{module_aglu_batch_ag_water_input_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_an_input_xml.Rd b/input/gcamdata/man/module_aglu_batch_an_input_xml.Rd
index 22f18090b8..25998f3b32 100644
--- a/input/gcamdata/man/module_aglu_batch_an_input_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_an_input_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_an_input_xml.R
+% Please edit documentation in R/zaglu_batch_an_input_xml.R
 \name{module_aglu_batch_an_input_xml}
 \alias{module_aglu_batch_an_input_xml}
 \title{module_aglu_batch_an_input_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_bio_trade_xml.Rd b/input/gcamdata/man/module_aglu_batch_bio_trade_xml.Rd
index b1b0e5f785..208820feaf 100644
--- a/input/gcamdata/man/module_aglu_batch_bio_trade_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_bio_trade_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_bio_trade_xml.R
+% Please edit documentation in R/zaglu_batch_bio_trade_xml.R
 \name{module_aglu_batch_bio_trade_xml}
 \alias{module_aglu_batch_bio_trade_xml}
 \title{module_aglu_batch_bio_trade_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_food_SSP1_xml.Rd b/input/gcamdata/man/module_aglu_batch_food_SSP1_xml.Rd
index 4833774511..1665acc697 100644
--- a/input/gcamdata/man/module_aglu_batch_food_SSP1_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_food_SSP1_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_food_SSP1_xml.R
+% Please edit documentation in R/zaglu_batch_food_SSP1_xml.R
 \name{module_aglu_batch_food_SSP1_xml}
 \alias{module_aglu_batch_food_SSP1_xml}
 \title{module_aglu_batch_food_SSP1_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_land_input_1_xml.Rd b/input/gcamdata/man/module_aglu_batch_land_input_1_xml.Rd
index ab64f6cb8f..1c42723a35 100644
--- a/input/gcamdata/man/module_aglu_batch_land_input_1_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_land_input_1_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_land_input_1_xml.R
+% Please edit documentation in R/zaglu_batch_land_input_1_xml.R
 \name{module_aglu_batch_land_input_1_xml}
 \alias{module_aglu_batch_land_input_1_xml}
 \title{module_aglu_batch_land_input_1_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_land_input_2_xml.Rd b/input/gcamdata/man/module_aglu_batch_land_input_2_xml.Rd
index 2430b075c7..3f74ca5395 100644
--- a/input/gcamdata/man/module_aglu_batch_land_input_2_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_land_input_2_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_land_input_2_xml.R
+% Please edit documentation in R/zaglu_batch_land_input_2_xml.R
 \name{module_aglu_batch_land_input_2_xml}
 \alias{module_aglu_batch_land_input_2_xml}
 \title{module_aglu_batch_land_input_2_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_land_input_3_IRR_xml.Rd b/input/gcamdata/man/module_aglu_batch_land_input_3_IRR_xml.Rd
index f73b51d393..0259c9b6a5 100644
--- a/input/gcamdata/man/module_aglu_batch_land_input_3_IRR_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_land_input_3_IRR_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_land_input_3_IRR_xml.R
+% Please edit documentation in R/zaglu_batch_land_input_3_IRR_xml.R
 \name{module_aglu_batch_land_input_3_IRR_xml}
 \alias{module_aglu_batch_land_input_3_IRR_xml}
 \title{module_aglu_batch_land_input_3_IRR_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_land_input_4_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_land_input_4_IRR_MGMT_xml.Rd
index 89e29cf270..4c40dfbf98 100644
--- a/input/gcamdata/man/module_aglu_batch_land_input_4_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_land_input_4_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_land_input_4_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_land_input_4_IRR_MGMT_xml.R
 \name{module_aglu_batch_land_input_4_IRR_MGMT_xml}
 \alias{module_aglu_batch_land_input_4_IRR_MGMT_xml}
 \title{module_aglu_batch_land_input_4_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_land_input_5_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_land_input_5_IRR_MGMT_xml.Rd
index a356ea47aa..fbe4d57a21 100644
--- a/input/gcamdata/man/module_aglu_batch_land_input_5_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_land_input_5_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_land_input_5_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_land_input_5_IRR_MGMT_xml.R
 \name{module_aglu_batch_land_input_5_IRR_MGMT_xml}
 \alias{module_aglu_batch_land_input_5_IRR_MGMT_xml}
 \title{module_aglu_batch_land_input_5_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_pasture_ssp34_xml.Rd b/input/gcamdata/man/module_aglu_batch_pasture_ssp34_xml.Rd
index cc8cb962bd..bd2b098c76 100644
--- a/input/gcamdata/man/module_aglu_batch_pasture_ssp34_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_pasture_ssp34_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_pasture_ssp34_xml.R
+% Please edit documentation in R/zaglu_batch_pasture_ssp34_xml.R
 \name{module_aglu_batch_pasture_ssp34_xml}
 \alias{module_aglu_batch_pasture_ssp34_xml}
 \title{module_aglu_batch_pasture_ssp34_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_protected_land_input_2_xml.Rd b/input/gcamdata/man/module_aglu_batch_protected_land_input_2_xml.Rd
index 828a8eb985..688e16ff49 100644
--- a/input/gcamdata/man/module_aglu_batch_protected_land_input_2_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_protected_land_input_2_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_protected_land_input_2_xml.R
+% Please edit documentation in R/zaglu_batch_protected_land_input_2_xml.R
 \name{module_aglu_batch_protected_land_input_2_xml}
 \alias{module_aglu_batch_protected_land_input_2_xml}
 \title{module_aglu_batch_protected_land_input_2_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_protected_land_input_3_xml.Rd b/input/gcamdata/man/module_aglu_batch_protected_land_input_3_xml.Rd
index cb24c52171..512cccd22f 100644
--- a/input/gcamdata/man/module_aglu_batch_protected_land_input_3_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_protected_land_input_3_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_protected_land_input_3_xml.R
+% Please edit documentation in R/zaglu_batch_protected_land_input_3_xml.R
 \name{module_aglu_batch_protected_land_input_3_xml}
 \alias{module_aglu_batch_protected_land_input_3_xml}
 \title{module_aglu_batch_protected_land_input_3_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_resbio_input_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_aglu_batch_resbio_input_IRR_MGMT_xml.Rd
index e25a57a2b1..cc3eddf2a4 100644
--- a/input/gcamdata/man/module_aglu_batch_resbio_input_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_resbio_input_IRR_MGMT_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_resbio_input_IRR_MGMT_xml.R
+% Please edit documentation in R/zaglu_batch_resbio_input_IRR_MGMT_xml.R
 \name{module_aglu_batch_resbio_input_IRR_MGMT_xml}
 \alias{module_aglu_batch_resbio_input_IRR_MGMT_xml}
 \title{module_aglu_batch_resbio_input_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ssp3_bio_trade_xml.Rd b/input/gcamdata/man/module_aglu_batch_ssp3_bio_trade_xml.Rd
index 01e76c8c16..669d5ae391 100644
--- a/input/gcamdata/man/module_aglu_batch_ssp3_bio_trade_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ssp3_bio_trade_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ssp3_bio_trade_xml.R
+% Please edit documentation in R/zaglu_batch_ssp3_bio_trade_xml.R
 \name{module_aglu_batch_ssp3_bio_trade_xml}
 \alias{module_aglu_batch_ssp3_bio_trade_xml}
 \title{module_aglu_batch_ssp3_bio_trade_xml}
diff --git a/input/gcamdata/man/module_aglu_batch_ssp4_ag_bio_trade_xml.Rd b/input/gcamdata/man/module_aglu_batch_ssp4_ag_bio_trade_xml.Rd
index 3ba93c1383..6b0da6fe17 100644
--- a/input/gcamdata/man/module_aglu_batch_ssp4_ag_bio_trade_xml.Rd
+++ b/input/gcamdata/man/module_aglu_batch_ssp4_ag_bio_trade_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ssp4_ag_bio_trade_xml.R
+% Please edit documentation in R/zaglu_batch_ssp4_ag_bio_trade_xml.R
 \name{module_aglu_batch_ssp4_ag_bio_trade_xml}
 \alias{module_aglu_batch_ssp4_ag_bio_trade_xml}
 \title{module_aglu_batch_ssp4_bio_trade_xml}
diff --git a/input/gcamdata/man/module_data_FAO_BilateralTrade.Rd b/input/gcamdata/man/module_aglu_data_FAO_BilateralTrade.Rd
similarity index 73%
rename from input/gcamdata/man/module_data_FAO_BilateralTrade.Rd
rename to input/gcamdata/man/module_aglu_data_FAO_BilateralTrade.Rd
index 257f3beeb3..45d4bf1de5 100644
--- a/input/gcamdata/man/module_data_FAO_BilateralTrade.Rd
+++ b/input/gcamdata/man/module_aglu_data_FAO_BilateralTrade.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1091.ag_GrossTrade.R
-\name{module_data_FAO_BilateralTrade}
-\alias{module_data_FAO_BilateralTrade}
-\title{module_data_FAO_BilateralTrade}
+% Please edit documentation in R/zaglu_L1091.ag_GrossTrade.R
+\name{module_aglu_data_FAO_BilateralTrade}
+\alias{module_aglu_data_FAO_BilateralTrade}
+\title{module_aglu_data_FAO_BilateralTrade}
 \usage{
-module_data_FAO_BilateralTrade(command, ...)
+module_aglu_data_FAO_BilateralTrade(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_batch_no_climate_model_xml.Rd b/input/gcamdata/man/module_climate_batch_no_climate_model_xml.Rd
similarity index 62%
rename from input/gcamdata/man/module_batch_no_climate_model_xml.Rd
rename to input/gcamdata/man/module_climate_batch_no_climate_model_xml.Rd
index 7d65b02eb9..8435b1ba52 100644
--- a/input/gcamdata/man/module_batch_no_climate_model_xml.Rd
+++ b/input/gcamdata/man/module_climate_batch_no_climate_model_xml.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_no_climate_model_xml.R
-\name{module_batch_no_climate_model_xml}
-\alias{module_batch_no_climate_model_xml}
-\title{module_batch_no_climate_model_xml}
+% Please edit documentation in R/zclimate_batch_no_climate_model_xml.R
+\name{module_climate_batch_no_climate_model_xml}
+\alias{module_climate_batch_no_climate_model_xml}
+\title{module_climate_batch_no_climate_model_xml}
 \usage{
-module_batch_no_climate_model_xml(command, ...)
+module_climate_batch_no_climate_model_xml(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_climate_xml_batch_hector_xml.Rd b/input/gcamdata/man/module_climate_xml_batch_hector_xml.Rd
index b04ec9e81a..cf7b55a6a2 100644
--- a/input/gcamdata/man/module_climate_xml_batch_hector_xml.Rd
+++ b/input/gcamdata/man/module_climate_xml_batch_hector_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_hector_xml.R
+% Please edit documentation in R/zclimate_batch_hector_xml.R
 \name{module_climate_xml_batch_hector_xml}
 \alias{module_climate_xml_batch_hector_xml}
 \title{module_climate_xml_batch_hector_xml}
diff --git a/input/gcamdata/man/module_climate_xml_batch_magicc_xml.Rd b/input/gcamdata/man/module_climate_xml_batch_magicc_xml.Rd
index 4bab9ba5fd..71a34dd147 100644
--- a/input/gcamdata/man/module_climate_xml_batch_magicc_xml.Rd
+++ b/input/gcamdata/man/module_climate_xml_batch_magicc_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_magicc_xml.R
+% Please edit documentation in R/zclimate_batch_magicc_xml.R
 \name{module_climate_xml_batch_magicc_xml}
 \alias{module_climate_xml_batch_magicc_xml}
 \title{module_climate_xml_batch_magicc_xml}
diff --git a/input/gcamdata/man/module_emissions_L101.nonghg_en_USA_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L101.nonghg_en_USA_S_T_Y.Rd
index 946417d1df..0f4888ebb3 100644
--- a/input/gcamdata/man/module_emissions_L101.nonghg_en_USA_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L101.nonghg_en_USA_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L101.nonghg_en_USA_S_T_Y.R
+% Please edit documentation in R/zemissions_L101.nonghg_en_USA_S_T_Y.R
 \name{module_emissions_L101.nonghg_en_USA_S_T_Y}
 \alias{module_emissions_L101.nonghg_en_USA_S_T_Y}
 \title{module_emissions_L101.nonghg_en_USA_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L102.ghg_en_USA_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L102.ghg_en_USA_S_T_Y.Rd
index e90dfc73d4..e5646b36a3 100644
--- a/input/gcamdata/man/module_emissions_L102.ghg_en_USA_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L102.ghg_en_USA_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L102.ghg_en_USA_S_T_Y.R
+% Please edit documentation in R/zemissions_L102.ghg_en_USA_S_T_Y.R
 \name{module_emissions_L102.ghg_en_USA_S_T_Y}
 \alias{module_emissions_L102.ghg_en_USA_S_T_Y}
 \title{module_emissions_L102.ghg_en_USA_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L102.nonco2_ceds_R_S_Y.Rd b/input/gcamdata/man/module_emissions_L102.nonco2_ceds_R_S_Y.Rd
index 5455db901d..690ba28056 100644
--- a/input/gcamdata/man/module_emissions_L102.nonco2_ceds_R_S_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L102.nonco2_ceds_R_S_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L102.nonco2_ceds_R_S_Y.R
+% Please edit documentation in R/zemissions_L102.nonco2_ceds_R_S_Y.R
 \name{module_emissions_L102.nonco2_ceds_R_S_Y}
 \alias{module_emissions_L102.nonco2_ceds_R_S_Y}
 \title{module_emissions_L102.nonco2_ceds_R_S_Y}
diff --git a/input/gcamdata/man/module_emissions_L103.ghg_an_USA_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L103.ghg_an_USA_S_T_Y.Rd
index e9f4c288be..cd9a363cc0 100644
--- a/input/gcamdata/man/module_emissions_L103.ghg_an_USA_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L103.ghg_an_USA_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L103.ghg_an_USA_S_T_Y.R
+% Please edit documentation in R/zemissions_L103.ghg_an_USA_S_T_Y.R
 \name{module_emissions_L103.ghg_an_USA_S_T_Y}
 \alias{module_emissions_L103.ghg_an_USA_S_T_Y}
 \title{module_emissions_L103.ghg_an_USA_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L104.bcoc_en_USA_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L104.bcoc_en_USA_S_T_Y.Rd
index 3af36c0c79..c78d9babfd 100644
--- a/input/gcamdata/man/module_emissions_L104.bcoc_en_USA_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L104.bcoc_en_USA_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L104.bcoc_en_USA_S_T_Y.R
+% Please edit documentation in R/zemissions_L104.bcoc_en_USA_S_T_Y.R
 \name{module_emissions_L104.bcoc_en_USA_S_T_Y}
 \alias{module_emissions_L104.bcoc_en_USA_S_T_Y}
 \title{module_emissions_L104.bcoc_en_USA_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L105.nh3_an_USA_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L105.nh3_an_USA_S_T_Y.Rd
index cd4686dcf4..c1221f6e5c 100644
--- a/input/gcamdata/man/module_emissions_L105.nh3_an_USA_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L105.nh3_an_USA_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L105.nh3_an_USA_S_T_Y.R
+% Please edit documentation in R/zemissions_L105.nh3_an_USA_S_T_Y.R
 \name{module_emissions_L105.nh3_an_USA_S_T_Y}
 \alias{module_emissions_L105.nh3_an_USA_S_T_Y}
 \title{module_emissions_L105.nh3_an_USA_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L112.ceds_ghg_en_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L112.ceds_ghg_en_R_S_T_Y.Rd
index cce346908c..4832b41b8d 100644
--- a/input/gcamdata/man/module_emissions_L112.ceds_ghg_en_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L112.ceds_ghg_en_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L112.ceds_ghg_en_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L112.ceds_ghg_en_R_S_T_Y.R
 \name{module_emissions_L112.ceds_ghg_en_R_S_T_Y}
 \alias{module_emissions_L112.ceds_ghg_en_R_S_T_Y}
 \title{module_emissions_L112.ceds_ghg_en_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L114.bcoc_en_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L114.bcoc_en_R_S_T_Y.Rd
index 897b5bac61..b402442b32 100644
--- a/input/gcamdata/man/module_emissions_L114.bcoc_en_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L114.bcoc_en_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L114.bcoc_en_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L114.bcoc_en_R_S_T_Y.R
 \name{module_emissions_L114.bcoc_en_R_S_T_Y}
 \alias{module_emissions_L114.bcoc_en_R_S_T_Y}
 \title{module_emissions_L114.bcoc_en_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR.Rd b/input/gcamdata/man/module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR.Rd
index 1a9fc45b43..61be92c1ef 100644
--- a/input/gcamdata/man/module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR.Rd
+++ b/input/gcamdata/man/module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L1211.nonco2_awb_R_S_T_Y_IRR.R
+% Please edit documentation in R/zemissions_L1211.nonco2_awb_R_S_T_Y_IRR.R
 \name{module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR}
 \alias{module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR}
 \title{module_emissions_L1211.nonco2_awb_R_S_T_Y_IRR}
diff --git a/input/gcamdata/man/module_emissions_L1221.ghg_agr_R_S_T_Y_IRR.Rd b/input/gcamdata/man/module_emissions_L1221.ghg_agr_R_S_T_Y_IRR.Rd
index 896e8414cb..aa086c8b6b 100644
--- a/input/gcamdata/man/module_emissions_L1221.ghg_agr_R_S_T_Y_IRR.Rd
+++ b/input/gcamdata/man/module_emissions_L1221.ghg_agr_R_S_T_Y_IRR.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L1221.ghg_agr_R_S_T_Y_IRR.R
+% Please edit documentation in R/zemissions_L1221.ghg_agr_R_S_T_Y_IRR.R
 \name{module_emissions_L1221.ghg_agr_R_S_T_Y_IRR}
 \alias{module_emissions_L1221.ghg_agr_R_S_T_Y_IRR}
 \title{module_emissions_L1221.ghg_agr_R_S_T_Y_IRR}
diff --git a/input/gcamdata/man/module_emissions_L123.bcoc_awb_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L123.bcoc_awb_R_S_T_Y.Rd
index 5b1423d3b0..e9f28ab848 100644
--- a/input/gcamdata/man/module_emissions_L123.bcoc_awb_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L123.bcoc_awb_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L123.bcoc_awb_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L123.bcoc_awb_R_S_T_Y.R
 \name{module_emissions_L123.bcoc_awb_R_S_T_Y}
 \alias{module_emissions_L123.bcoc_awb_R_S_T_Y}
 \title{module_emissions_L123.bcoc_awb_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L141.hfc_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L141.hfc_R_S_T_Y.Rd
index d2bf899d5f..2edebed353 100644
--- a/input/gcamdata/man/module_emissions_L141.hfc_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L141.hfc_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L141.hfc_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L141.hfc_R_S_T_Y.R
 \name{module_emissions_L141.hfc_R_S_T_Y}
 \alias{module_emissions_L141.hfc_R_S_T_Y}
 \title{module_emissions_L141.hfc_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L142.pfc_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L142.pfc_R_S_T_Y.Rd
index 4b0134174a..31390e5e45 100644
--- a/input/gcamdata/man/module_emissions_L142.pfc_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L142.pfc_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L142.pfc_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L142.pfc_R_S_T_Y.R
 \name{module_emissions_L142.pfc_R_S_T_Y}
 \alias{module_emissions_L142.pfc_R_S_T_Y}
 \title{module_emissions_L142.pfc_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L151.ctrl_R_en_S_T.Rd b/input/gcamdata/man/module_emissions_L151.ctrl_R_en_S_T.Rd
index 242313c9e8..4134747eca 100644
--- a/input/gcamdata/man/module_emissions_L151.ctrl_R_en_S_T.Rd
+++ b/input/gcamdata/man/module_emissions_L151.ctrl_R_en_S_T.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L151.ctrl_R_en_S_T.R
+% Please edit documentation in R/zemissions_L151.ctrl_R_en_S_T.R
 \name{module_emissions_L151.ctrl_R_en_S_T}
 \alias{module_emissions_L151.ctrl_R_en_S_T}
 \title{module_emissions_L151.ctrl_R_en_S_T}
diff --git a/input/gcamdata/man/module_emissions_L152.MACC.Rd b/input/gcamdata/man/module_emissions_L152.MACC.Rd
index d8951b0c4b..7092c003f8 100644
--- a/input/gcamdata/man/module_emissions_L152.MACC.Rd
+++ b/input/gcamdata/man/module_emissions_L152.MACC.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L152.MACC.R
+% Please edit documentation in R/zemissions_L152.MACC.R
 \name{module_emissions_L152.MACC}
 \alias{module_emissions_L152.MACC}
 \title{module_emissions_L152.MACC}
diff --git a/input/gcamdata/man/module_emissions_L161.nonghg_en_ssp_R_S_T_Y.Rd b/input/gcamdata/man/module_emissions_L161.nonghg_en_ssp_R_S_T_Y.Rd
index 3a3d8b548c..bb1134017a 100644
--- a/input/gcamdata/man/module_emissions_L161.nonghg_en_ssp_R_S_T_Y.Rd
+++ b/input/gcamdata/man/module_emissions_L161.nonghg_en_ssp_R_S_T_Y.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L161.nonghg_en_ssp_R_S_T_Y.R
+% Please edit documentation in R/zemissions_L161.nonghg_en_ssp_R_S_T_Y.R
 \name{module_emissions_L161.nonghg_en_ssp_R_S_T_Y}
 \alias{module_emissions_L161.nonghg_en_ssp_R_S_T_Y}
 \title{module_emissions_L161.nonghg_en_ssp_R_S_T_Y}
diff --git a/input/gcamdata/man/module_emissions_L201.en_nonco2.Rd b/input/gcamdata/man/module_emissions_L201.en_nonco2.Rd
index 9a28540043..6f3c79d043 100644
--- a/input/gcamdata/man/module_emissions_L201.en_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L201.en_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L201.en_nonco2.R
+% Please edit documentation in R/zemissions_L201.en_nonco2.R
 \name{module_emissions_L201.en_nonco2}
 \alias{module_emissions_L201.en_nonco2}
 \title{module_emissions_L201.en_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L211.ag_nonco2.Rd b/input/gcamdata/man/module_emissions_L211.ag_nonco2.Rd
index 354070df1d..e9175a3404 100644
--- a/input/gcamdata/man/module_emissions_L211.ag_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L211.ag_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L211.ag_nonco2.R
+% Please edit documentation in R/zemissions_L211.ag_nonco2.R
 \name{module_emissions_L211.ag_nonco2}
 \alias{module_emissions_L211.ag_nonco2}
 \title{module_emissions_L211.ag_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L2111.ag_nonco2_IRR.Rd b/input/gcamdata/man/module_emissions_L2111.ag_nonco2_IRR.Rd
index 5c85f93202..6fcede672e 100644
--- a/input/gcamdata/man/module_emissions_L2111.ag_nonco2_IRR.Rd
+++ b/input/gcamdata/man/module_emissions_L2111.ag_nonco2_IRR.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2111.ag_nonco2_IRR.R
+% Please edit documentation in R/zemissions_L2111.ag_nonco2_IRR.R
 \name{module_emissions_L2111.ag_nonco2_IRR}
 \alias{module_emissions_L2111.ag_nonco2_IRR}
 \title{module_emissions_L2111.ag_nonco2_IRR}
diff --git a/input/gcamdata/man/module_emissions_L2112.ag_nonco2_IRR_MGMT.Rd b/input/gcamdata/man/module_emissions_L2112.ag_nonco2_IRR_MGMT.Rd
index 17d9e5fe4d..38c641397a 100644
--- a/input/gcamdata/man/module_emissions_L2112.ag_nonco2_IRR_MGMT.Rd
+++ b/input/gcamdata/man/module_emissions_L2112.ag_nonco2_IRR_MGMT.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2112.ag_nonco2_IRR_MGMT.R
+% Please edit documentation in R/zemissions_L2112.ag_nonco2_IRR_MGMT.R
 \name{module_emissions_L2112.ag_nonco2_IRR_MGMT}
 \alias{module_emissions_L2112.ag_nonco2_IRR_MGMT}
 \title{module_emissions_L2112.ag_nonco2_IRR_MGMT}
diff --git a/input/gcamdata/man/module_emissions_L212.unmgd_nonco2.Rd b/input/gcamdata/man/module_emissions_L212.unmgd_nonco2.Rd
index 00513cf18f..8fe50921c0 100644
--- a/input/gcamdata/man/module_emissions_L212.unmgd_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L212.unmgd_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L212.unmgd_nonco2.R
+% Please edit documentation in R/zemissions_L212.unmgd_nonco2.R
 \name{module_emissions_L212.unmgd_nonco2}
 \alias{module_emissions_L212.unmgd_nonco2}
 \title{module_emissions_L212.unmgd_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L231.proc_sector.Rd b/input/gcamdata/man/module_emissions_L231.proc_sector.Rd
index 7c1ebb9319..1fb083ac1b 100644
--- a/input/gcamdata/man/module_emissions_L231.proc_sector.Rd
+++ b/input/gcamdata/man/module_emissions_L231.proc_sector.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L231.proc_sector.R
+% Please edit documentation in R/zemissions_L231.proc_sector.R
 \name{module_emissions_L231.proc_sector}
 \alias{module_emissions_L231.proc_sector}
 \title{module_emissions_L231.proc_sector}
diff --git a/input/gcamdata/man/module_emissions_L232.prc_nonco2.Rd b/input/gcamdata/man/module_emissions_L232.prc_nonco2.Rd
index a392581f85..1964effa56 100644
--- a/input/gcamdata/man/module_emissions_L232.prc_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L232.prc_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L232.prc_nonco2.R
+% Please edit documentation in R/zemissions_L232.prc_nonco2.R
 \name{module_emissions_L232.prc_nonco2}
 \alias{module_emissions_L232.prc_nonco2}
 \title{module_emissions_L232.prc_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L241.en_newtech_nonco2.Rd b/input/gcamdata/man/module_emissions_L241.en_newtech_nonco2.Rd
index d2d6fdd309..7d95fd61d0 100644
--- a/input/gcamdata/man/module_emissions_L241.en_newtech_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L241.en_newtech_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L241.en_newtech_nonco2.R
+% Please edit documentation in R/zemissions_L241.en_newtech_nonco2.R
 \name{module_emissions_L241.en_newtech_nonco2}
 \alias{module_emissions_L241.en_newtech_nonco2}
 \title{module_emissions_L241.en_newtech_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L241.fgas.Rd b/input/gcamdata/man/module_emissions_L241.fgas.Rd
index 5b35f3b079..f523e08b68 100644
--- a/input/gcamdata/man/module_emissions_L241.fgas.Rd
+++ b/input/gcamdata/man/module_emissions_L241.fgas.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L241.fgas.R
+% Please edit documentation in R/zemissions_L241.fgas.R
 \name{module_emissions_L241.fgas}
 \alias{module_emissions_L241.fgas}
 \title{module_emissions_L241.fgas}
diff --git a/input/gcamdata/man/module_emissions_L251.en_ssp_nonco2.Rd b/input/gcamdata/man/module_emissions_L251.en_ssp_nonco2.Rd
index efa42e2c02..3d7f8a0050 100644
--- a/input/gcamdata/man/module_emissions_L251.en_ssp_nonco2.Rd
+++ b/input/gcamdata/man/module_emissions_L251.en_ssp_nonco2.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L251.en_ssp_nonco2.R
+% Please edit documentation in R/zemissions_L251.en_ssp_nonco2.R
 \name{module_emissions_L251.en_ssp_nonco2}
 \alias{module_emissions_L251.en_ssp_nonco2}
 \title{module_emissions_L251.en_ssp_nonco2}
diff --git a/input/gcamdata/man/module_emissions_L252.MACC.Rd b/input/gcamdata/man/module_emissions_L252.MACC.Rd
index eb1fd321cc..5f1c413bae 100644
--- a/input/gcamdata/man/module_emissions_L252.MACC.Rd
+++ b/input/gcamdata/man/module_emissions_L252.MACC.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L252.MACC.R
+% Please edit documentation in R/zemissions_L252.MACC.R
 \name{module_emissions_L252.MACC}
 \alias{module_emissions_L252.MACC}
 \title{module_emissions_L252.MACC}
diff --git a/input/gcamdata/man/module_emissions_L253.emission_controls.Rd b/input/gcamdata/man/module_emissions_L253.emission_controls.Rd
index dd74fcb33a..b7052461ac 100644
--- a/input/gcamdata/man/module_emissions_L253.emission_controls.Rd
+++ b/input/gcamdata/man/module_emissions_L253.emission_controls.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L253.emission_controls.R
+% Please edit documentation in R/zemissions_L253.emission_controls.R
 \name{module_emissions_L253.emission_controls}
 \alias{module_emissions_L253.emission_controls}
 \title{module_emissions_L253.emission_controls}
diff --git a/input/gcamdata/man/module_emissions_batch_MACC_TC_SSP_xml.Rd b/input/gcamdata/man/module_emissions_batch_MACC_TC_SSP_xml.Rd
index fa99d08c25..a01e14fabe 100644
--- a/input/gcamdata/man/module_emissions_batch_MACC_TC_SSP_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_MACC_TC_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_MACC_TC_SSP_xml.R
+% Please edit documentation in R/zemissions_batch_MACC_TC_SSP_xml.R
 \name{module_emissions_batch_MACC_TC_SSP_xml}
 \alias{module_emissions_batch_MACC_TC_SSP_xml}
 \title{module_emissions_batch_MACC_TC_SSP_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml.Rd b/input/gcamdata/man/module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml.Rd
index 51f5fc2cd4..aef677f73f 100644
--- a/input/gcamdata/man/module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml.Rd
@@ -1,5 +1,6 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_all_aglu_emissions_IRR_MGMT_xml.R
+% Please edit documentation in
+%   R/zemissions_batch_all_aglu_emissions_IRR_MGMT_xml.R
 \name{module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml}
 \alias{module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml}
 \title{module_emissions_batch_all_aglu_emissions_IRR_MGMT_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_all_energy_emissions_xml.Rd b/input/gcamdata/man/module_emissions_batch_all_energy_emissions_xml.Rd
index 4ca6e3fad9..090c5595b1 100644
--- a/input/gcamdata/man/module_emissions_batch_all_energy_emissions_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_all_energy_emissions_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_all_energy_emissions_xml.R
+% Please edit documentation in R/zemissions_batch_all_energy_emissions_xml.R
 \name{module_emissions_batch_all_energy_emissions_xml}
 \alias{module_emissions_batch_all_energy_emissions_xml}
 \title{module_emissions_batch_all_energy_emissions_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_all_fgas_emissions_xml.Rd b/input/gcamdata/man/module_emissions_batch_all_fgas_emissions_xml.Rd
index 2c9fa440df..8597d045e4 100644
--- a/input/gcamdata/man/module_emissions_batch_all_fgas_emissions_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_all_fgas_emissions_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_all_fgas_emissions_xml.R
+% Please edit documentation in R/zemissions_batch_all_fgas_emissions_xml.R
 \name{module_emissions_batch_all_fgas_emissions_xml}
 \alias{module_emissions_batch_all_fgas_emissions_xml}
 \title{module_emissions_batch_all_fgas_emissions_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_all_protected_unmgd_emissions_xml.Rd b/input/gcamdata/man/module_emissions_batch_all_protected_unmgd_emissions_xml.Rd
index e8ee1ef022..c0784ea01d 100644
--- a/input/gcamdata/man/module_emissions_batch_all_protected_unmgd_emissions_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_all_protected_unmgd_emissions_xml.Rd
@@ -1,6 +1,6 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in
-%   R/zchunk_batch_all_protected_unmgd_emissions_xml.R
+%   R/zemissions_batch_all_protected_unmgd_emissions_xml.R
 \name{module_emissions_batch_all_protected_unmgd_emissions_xml}
 \alias{module_emissions_batch_all_protected_unmgd_emissions_xml}
 \title{module_emissions_batch_all_protected_unmgd_emissions_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_all_unmgd_emissions_xml.Rd b/input/gcamdata/man/module_emissions_batch_all_unmgd_emissions_xml.Rd
index 869a64aad0..e8de8d44b7 100644
--- a/input/gcamdata/man/module_emissions_batch_all_unmgd_emissions_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_all_unmgd_emissions_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_all_unmgd_emissions_xml.R
+% Please edit documentation in R/zemissions_batch_all_unmgd_emissions_xml.R
 \name{module_emissions_batch_all_unmgd_emissions_xml}
 \alias{module_emissions_batch_all_unmgd_emissions_xml}
 \title{module_emissions_batch_all_unmgd_emissions_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_delete_gdp_control_xml.Rd b/input/gcamdata/man/module_emissions_batch_delete_gdp_control_xml.Rd
index 06f55d4c8f..91b860b2ce 100644
--- a/input/gcamdata/man/module_emissions_batch_delete_gdp_control_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_delete_gdp_control_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_delete_gdp_control_xml.R
+% Please edit documentation in R/zemissions_batch_delete_gdp_control_xml.R
 \name{module_emissions_batch_delete_gdp_control_xml}
 \alias{module_emissions_batch_delete_gdp_control_xml}
 \title{module_emissions_batch_delete_gdp_control_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_emission_controls_xml.Rd b/input/gcamdata/man/module_emissions_batch_emission_controls_xml.Rd
index 0db48709ed..d8f1411ca0 100644
--- a/input/gcamdata/man/module_emissions_batch_emission_controls_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_emission_controls_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_emission_controls_xml.R
+% Please edit documentation in R/zemissions_batch_emission_controls_xml.R
 \name{module_emissions_batch_emission_controls_xml}
 \alias{module_emissions_batch_emission_controls_xml}
 \title{module_emissions_batch_emission_controls_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_ind_urb_processing_sectors_xml.Rd b/input/gcamdata/man/module_emissions_batch_ind_urb_processing_sectors_xml.Rd
index 00f0a580ab..630dd8a067 100644
--- a/input/gcamdata/man/module_emissions_batch_ind_urb_processing_sectors_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_ind_urb_processing_sectors_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ind_urb_processing_sectors.R
+% Please edit documentation in R/zemissions_batch_ind_urb_processing_sectors.R
 \name{module_emissions_batch_ind_urb_processing_sectors_xml}
 \alias{module_emissions_batch_ind_urb_processing_sectors_xml}
 \title{module_emissions_batch_ind_urb_processing_sectors_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_ssp15_emissions_factors_xml.Rd b/input/gcamdata/man/module_emissions_batch_ssp15_emissions_factors_xml.Rd
index 880c296ed7..4eb9fc4707 100644
--- a/input/gcamdata/man/module_emissions_batch_ssp15_emissions_factors_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_ssp15_emissions_factors_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ssp15_emissions_factors_xml.R
+% Please edit documentation in R/zemissions_batch_ssp15_emissions_factors_xml.R
 \name{module_emissions_batch_ssp15_emissions_factors_xml}
 \alias{module_emissions_batch_ssp15_emissions_factors_xml}
 \title{module_emissions_batch_ssp15_emissions_factors_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_ssp2_emissions_factors_xml.Rd b/input/gcamdata/man/module_emissions_batch_ssp2_emissions_factors_xml.Rd
index 7eb4fb3ab0..758ed5c352 100644
--- a/input/gcamdata/man/module_emissions_batch_ssp2_emissions_factors_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_ssp2_emissions_factors_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ssp2_emissions_factors_xml.R
+% Please edit documentation in R/zemissions_batch_ssp2_emissions_factors_xml.R
 \name{module_emissions_batch_ssp2_emissions_factors_xml}
 \alias{module_emissions_batch_ssp2_emissions_factors_xml}
 \title{module_emissions_batch_ssp2_emissions_factors_xml}
diff --git a/input/gcamdata/man/module_emissions_batch_ssp34_emissions_factors_xml.Rd b/input/gcamdata/man/module_emissions_batch_ssp34_emissions_factors_xml.Rd
index 1de3f8dfb4..dd8676983b 100644
--- a/input/gcamdata/man/module_emissions_batch_ssp34_emissions_factors_xml.Rd
+++ b/input/gcamdata/man/module_emissions_batch_ssp34_emissions_factors_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ssp34_emissions_factors_xml.R
+% Please edit documentation in R/zemissions_batch_ssp34_emissions_factors_xml.R
 \name{module_emissions_batch_ssp34_emissions_factors_xml}
 \alias{module_emissions_batch_ssp34_emissions_factors_xml}
 \title{module_emissions_batch_ssp34_emissions_factors_xml}
diff --git a/input/gcamdata/man/module_energy_LA100.CDIAC_downscale_ctry.Rd b/input/gcamdata/man/module_energy_L100.CDIAC_downscale_ctry.Rd
similarity index 73%
rename from input/gcamdata/man/module_energy_LA100.CDIAC_downscale_ctry.Rd
rename to input/gcamdata/man/module_energy_L100.CDIAC_downscale_ctry.Rd
index be714f84c6..c32ec2f243 100644
--- a/input/gcamdata/man/module_energy_LA100.CDIAC_downscale_ctry.Rd
+++ b/input/gcamdata/man/module_energy_L100.CDIAC_downscale_ctry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.CDIAC_downscale_ctry.R
-\name{module_energy_LA100.CDIAC_downscale_ctry}
-\alias{module_energy_LA100.CDIAC_downscale_ctry}
-\title{module_energy_LA100.CDIAC_downscale_ctry}
+% Please edit documentation in R/zenergy_L100.CDIAC_downscale_ctry.R
+\name{module_energy_L100.CDIAC_downscale_ctry}
+\alias{module_energy_L100.CDIAC_downscale_ctry}
+\title{module_energy_L100.CDIAC_downscale_ctry}
 \usage{
-module_energy_LA100.CDIAC_downscale_ctry(command, ...)
+module_energy_L100.CDIAC_downscale_ctry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA100.IEA_downscale_ctry.Rd b/input/gcamdata/man/module_energy_L100.IEA_downscale_ctry.Rd
similarity index 83%
rename from input/gcamdata/man/module_energy_LA100.IEA_downscale_ctry.Rd
rename to input/gcamdata/man/module_energy_L100.IEA_downscale_ctry.Rd
index f83b29f5c7..400b6c632c 100644
--- a/input/gcamdata/man/module_energy_LA100.IEA_downscale_ctry.Rd
+++ b/input/gcamdata/man/module_energy_L100.IEA_downscale_ctry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.IEA_downscale_ctry.R
-\name{module_energy_LA100.IEA_downscale_ctry}
-\alias{module_energy_LA100.IEA_downscale_ctry}
-\title{module_energy_LA100.IEA_downscale_ctry}
+% Please edit documentation in R/zenergy_L100.IEA_downscale_ctry.R
+\name{module_energy_L100.IEA_downscale_ctry}
+\alias{module_energy_L100.IEA_downscale_ctry}
+\title{module_energy_L100.IEA_downscale_ctry}
 \usage{
-module_energy_LA100.IEA_downscale_ctry(command, ...)
+module_energy_L100.IEA_downscale_ctry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA101.en_bal_IEA.Rd b/input/gcamdata/man/module_energy_L101.en_bal_IEA.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA101.en_bal_IEA.Rd
rename to input/gcamdata/man/module_energy_L101.en_bal_IEA.Rd
index 42e12492f3..e90b7c9e8a 100644
--- a/input/gcamdata/man/module_energy_LA101.en_bal_IEA.Rd
+++ b/input/gcamdata/man/module_energy_L101.en_bal_IEA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA101.en_bal_IEA.R
-\name{module_energy_LA101.en_bal_IEA}
-\alias{module_energy_LA101.en_bal_IEA}
-\title{module_energy_LA101.en_bal_IEA}
+% Please edit documentation in R/zenergy_L101.en_bal_IEA.R
+\name{module_energy_L101.en_bal_IEA}
+\alias{module_energy_L101.en_bal_IEA}
+\title{module_energy_L101.en_bal_IEA}
 \usage{
-module_energy_LA101.en_bal_IEA(command, ...)
+module_energy_L101.en_bal_IEA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1011.en_bal_adj.Rd b/input/gcamdata/man/module_energy_L1011.en_bal_adj.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA1011.en_bal_adj.Rd
rename to input/gcamdata/man/module_energy_L1011.en_bal_adj.Rd
index f7b0e32123..1c0496e925 100644
--- a/input/gcamdata/man/module_energy_LA1011.en_bal_adj.Rd
+++ b/input/gcamdata/man/module_energy_L1011.en_bal_adj.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1011.en_bal_adj.R
-\name{module_energy_LA1011.en_bal_adj}
-\alias{module_energy_LA1011.en_bal_adj}
-\title{module_energy_LA1011.en_bal_adj}
+% Please edit documentation in R/zenergy_L1011.en_bal_adj.R
+\name{module_energy_L1011.en_bal_adj}
+\alias{module_energy_L1011.en_bal_adj}
+\title{module_energy_L1011.en_bal_adj}
 \usage{
-module_energy_LA1011.en_bal_adj(command, ...)
+module_energy_L1011.en_bal_adj(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LB1011.ff_GrossTrade.Rd b/input/gcamdata/man/module_energy_L1011.ff_GrossTrade.Rd
similarity index 77%
rename from input/gcamdata/man/module_energy_LB1011.ff_GrossTrade.Rd
rename to input/gcamdata/man/module_energy_L1011.ff_GrossTrade.Rd
index 6c5de1ff17..b658d2a3a4 100644
--- a/input/gcamdata/man/module_energy_LB1011.ff_GrossTrade.Rd
+++ b/input/gcamdata/man/module_energy_L1011.ff_GrossTrade.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
-\name{module_energy_LB1011.ff_GrossTrade}
-\alias{module_energy_LB1011.ff_GrossTrade}
-\title{module_energy_LB1011.ff_GrossTrade}
+% Please edit documentation in R/zenergy_L1011.fossilFuel_GrossTrade_EJ_R_C_Y.R
+\name{module_energy_L1011.ff_GrossTrade}
+\alias{module_energy_L1011.ff_GrossTrade}
+\title{module_energy_L1011.ff_GrossTrade}
 \usage{
-module_energy_LB1011.ff_GrossTrade(command, ...)
+module_energy_L1011.ff_GrossTrade(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1012.en_bal_EFW.Rd b/input/gcamdata/man/module_energy_L1012.en_bal_EFW.Rd
similarity index 78%
rename from input/gcamdata/man/module_energy_LA1012.en_bal_EFW.Rd
rename to input/gcamdata/man/module_energy_L1012.en_bal_EFW.Rd
index 72511fa8a1..0e841b814d 100644
--- a/input/gcamdata/man/module_energy_LA1012.en_bal_EFW.Rd
+++ b/input/gcamdata/man/module_energy_L1012.en_bal_EFW.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1012.en_bal_EFW.R
-\name{module_energy_LA1012.en_bal_EFW}
-\alias{module_energy_LA1012.en_bal_EFW}
-\title{module_energy_LA1012.en_bal_EFW}
+% Please edit documentation in R/zenergy_L1012.en_bal_EFW.R
+\name{module_energy_L1012.en_bal_EFW}
+\alias{module_energy_L1012.en_bal_EFW}
+\title{module_energy_L1012.en_bal_EFW}
 \usage{
-module_energy_LA1012.en_bal_EFW(command, ...)
+module_energy_L1012.en_bal_EFW(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA102.en_emiss_CDIAC.Rd b/input/gcamdata/man/module_energy_L102.en_emiss_CDIAC.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA102.en_emiss_CDIAC.Rd
rename to input/gcamdata/man/module_energy_L102.en_emiss_CDIAC.Rd
index 1781453b92..3f088f5298 100644
--- a/input/gcamdata/man/module_energy_LA102.en_emiss_CDIAC.Rd
+++ b/input/gcamdata/man/module_energy_L102.en_emiss_CDIAC.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA102.en_emiss_CDIAC.R
-\name{module_energy_LA102.en_emiss_CDIAC}
-\alias{module_energy_LA102.en_emiss_CDIAC}
-\title{module_energy_LA102.en_emiss_CDIAC}
+% Please edit documentation in R/zenergy_L102.en_emiss_CDIAC.R
+\name{module_energy_L102.en_emiss_CDIAC}
+\alias{module_energy_L102.en_emiss_CDIAC}
+\title{module_energy_L102.en_emiss_CDIAC}
 \usage{
-module_energy_LA102.en_emiss_CDIAC(command, ...)
+module_energy_L102.en_emiss_CDIAC(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA111.rsrc_fos_Prod.Rd b/input/gcamdata/man/module_energy_L111.rsrc_fos_Prod.Rd
similarity index 82%
rename from input/gcamdata/man/module_energy_LA111.rsrc_fos_Prod.Rd
rename to input/gcamdata/man/module_energy_L111.rsrc_fos_Prod.Rd
index 96dbbe7995..b45c129dbd 100644
--- a/input/gcamdata/man/module_energy_LA111.rsrc_fos_Prod.Rd
+++ b/input/gcamdata/man/module_energy_L111.rsrc_fos_Prod.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA111.rsrc_fos_Prod.R
-\name{module_energy_LA111.rsrc_fos_Prod}
-\alias{module_energy_LA111.rsrc_fos_Prod}
-\title{module_energy_LA111.rsrc_fos_Prod}
+% Please edit documentation in R/zenergy_L111.rsrc_fos_Prod.R
+\name{module_energy_L111.rsrc_fos_Prod}
+\alias{module_energy_L111.rsrc_fos_Prod}
+\title{module_energy_L111.rsrc_fos_Prod}
 \usage{
-module_energy_LA111.rsrc_fos_Prod(command, ...)
+module_energy_L111.rsrc_fos_Prod(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA112.U.Rd b/input/gcamdata/man/module_energy_L112.U.Rd
similarity index 77%
rename from input/gcamdata/man/module_energy_LA112.U.Rd
rename to input/gcamdata/man/module_energy_L112.U.Rd
index c410dda358..0f0f8037eb 100644
--- a/input/gcamdata/man/module_energy_LA112.U.Rd
+++ b/input/gcamdata/man/module_energy_L112.U.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA112.U.R
-\name{module_energy_LA112.U}
-\alias{module_energy_LA112.U}
-\title{module_energy_LA112.U}
+% Please edit documentation in R/zenergy_L112.U.R
+\name{module_energy_L112.U}
+\alias{module_energy_L112.U}
+\title{module_energy_L112.U}
 \usage{
-module_energy_LA112.U(command, ...)
+module_energy_L112.U(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA113.MSW.Rd b/input/gcamdata/man/module_energy_L113.MSW.Rd
similarity index 75%
rename from input/gcamdata/man/module_energy_LA113.MSW.Rd
rename to input/gcamdata/man/module_energy_L113.MSW.Rd
index 3aa964a517..9d23a2e98f 100644
--- a/input/gcamdata/man/module_energy_LA113.MSW.Rd
+++ b/input/gcamdata/man/module_energy_L113.MSW.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA113.MSW.R
-\name{module_energy_LA113.MSW}
-\alias{module_energy_LA113.MSW}
-\title{module_energy_LA113.MSW}
+% Please edit documentation in R/zenergy_L113.MSW.R
+\name{module_energy_L113.MSW}
+\alias{module_energy_L113.MSW}
+\title{module_energy_L113.MSW}
 \usage{
-module_energy_LA113.MSW(command, ...)
+module_energy_L113.MSW(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA113.atb_cost.Rd b/input/gcamdata/man/module_energy_L113.atb_cost.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA113.atb_cost.Rd
rename to input/gcamdata/man/module_energy_L113.atb_cost.Rd
index 8bc271636b..64e3eaf1c9 100644
--- a/input/gcamdata/man/module_energy_LA113.atb_cost.Rd
+++ b/input/gcamdata/man/module_energy_L113.atb_cost.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA113.atb_cost.R
-\name{module_energy_LA113.atb_cost}
-\alias{module_energy_LA113.atb_cost}
-\title{module_energy_LA113.atb_cost}
+% Please edit documentation in R/zenergy_L113.atb_cost.R
+\name{module_energy_L113.atb_cost}
+\alias{module_energy_L113.atb_cost}
+\title{module_energy_L113.atb_cost}
 \usage{
-module_energy_LA113.atb_cost(command, ...)
+module_energy_L113.atb_cost(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA114.wind.Rd b/input/gcamdata/man/module_energy_L114.wind.Rd
similarity index 85%
rename from input/gcamdata/man/module_energy_LA114.wind.Rd
rename to input/gcamdata/man/module_energy_L114.wind.Rd
index 8a414f7bb7..c44d2b3a8e 100644
--- a/input/gcamdata/man/module_energy_LA114.wind.Rd
+++ b/input/gcamdata/man/module_energy_L114.wind.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA114.wind-energy.R
-\name{module_energy_LA114.wind}
-\alias{module_energy_LA114.wind}
-\title{module_energy_LA114.wind}
+% Please edit documentation in R/zenergy_L114.wind-energy.R
+\name{module_energy_L114.wind}
+\alias{module_energy_L114.wind}
+\title{module_energy_L114.wind}
 \usage{
-module_energy_LA114.wind(command, ...)
+module_energy_L114.wind(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA115.roofPV.Rd b/input/gcamdata/man/module_energy_L115.roofPV.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA115.roofPV.Rd
rename to input/gcamdata/man/module_energy_L115.roofPV.Rd
index 436486dab0..77abf63855 100644
--- a/input/gcamdata/man/module_energy_LA115.roofPV.Rd
+++ b/input/gcamdata/man/module_energy_L115.roofPV.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA115.roofPV.R
-\name{module_energy_LA115.roofPV}
-\alias{module_energy_LA115.roofPV}
-\title{module_energy_LA115.roofPV}
+% Please edit documentation in R/zenergy_L115.roofPV.R
+\name{module_energy_L115.roofPV}
+\alias{module_energy_L115.roofPV}
+\title{module_energy_L115.roofPV}
 \usage{
-module_energy_LA115.roofPV(command, ...)
+module_energy_L115.roofPV(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA116.geo.Rd b/input/gcamdata/man/module_energy_L116.geo.Rd
similarity index 86%
rename from input/gcamdata/man/module_energy_LA116.geo.Rd
rename to input/gcamdata/man/module_energy_L116.geo.Rd
index e90e938947..5909ac3184 100644
--- a/input/gcamdata/man/module_energy_LA116.geo.Rd
+++ b/input/gcamdata/man/module_energy_L116.geo.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA116.geo.R
-\name{module_energy_LA116.geo}
-\alias{module_energy_LA116.geo}
-\title{module_energy_LA116.geo}
+% Please edit documentation in R/zenergy_L116.geo.R
+\name{module_energy_L116.geo}
+\alias{module_energy_L116.geo}
+\title{module_energy_L116.geo}
 \usage{
-module_energy_LA116.geo(command, ...)
+module_energy_L116.geo(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA117.tradbio.Rd b/input/gcamdata/man/module_energy_L117.tradbio.Rd
similarity index 78%
rename from input/gcamdata/man/module_energy_LA117.tradbio.Rd
rename to input/gcamdata/man/module_energy_L117.tradbio.Rd
index 865b1b0403..ed974288dc 100644
--- a/input/gcamdata/man/module_energy_LA117.tradbio.Rd
+++ b/input/gcamdata/man/module_energy_L117.tradbio.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA117.tradbio.R
-\name{module_energy_LA117.tradbio}
-\alias{module_energy_LA117.tradbio}
-\title{module_energy_LA117.tradbio}
+% Please edit documentation in R/zenergy_L117.tradbio.R
+\name{module_energy_L117.tradbio}
+\alias{module_energy_L117.tradbio}
+\title{module_energy_L117.tradbio}
 \usage{
-module_energy_LA117.tradbio(command, ...)
+module_energy_L117.tradbio(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA118.hydro.Rd b/input/gcamdata/man/module_energy_L118.hydro.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA118.hydro.Rd
rename to input/gcamdata/man/module_energy_L118.hydro.Rd
index c0eccbc090..0a6c319ad3 100644
--- a/input/gcamdata/man/module_energy_LA118.hydro.Rd
+++ b/input/gcamdata/man/module_energy_L118.hydro.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA118.hydro.R
-\name{module_energy_LA118.hydro}
-\alias{module_energy_LA118.hydro}
-\title{module_energy_LA118.hydro}
+% Please edit documentation in R/zenergy_L118.hydro.R
+\name{module_energy_L118.hydro}
+\alias{module_energy_L118.hydro}
+\title{module_energy_L118.hydro}
 \usage{
-module_energy_LA118.hydro(command, ...)
+module_energy_L118.hydro(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA119.solar.Rd b/input/gcamdata/man/module_energy_L119.solar.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA119.solar.Rd
rename to input/gcamdata/man/module_energy_L119.solar.Rd
index 809b6c8cf3..be3d7bc6ba 100644
--- a/input/gcamdata/man/module_energy_LA119.solar.Rd
+++ b/input/gcamdata/man/module_energy_L119.solar.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA119.solar.R
-\name{module_energy_LA119.solar}
-\alias{module_energy_LA119.solar}
-\title{module_energy_LA119.solar}
+% Please edit documentation in R/zenergy_L119.solar.R
+\name{module_energy_L119.solar}
+\alias{module_energy_L119.solar}
+\title{module_energy_L119.solar}
 \usage{
-module_energy_LA119.solar(command, ...)
+module_energy_L119.solar(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA120.offshore_wind.Rd b/input/gcamdata/man/module_energy_L120.offshore_wind.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA120.offshore_wind.Rd
rename to input/gcamdata/man/module_energy_L120.offshore_wind.Rd
index 64281f43c4..fc0c5f56ed 100644
--- a/input/gcamdata/man/module_energy_LA120.offshore_wind.Rd
+++ b/input/gcamdata/man/module_energy_L120.offshore_wind.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA120.offshore_wind.R
-\name{module_energy_LA120.offshore_wind}
-\alias{module_energy_LA120.offshore_wind}
-\title{module_energy_LA120.offshore_wind}
+% Please edit documentation in R/zenergy_L120.offshore_wind.R
+\name{module_energy_L120.offshore_wind}
+\alias{module_energy_L120.offshore_wind}
+\title{module_energy_L120.offshore_wind}
 \usage{
-module_energy_LA120.offshore_wind(command, ...)
+module_energy_L120.offshore_wind(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA121.liquids.Rd b/input/gcamdata/man/module_energy_L121.liquids.Rd
similarity index 85%
rename from input/gcamdata/man/module_energy_LA121.liquids.Rd
rename to input/gcamdata/man/module_energy_L121.liquids.Rd
index f98f7897e2..633570b129 100644
--- a/input/gcamdata/man/module_energy_LA121.liquids.Rd
+++ b/input/gcamdata/man/module_energy_L121.liquids.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA121.liquids.R
-\name{module_energy_LA121.liquids}
-\alias{module_energy_LA121.liquids}
-\title{module_energy_LA121.liquids}
+% Please edit documentation in R/zenergy_L121.liquids.R
+\name{module_energy_L121.liquids}
+\alias{module_energy_L121.liquids}
+\title{module_energy_L121.liquids}
 \usage{
-module_energy_LA121.liquids(command, ...)
+module_energy_L121.liquids(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA122.gasproc_refining.Rd b/input/gcamdata/man/module_energy_L122.gasproc_refining.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA122.gasproc_refining.Rd
rename to input/gcamdata/man/module_energy_L122.gasproc_refining.Rd
index 014f881c27..46b6e79061 100644
--- a/input/gcamdata/man/module_energy_LA122.gasproc_refining.Rd
+++ b/input/gcamdata/man/module_energy_L122.gasproc_refining.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA122.gasproc_refining.R
-\name{module_energy_LA122.gasproc_refining}
-\alias{module_energy_LA122.gasproc_refining}
-\title{module_energy_LA122.gasproc_refining}
+% Please edit documentation in R/zenergy_L122.gasproc_refining.R
+\name{module_energy_L122.gasproc_refining}
+\alias{module_energy_L122.gasproc_refining}
+\title{module_energy_L122.gasproc_refining}
 \usage{
-module_energy_LA122.gasproc_refining(command, ...)
+module_energy_L122.gasproc_refining(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA123.electricity.Rd b/input/gcamdata/man/module_energy_L123.electricity.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA123.electricity.Rd
rename to input/gcamdata/man/module_energy_L123.electricity.Rd
index cc7b309faf..d531a3aa6b 100644
--- a/input/gcamdata/man/module_energy_LA123.electricity.Rd
+++ b/input/gcamdata/man/module_energy_L123.electricity.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA123.electricity.R
-\name{module_energy_LA123.electricity}
-\alias{module_energy_LA123.electricity}
-\title{module_energy_LA123.electricity}
+% Please edit documentation in R/zenergy_L123.electricity.R
+\name{module_energy_L123.electricity}
+\alias{module_energy_L123.electricity}
+\title{module_energy_L123.electricity}
 \usage{
-module_energy_LA123.electricity(command, ...)
+module_energy_L123.electricity(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1231.elec_tech.Rd b/input/gcamdata/man/module_energy_L1231.elec_tech.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA1231.elec_tech.Rd
rename to input/gcamdata/man/module_energy_L1231.elec_tech.Rd
index 7e0c826ab9..9bc15e3a51 100644
--- a/input/gcamdata/man/module_energy_LA1231.elec_tech.Rd
+++ b/input/gcamdata/man/module_energy_L1231.elec_tech.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1231.elec_tech.R
-\name{module_energy_LA1231.elec_tech}
-\alias{module_energy_LA1231.elec_tech}
-\title{module_energy_LA1231.elec_tech}
+% Please edit documentation in R/zenergy_L1231.elec_tech.R
+\name{module_energy_L1231.elec_tech}
+\alias{module_energy_L1231.elec_tech}
+\title{module_energy_L1231.elec_tech}
 \usage{
-module_energy_LA1231.elec_tech(command, ...)
+module_energy_L1231.elec_tech(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1232.desal_from_elec.Rd b/input/gcamdata/man/module_energy_L1232.desal_from_elec.Rd
similarity index 75%
rename from input/gcamdata/man/module_energy_LA1232.desal_from_elec.Rd
rename to input/gcamdata/man/module_energy_L1232.desal_from_elec.Rd
index 67dcb8d192..7e67c20760 100644
--- a/input/gcamdata/man/module_energy_LA1232.desal_from_elec.Rd
+++ b/input/gcamdata/man/module_energy_L1232.desal_from_elec.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1232.desal_from_elec.R
-\name{module_energy_LA1232.desal_from_elec}
-\alias{module_energy_LA1232.desal_from_elec}
-\title{module_energy_LA1232.desal_from_elec}
+% Please edit documentation in R/zenergy_L1232.desal_from_elec.R
+\name{module_energy_L1232.desal_from_elec}
+\alias{module_energy_L1232.desal_from_elec}
+\title{module_energy_L1232.desal_from_elec}
 \usage{
-module_energy_LA1232.desal_from_elec(command, ...)
+module_energy_L1232.desal_from_elec(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA124.heat.Rd b/input/gcamdata/man/module_energy_L124.heat.Rd
similarity index 83%
rename from input/gcamdata/man/module_energy_LA124.heat.Rd
rename to input/gcamdata/man/module_energy_L124.heat.Rd
index e36da44aa0..86f57393c3 100644
--- a/input/gcamdata/man/module_energy_LA124.heat.Rd
+++ b/input/gcamdata/man/module_energy_L124.heat.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA124.heat.R
-\name{module_energy_LA124.heat}
-\alias{module_energy_LA124.heat}
-\title{module_energy_LA124.heat}
+% Please edit documentation in R/zenergy_L124.heat.R
+\name{module_energy_L124.heat}
+\alias{module_energy_L124.heat}
+\title{module_energy_L124.heat}
 \usage{
-module_energy_LA124.heat(command, ...)
+module_energy_L124.heat(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA125.hydrogen.Rd b/input/gcamdata/man/module_energy_L125.hydrogen.Rd
similarity index 78%
rename from input/gcamdata/man/module_energy_LA125.hydrogen.Rd
rename to input/gcamdata/man/module_energy_L125.hydrogen.Rd
index 4baec420c7..a84691cf8c 100644
--- a/input/gcamdata/man/module_energy_LA125.hydrogen.Rd
+++ b/input/gcamdata/man/module_energy_L125.hydrogen.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA125.hydrogen.R
-\name{module_energy_LA125.hydrogen}
-\alias{module_energy_LA125.hydrogen}
-\title{module_energy_LA125.hydrogen}
+% Please edit documentation in R/zenergy_L125.hydrogen.R
+\name{module_energy_L125.hydrogen}
+\alias{module_energy_L125.hydrogen}
+\title{module_energy_L125.hydrogen}
 \usage{
-module_energy_LA125.hydrogen(command, ...)
+module_energy_L125.hydrogen(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA126.distribution.Rd b/input/gcamdata/man/module_energy_L126.distribution.Rd
similarity index 85%
rename from input/gcamdata/man/module_energy_LA126.distribution.Rd
rename to input/gcamdata/man/module_energy_L126.distribution.Rd
index 9e8ed05fa8..265ed45e5b 100644
--- a/input/gcamdata/man/module_energy_LA126.distribution.Rd
+++ b/input/gcamdata/man/module_energy_L126.distribution.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA126.distribution.R
-\name{module_energy_LA126.distribution}
-\alias{module_energy_LA126.distribution}
-\title{module_energy_LA126.distribution}
+% Please edit documentation in R/zenergy_L126.distribution.R
+\name{module_energy_L126.distribution}
+\alias{module_energy_L126.distribution}
+\title{module_energy_L126.distribution}
 \usage{
-module_energy_LA126.distribution(command, ...)
+module_energy_L126.distribution(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA131.enduse.Rd b/input/gcamdata/man/module_energy_L131.enduse.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA131.enduse.Rd
rename to input/gcamdata/man/module_energy_L131.enduse.Rd
index 438855a66a..f7a645cb22 100644
--- a/input/gcamdata/man/module_energy_LA131.enduse.Rd
+++ b/input/gcamdata/man/module_energy_L131.enduse.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA131.enduse.R
-\name{module_energy_LA131.enduse}
-\alias{module_energy_LA131.enduse}
-\title{module_energy_LA131.enduse}
+% Please edit documentation in R/zenergy_L131.enduse.R
+\name{module_energy_L131.enduse}
+\alias{module_energy_L131.enduse}
+\title{module_energy_L131.enduse}
 \usage{
-module_energy_LA131.enduse(command, ...)
+module_energy_L131.enduse(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA132.industry.Rd b/input/gcamdata/man/module_energy_L132.industry.Rd
similarity index 81%
rename from input/gcamdata/man/module_energy_LA132.industry.Rd
rename to input/gcamdata/man/module_energy_L132.industry.Rd
index d33bc4f667..2438a0fec2 100644
--- a/input/gcamdata/man/module_energy_LA132.industry.Rd
+++ b/input/gcamdata/man/module_energy_L132.industry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA132.industry.R
-\name{module_energy_LA132.industry}
-\alias{module_energy_LA132.industry}
-\title{module_energy_LA132.industry}
+% Please edit documentation in R/zenergy_L132.industry.R
+\name{module_energy_L132.industry}
+\alias{module_energy_L132.industry}
+\title{module_energy_L132.industry}
 \usage{
-module_energy_LA132.industry(command, ...)
+module_energy_L132.industry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1321.cement.Rd b/input/gcamdata/man/module_energy_L1321.cement.Rd
similarity index 86%
rename from input/gcamdata/man/module_energy_LA1321.cement.Rd
rename to input/gcamdata/man/module_energy_L1321.cement.Rd
index 45e4bc7292..e40e974d0d 100644
--- a/input/gcamdata/man/module_energy_LA1321.cement.Rd
+++ b/input/gcamdata/man/module_energy_L1321.cement.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1321.cement.R
-\name{module_energy_LA1321.cement}
-\alias{module_energy_LA1321.cement}
-\title{module_energy_LA1321.cement}
+% Please edit documentation in R/zenergy_L1321.cement.R
+\name{module_energy_L1321.cement}
+\alias{module_energy_L1321.cement}
+\title{module_energy_L1321.cement}
 \usage{
-module_energy_LA1321.cement(command, ...)
+module_energy_L1321.cement(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LB1322.Fert.Rd b/input/gcamdata/man/module_energy_L1322.Fert.Rd
similarity index 86%
rename from input/gcamdata/man/module_energy_LB1322.Fert.Rd
rename to input/gcamdata/man/module_energy_L1322.Fert.Rd
index 93d9094117..ef49607346 100644
--- a/input/gcamdata/man/module_energy_LB1322.Fert.Rd
+++ b/input/gcamdata/man/module_energy_L1322.Fert.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1322.Fert.R
-\name{module_energy_LB1322.Fert}
-\alias{module_energy_LB1322.Fert}
-\title{module_energy_LB1322.Fert}
+% Please edit documentation in R/zenergy_L1322.Fert.R
+\name{module_energy_L1322.Fert}
+\alias{module_energy_L1322.Fert}
+\title{module_energy_L1322.Fert}
 \usage{
-module_energy_LB1322.Fert(command, ...)
+module_energy_L1322.Fert(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1323.iron_steel.Rd b/input/gcamdata/man/module_energy_L1323.iron_steel.Rd
similarity index 85%
rename from input/gcamdata/man/module_energy_LA1323.iron_steel.Rd
rename to input/gcamdata/man/module_energy_L1323.iron_steel.Rd
index 788936ef3a..37fdce58c9 100644
--- a/input/gcamdata/man/module_energy_LA1323.iron_steel.Rd
+++ b/input/gcamdata/man/module_energy_L1323.iron_steel.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1323.iron_steel.R
-\name{module_energy_LA1323.iron_steel}
-\alias{module_energy_LA1323.iron_steel}
-\title{module_energy_LA1323.iron_steel}
+% Please edit documentation in R/zenergy_L1323.iron_steel.R
+\name{module_energy_L1323.iron_steel}
+\alias{module_energy_L1323.iron_steel}
+\title{module_energy_L1323.iron_steel}
 \usage{
-module_energy_LA1323.iron_steel(command, ...)
+module_energy_L1323.iron_steel(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1324.Off_road.Rd b/input/gcamdata/man/module_energy_L1324.Off_road.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA1324.Off_road.Rd
rename to input/gcamdata/man/module_energy_L1324.Off_road.Rd
index d5a3d7bed7..02ecadbc3a 100644
--- a/input/gcamdata/man/module_energy_LA1324.Off_road.Rd
+++ b/input/gcamdata/man/module_energy_L1324.Off_road.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1324.Off_road.R
-\name{module_energy_LA1324.Off_road}
-\alias{module_energy_LA1324.Off_road}
-\title{module_energy_LA1324.Off_road}
+% Please edit documentation in R/zenergy_L1324.Off_road.R
+\name{module_energy_L1324.Off_road}
+\alias{module_energy_L1324.Off_road}
+\title{module_energy_L1324.Off_road}
 \usage{
-module_energy_LA1324.Off_road(command, ...)
+module_energy_L1324.Off_road(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1325.chemical.Rd b/input/gcamdata/man/module_energy_L1325.chemical.Rd
similarity index 79%
rename from input/gcamdata/man/module_energy_LA1325.chemical.Rd
rename to input/gcamdata/man/module_energy_L1325.chemical.Rd
index f2ed97e709..2c0c909a1c 100644
--- a/input/gcamdata/man/module_energy_LA1325.chemical.Rd
+++ b/input/gcamdata/man/module_energy_L1325.chemical.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1325.chemical.R
-\name{module_energy_LA1325.chemical}
-\alias{module_energy_LA1325.chemical}
-\title{module_energy_LA1325.chemical}
+% Please edit documentation in R/zenergy_L1325.chemical.R
+\name{module_energy_L1325.chemical}
+\alias{module_energy_L1325.chemical}
+\title{module_energy_L1325.chemical}
 \usage{
-module_energy_LA1325.chemical(command, ...)
+module_energy_L1325.chemical(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA1326.aluminum.Rd b/input/gcamdata/man/module_energy_L1326.aluminum.Rd
similarity index 80%
rename from input/gcamdata/man/module_energy_LA1326.aluminum.Rd
rename to input/gcamdata/man/module_energy_L1326.aluminum.Rd
index 31b0ff82d1..e8937a3aac 100644
--- a/input/gcamdata/man/module_energy_LA1326.aluminum.Rd
+++ b/input/gcamdata/man/module_energy_L1326.aluminum.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1326.aluminum.R
-\name{module_energy_LA1326.aluminum}
-\alias{module_energy_LA1326.aluminum}
-\title{module_energy_LA1326.aluminum}
+% Please edit documentation in R/zenergy_L1326.aluminum.R
+\name{module_energy_L1326.aluminum}
+\alias{module_energy_L1326.aluminum}
+\title{module_energy_L1326.aluminum}
 \usage{
-module_energy_LA1326.aluminum(command, ...)
+module_energy_L1326.aluminum(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA142.building_agg.Rd b/input/gcamdata/man/module_energy_L142.building_agg.Rd
similarity index 78%
rename from input/gcamdata/man/module_energy_LA142.building_agg.Rd
rename to input/gcamdata/man/module_energy_L142.building_agg.Rd
index 8a493b8c75..e0cbdc7d29 100644
--- a/input/gcamdata/man/module_energy_LA142.building_agg.Rd
+++ b/input/gcamdata/man/module_energy_L142.building_agg.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA142.building_agg.R
-\name{module_energy_LA142.building_agg}
-\alias{module_energy_LA142.building_agg}
-\title{module_energy_LA142.building_agg}
+% Please edit documentation in R/zenergy_L142.building_agg.R
+\name{module_energy_L142.building_agg}
+\alias{module_energy_L142.building_agg}
+\title{module_energy_L142.building_agg}
 \usage{
-module_energy_LA142.building_agg(command, ...)
+module_energy_L142.building_agg(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA143.HDDCDD.Rd b/input/gcamdata/man/module_energy_L143.HDDCDD.Rd
similarity index 78%
rename from input/gcamdata/man/module_energy_LA143.HDDCDD.Rd
rename to input/gcamdata/man/module_energy_L143.HDDCDD.Rd
index b04bf6cfb3..6f45a23aba 100644
--- a/input/gcamdata/man/module_energy_LA143.HDDCDD.Rd
+++ b/input/gcamdata/man/module_energy_L143.HDDCDD.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA143.HDDCDD.R
-\name{module_energy_LA143.HDDCDD}
-\alias{module_energy_LA143.HDDCDD}
-\title{module_energy_LA143.HDDCDD}
+% Please edit documentation in R/zenergy_L143.HDDCDD.R
+\name{module_energy_L143.HDDCDD}
+\alias{module_energy_L143.HDDCDD}
+\title{module_energy_L143.HDDCDD}
 \usage{
-module_energy_LA143.HDDCDD(command, ...)
+module_energy_L143.HDDCDD(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA144.building_det_en.Rd b/input/gcamdata/man/module_energy_L144.building_det_en.Rd
similarity index 77%
rename from input/gcamdata/man/module_energy_LA144.building_det_en.Rd
rename to input/gcamdata/man/module_energy_L144.building_det_en.Rd
index 12535f5769..d174d8f55d 100644
--- a/input/gcamdata/man/module_energy_LA144.building_det_en.Rd
+++ b/input/gcamdata/man/module_energy_L144.building_det_en.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA144.building_det_en.R
-\name{module_energy_LA144.building_det_en}
-\alias{module_energy_LA144.building_det_en}
-\title{module_energy_LA144.building_det_en}
+% Please edit documentation in R/zenergy_L144.building_det_en.R
+\name{module_energy_L144.building_det_en}
+\alias{module_energy_L144.building_det_en}
+\title{module_energy_L144.building_det_en}
 \usage{
-module_energy_LA144.building_det_en(command, ...)
+module_energy_L144.building_det_en(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA144.building_det_flsp.Rd b/input/gcamdata/man/module_energy_L144.building_det_flsp.Rd
similarity index 82%
rename from input/gcamdata/man/module_energy_LA144.building_det_flsp.Rd
rename to input/gcamdata/man/module_energy_L144.building_det_flsp.Rd
index acc50529f9..11e8783029 100644
--- a/input/gcamdata/man/module_energy_LA144.building_det_flsp.Rd
+++ b/input/gcamdata/man/module_energy_L144.building_det_flsp.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA144.building_det_flsp.R
-\name{module_energy_LA144.building_det_flsp}
-\alias{module_energy_LA144.building_det_flsp}
-\title{module_energy_LA144.building_det_flsp}
+% Please edit documentation in R/zenergy_L144.building_det_flsp.R
+\name{module_energy_L144.building_det_flsp}
+\alias{module_energy_L144.building_det_flsp}
+\title{module_energy_L144.building_det_flsp}
 \usage{
-module_energy_LA144.building_det_flsp(command, ...)
+module_energy_L144.building_det_flsp(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA152.transportation.Rd b/input/gcamdata/man/module_energy_L152.transportation.Rd
similarity index 73%
rename from input/gcamdata/man/module_energy_LA152.transportation.Rd
rename to input/gcamdata/man/module_energy_L152.transportation.Rd
index 3977accb03..0f11958008 100644
--- a/input/gcamdata/man/module_energy_LA152.transportation.Rd
+++ b/input/gcamdata/man/module_energy_L152.transportation.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA152.transportation.R
-\name{module_energy_LA152.transportation}
-\alias{module_energy_LA152.transportation}
-\title{module_energy_LA152.transportation}
+% Please edit documentation in R/zenergy_L152.transportation.R
+\name{module_energy_L152.transportation}
+\alias{module_energy_L152.transportation}
+\title{module_energy_L152.transportation}
 \usage{
-module_energy_LA152.transportation(command, ...)
+module_energy_L152.transportation(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA154.transportation_UCD.Rd b/input/gcamdata/man/module_energy_L154.transportation_UCD.Rd
similarity index 81%
rename from input/gcamdata/man/module_energy_LA154.transportation_UCD.Rd
rename to input/gcamdata/man/module_energy_L154.transportation_UCD.Rd
index 3f71468211..1d26402b3d 100644
--- a/input/gcamdata/man/module_energy_LA154.transportation_UCD.Rd
+++ b/input/gcamdata/man/module_energy_L154.transportation_UCD.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA154.transportation_UCD.R
-\name{module_energy_LA154.transportation_UCD}
-\alias{module_energy_LA154.transportation_UCD}
-\title{module_energy_LA154.transportation_UCD}
+% Please edit documentation in R/zenergy_L154.transportation_UCD.R
+\name{module_energy_L154.transportation_UCD}
+\alias{module_energy_L154.transportation_UCD}
+\title{module_energy_L154.transportation_UCD}
 \usage{
-module_energy_LA154.transportation_UCD(command, ...)
+module_energy_L154.transportation_UCD(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA161.Cstorage.Rd b/input/gcamdata/man/module_energy_L161.Cstorage.Rd
similarity index 74%
rename from input/gcamdata/man/module_energy_LA161.Cstorage.Rd
rename to input/gcamdata/man/module_energy_L161.Cstorage.Rd
index ab4d74eeca..de28d0c7b5 100644
--- a/input/gcamdata/man/module_energy_LA161.Cstorage.Rd
+++ b/input/gcamdata/man/module_energy_L161.Cstorage.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA161.Cstorage.R
-\name{module_energy_LA161.Cstorage}
-\alias{module_energy_LA161.Cstorage}
-\title{module_energy_LA161.Cstorage}
+% Please edit documentation in R/zenergy_L161.Cstorage.R
+\name{module_energy_L161.Cstorage}
+\alias{module_energy_L161.Cstorage}
+\title{module_energy_L161.Cstorage}
 \usage{
-module_energy_LA161.Cstorage(command, ...)
+module_energy_L161.Cstorage(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LA162.dac.Rd b/input/gcamdata/man/module_energy_L162.dac.Rd
similarity index 77%
rename from input/gcamdata/man/module_energy_LA162.dac.Rd
rename to input/gcamdata/man/module_energy_L162.dac.Rd
index 04c434ca36..a0be2be3ed 100644
--- a/input/gcamdata/man/module_energy_LA162.dac.Rd
+++ b/input/gcamdata/man/module_energy_L162.dac.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA162.dac.R
-\name{module_energy_LA162.dac}
-\alias{module_energy_LA162.dac}
-\title{module_energy_LA162.dac}
+% Please edit documentation in R/zenergy_L162.dac.R
+\name{module_energy_L162.dac}
+\alias{module_energy_L162.dac}
+\title{module_energy_L162.dac}
 \usage{
-module_energy_LA162.dac(command, ...)
+module_energy_L162.dac(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_LB2011.ff_ALL_R_C_Y.Rd b/input/gcamdata/man/module_energy_L2011.ff_ALL_R_C_Y.Rd
similarity index 76%
rename from input/gcamdata/man/module_energy_LB2011.ff_ALL_R_C_Y.Rd
rename to input/gcamdata/man/module_energy_L2011.ff_ALL_R_C_Y.Rd
index aa5e536201..2072540610 100644
--- a/input/gcamdata/man/module_energy_LB2011.ff_ALL_R_C_Y.Rd
+++ b/input/gcamdata/man/module_energy_L2011.ff_ALL_R_C_Y.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB2011.ff_ALL_R_C_Y.R
-\name{module_energy_LB2011.ff_ALL_R_C_Y}
-\alias{module_energy_LB2011.ff_ALL_R_C_Y}
-\title{module_energy_LB2011.ff_ALL_R_C_Y}
+% Please edit documentation in R/zenergy_L2011.ff_ALL_R_C_Y.R
+\name{module_energy_L2011.ff_ALL_R_C_Y}
+\alias{module_energy_L2011.ff_ALL_R_C_Y}
+\title{module_energy_L2011.ff_ALL_R_C_Y}
 \usage{
-module_energy_LB2011.ff_ALL_R_C_Y(command, ...)
+module_energy_L2011.ff_ALL_R_C_Y(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_energy_L202.Ccoef.Rd b/input/gcamdata/man/module_energy_L202.Ccoef.Rd
index 74008643ea..1b07489d2c 100644
--- a/input/gcamdata/man/module_energy_L202.Ccoef.Rd
+++ b/input/gcamdata/man/module_energy_L202.Ccoef.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L202.Ccoef.R
+% Please edit documentation in R/zenergy_L202.Ccoef.R
 \name{module_energy_L202.Ccoef}
 \alias{module_energy_L202.Ccoef}
 \title{module_energy_L202.Ccoef}
diff --git a/input/gcamdata/man/module_energy_L210.resources.Rd b/input/gcamdata/man/module_energy_L210.resources.Rd
index 34394403e5..baf11be630 100644
--- a/input/gcamdata/man/module_energy_L210.resources.Rd
+++ b/input/gcamdata/man/module_energy_L210.resources.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L210.resources.R
+% Please edit documentation in R/zenergy_L210.resources.R
 \name{module_energy_L210.resources}
 \alias{module_energy_L210.resources}
 \title{module_energy_L210.resources}
diff --git a/input/gcamdata/man/module_energy_L221.en_supply.Rd b/input/gcamdata/man/module_energy_L221.en_supply.Rd
index c5ea4ef634..8a1521da38 100644
--- a/input/gcamdata/man/module_energy_L221.en_supply.Rd
+++ b/input/gcamdata/man/module_energy_L221.en_supply.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L221.en_supply.R
+% Please edit documentation in R/zenergy_L221.en_supply.R
 \name{module_energy_L221.en_supply}
 \alias{module_energy_L221.en_supply}
 \title{module_energy_L221.en_supply}
diff --git a/input/gcamdata/man/module_energy_L222.en_transformation.Rd b/input/gcamdata/man/module_energy_L222.en_transformation.Rd
index a0bef3d2c1..eccc2d874b 100644
--- a/input/gcamdata/man/module_energy_L222.en_transformation.Rd
+++ b/input/gcamdata/man/module_energy_L222.en_transformation.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L222.en_transformation.R
+% Please edit documentation in R/zenergy_L222.en_transformation.R
 \name{module_energy_L222.en_transformation}
 \alias{module_energy_L222.en_transformation}
 \title{module_energy_L222.en_transformation}
diff --git a/input/gcamdata/man/module_energy_L223.electricity.Rd b/input/gcamdata/man/module_energy_L223.electricity.Rd
index 8bd6e7992c..c5f38f3b3f 100644
--- a/input/gcamdata/man/module_energy_L223.electricity.Rd
+++ b/input/gcamdata/man/module_energy_L223.electricity.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L223.electricity.R
+% Please edit documentation in R/zenergy_L223.electricity.R
 \name{module_energy_L223.electricity}
 \alias{module_energy_L223.electricity}
 \title{module_energy_L223.electricity}
diff --git a/input/gcamdata/man/module_energy_L2231.wind_update.Rd b/input/gcamdata/man/module_energy_L2231.wind_update.Rd
index fd464b59b3..39dcea7f31 100644
--- a/input/gcamdata/man/module_energy_L2231.wind_update.Rd
+++ b/input/gcamdata/man/module_energy_L2231.wind_update.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2231.wind_update.R
+% Please edit documentation in R/zenergy_L2231.wind_update.R
 \name{module_energy_L2231.wind_update}
 \alias{module_energy_L2231.wind_update}
 \title{module_energy_L2231.wind_update}
diff --git a/input/gcamdata/man/module_energy_L224.heat.Rd b/input/gcamdata/man/module_energy_L224.heat.Rd
index 396cec1eb5..7d590cf591 100644
--- a/input/gcamdata/man/module_energy_L224.heat.Rd
+++ b/input/gcamdata/man/module_energy_L224.heat.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L224.heat.R
+% Please edit documentation in R/zenergy_L224.heat.R
 \name{module_energy_L224.heat}
 \alias{module_energy_L224.heat}
 \title{module_energy_L224.heat}
diff --git a/input/gcamdata/man/module_energy_L225.hydrogen.Rd b/input/gcamdata/man/module_energy_L225.hydrogen.Rd
index 6a9db840fc..95b936169f 100644
--- a/input/gcamdata/man/module_energy_L225.hydrogen.Rd
+++ b/input/gcamdata/man/module_energy_L225.hydrogen.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L225.hydrogen.R
+% Please edit documentation in R/zenergy_L225.hydrogen.R
 \name{module_energy_L225.hydrogen}
 \alias{module_energy_L225.hydrogen}
 \title{module_energy_L225.hydrogen}
diff --git a/input/gcamdata/man/module_energy_L226.en_distribution.Rd b/input/gcamdata/man/module_energy_L226.en_distribution.Rd
index 93bd4111d0..a707f6391f 100644
--- a/input/gcamdata/man/module_energy_L226.en_distribution.Rd
+++ b/input/gcamdata/man/module_energy_L226.en_distribution.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L226.en_distribution.R
+% Please edit documentation in R/zenergy_L226.en_distribution.R
 \name{module_energy_L226.en_distribution}
 \alias{module_energy_L226.en_distribution}
 \title{module_energy_L226.en_distribution}
diff --git a/input/gcamdata/man/module_energy_L232.other_industry.Rd b/input/gcamdata/man/module_energy_L232.other_industry.Rd
index b7e4bdc78d..9c731611a4 100644
--- a/input/gcamdata/man/module_energy_L232.other_industry.Rd
+++ b/input/gcamdata/man/module_energy_L232.other_industry.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L232.other_industry.R
+% Please edit documentation in R/zenergy_L232.other_industry.R
 \name{module_energy_L232.other_industry}
 \alias{module_energy_L232.other_industry}
 \title{module_energy_L232.other_industry}
diff --git a/input/gcamdata/man/module_energy_L2321.cement.Rd b/input/gcamdata/man/module_energy_L2321.cement.Rd
index e73df5d5a2..2fa910fe42 100644
--- a/input/gcamdata/man/module_energy_L2321.cement.Rd
+++ b/input/gcamdata/man/module_energy_L2321.cement.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2321.cement.R
+% Please edit documentation in R/zenergy_L2321.cement.R
 \name{module_energy_L2321.cement}
 \alias{module_energy_L2321.cement}
 \title{module_energy_L2321.cement}
diff --git a/input/gcamdata/man/module_energy_L2322.Fert.Rd b/input/gcamdata/man/module_energy_L2322.Fert.Rd
index 096f9004e0..4a15613281 100644
--- a/input/gcamdata/man/module_energy_L2322.Fert.Rd
+++ b/input/gcamdata/man/module_energy_L2322.Fert.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2322.Fert.R
+% Please edit documentation in R/zenergy_L2322.Fert.R
 \name{module_energy_L2322.Fert}
 \alias{module_energy_L2322.Fert}
 \title{module_energy_L2322.Fert}
diff --git a/input/gcamdata/man/module_energy_L2323.iron_steel.Rd b/input/gcamdata/man/module_energy_L2323.iron_steel.Rd
index 7ccf37d70c..5793e851d7 100644
--- a/input/gcamdata/man/module_energy_L2323.iron_steel.Rd
+++ b/input/gcamdata/man/module_energy_L2323.iron_steel.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2323.iron_steel.R
+% Please edit documentation in R/zenergy_L2323.iron_steel.R
 \name{module_energy_L2323.iron_steel}
 \alias{module_energy_L2323.iron_steel}
 \title{module_energy_L2323.iron_steel}
diff --git a/input/gcamdata/man/module_energy_L2324.Off_road.Rd b/input/gcamdata/man/module_energy_L2324.Off_road.Rd
index 1ff8e3987e..2a81ae8667 100644
--- a/input/gcamdata/man/module_energy_L2324.Off_road.Rd
+++ b/input/gcamdata/man/module_energy_L2324.Off_road.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2324.Off_road.R
+% Please edit documentation in R/zenergy_L2324.Off_road.R
 \name{module_energy_L2324.Off_road}
 \alias{module_energy_L2324.Off_road}
 \title{module_energy_L2324.Off_road}
diff --git a/input/gcamdata/man/module_energy_L2325.chemical.Rd b/input/gcamdata/man/module_energy_L2325.chemical.Rd
index dd7d938669..aa7db1cf65 100644
--- a/input/gcamdata/man/module_energy_L2325.chemical.Rd
+++ b/input/gcamdata/man/module_energy_L2325.chemical.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2325.chemical.R
+% Please edit documentation in R/zenergy_L2325.chemical.R
 \name{module_energy_L2325.chemical}
 \alias{module_energy_L2325.chemical}
 \title{module_energy_L2325.chemical}
diff --git a/input/gcamdata/man/module_energy_L2326.aluminum.Rd b/input/gcamdata/man/module_energy_L2326.aluminum.Rd
index 2018afb8e6..0168bf38e9 100644
--- a/input/gcamdata/man/module_energy_L2326.aluminum.Rd
+++ b/input/gcamdata/man/module_energy_L2326.aluminum.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2326.aluminum.R
+% Please edit documentation in R/zenergy_L2326.aluminum.R
 \name{module_energy_L2326.aluminum}
 \alias{module_energy_L2326.aluminum}
 \title{module_energy_L2326.aluminum}
diff --git a/input/gcamdata/man/module_energy_L239.ff_trade.Rd b/input/gcamdata/man/module_energy_L239.ff_trade.Rd
index 35f535757e..435cfe73e7 100644
--- a/input/gcamdata/man/module_energy_L239.ff_trade.Rd
+++ b/input/gcamdata/man/module_energy_L239.ff_trade.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L239.ff_trade.R
+% Please edit documentation in R/zenergy_L239.ff_trade.R
 \name{module_energy_L239.ff_trade}
 \alias{module_energy_L239.ff_trade}
 \title{module_energy_L239.ff_trade}
diff --git a/input/gcamdata/man/module_energy_L242.building_agg.Rd b/input/gcamdata/man/module_energy_L242.building_agg.Rd
index 0226aa7bad..636170f3c6 100644
--- a/input/gcamdata/man/module_energy_L242.building_agg.Rd
+++ b/input/gcamdata/man/module_energy_L242.building_agg.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L242.building_agg.R
+% Please edit documentation in R/zenergy_L242.building_agg.R
 \name{module_energy_L242.building_agg}
 \alias{module_energy_L242.building_agg}
 \title{module_energy_L242.building_agg}
diff --git a/input/gcamdata/man/module_energy_L244.building_det.Rd b/input/gcamdata/man/module_energy_L244.building_det.Rd
index 826cbd35d9..b7d202ce42 100644
--- a/input/gcamdata/man/module_energy_L244.building_det.Rd
+++ b/input/gcamdata/man/module_energy_L244.building_det.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L244.building_det.R
+% Please edit documentation in R/zenergy_L244.building_det.R
 \name{module_energy_L244.building_det}
 \alias{module_energy_L244.building_det}
 \title{module_energy_L244.building_det}
diff --git a/input/gcamdata/man/module_energy_L252.transportation.Rd b/input/gcamdata/man/module_energy_L252.transportation.Rd
index e88c64a20d..516e44920b 100644
--- a/input/gcamdata/man/module_energy_L252.transportation.Rd
+++ b/input/gcamdata/man/module_energy_L252.transportation.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L252.transportation.R
+% Please edit documentation in R/zenergy_L252.transportation.R
 \name{module_energy_L252.transportation}
 \alias{module_energy_L252.transportation}
 \title{module_energy_L252.transportation}
diff --git a/input/gcamdata/man/module_energy_L254.transportation_UCD.Rd b/input/gcamdata/man/module_energy_L254.transportation_UCD.Rd
index c49b2d617c..d783b0dc18 100644
--- a/input/gcamdata/man/module_energy_L254.transportation_UCD.Rd
+++ b/input/gcamdata/man/module_energy_L254.transportation_UCD.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L254.transportation_UCD.R
+% Please edit documentation in R/zenergy_L254.transportation_UCD.R
 \name{module_energy_L254.transportation_UCD}
 \alias{module_energy_L254.transportation_UCD}
 \title{module_energy_L254.transportation_UCD}
diff --git a/input/gcamdata/man/module_energy_L261.Cstorage.Rd b/input/gcamdata/man/module_energy_L261.Cstorage.Rd
index bc595eb3e1..2d5529d646 100644
--- a/input/gcamdata/man/module_energy_L261.Cstorage.Rd
+++ b/input/gcamdata/man/module_energy_L261.Cstorage.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L261.Cstorage.R
+% Please edit documentation in R/zenergy_L261.Cstorage.R
 \name{module_energy_L261.Cstorage}
 \alias{module_energy_L261.Cstorage}
 \title{module_energy_L261.Cstorage}
diff --git a/input/gcamdata/man/module_energy_L262.dac.Rd b/input/gcamdata/man/module_energy_L262.dac.Rd
index eed9ebc4ca..f30aa3b2c0 100644
--- a/input/gcamdata/man/module_energy_L262.dac.Rd
+++ b/input/gcamdata/man/module_energy_L262.dac.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L262.dac.R
+% Please edit documentation in R/zenergy_L262.dac.R
 \name{module_energy_L262.dac}
 \alias{module_energy_L262.dac}
 \title{module_energy_L262.dac}
diff --git a/input/gcamdata/man/module_energy_L270.limits.Rd b/input/gcamdata/man/module_energy_L270.limits.Rd
index fe41f90bac..6cce5af3a7 100644
--- a/input/gcamdata/man/module_energy_L270.limits.Rd
+++ b/input/gcamdata/man/module_energy_L270.limits.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L270.limits.R
+% Please edit documentation in R/zenergy_L270.limits.R
 \name{module_energy_L270.limits}
 \alias{module_energy_L270.limits}
 \title{module_energy_L270.limits}
diff --git a/input/gcamdata/man/module_energy_batch_Ccoef_xml.Rd b/input/gcamdata/man/module_energy_batch_Ccoef_xml.Rd
index 847da73188..117c7b04cf 100644
--- a/input/gcamdata/man/module_energy_batch_Ccoef_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_Ccoef_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Ccoef_xml.R
+% Please edit documentation in R/zenergy_batch_Ccoef_xml.R
 \name{module_energy_batch_Ccoef_xml}
 \alias{module_energy_batch_Ccoef_xml}
 \title{module_energy_batch_Ccoef_xml}
diff --git a/input/gcamdata/man/module_energy_batch_Cstorage_xml.Rd b/input/gcamdata/man/module_energy_batch_Cstorage_xml.Rd
index b254d9bcf7..272a5ad595 100644
--- a/input/gcamdata/man/module_energy_batch_Cstorage_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_Cstorage_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Cstorage_xml.R
+% Please edit documentation in R/zenergy_batch_Cstorage_xml.R
 \name{module_energy_batch_Cstorage_xml}
 \alias{module_energy_batch_Cstorage_xml}
 \title{module_energy_batch_Cstorage.xml}
diff --git a/input/gcamdata/man/module_energy_batch_HDDCDD_xml.Rd b/input/gcamdata/man/module_energy_batch_HDDCDD_xml.Rd
index e170c7c4fd..ac1c509c25 100644
--- a/input/gcamdata/man/module_energy_batch_HDDCDD_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_HDDCDD_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_HDDCDD_xml.R
+% Please edit documentation in R/zenergy_batch_HDDCDD_xml.R
 \name{module_energy_batch_HDDCDD_xml}
 \alias{module_energy_batch_HDDCDD_xml}
 \title{module_energy_batch_HDDCDD_xml}
diff --git a/input/gcamdata/man/module_energy_batch_Off_road_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_Off_road_incelas_SSP_xml.Rd
index 6b0d7e1e7b..b0db5ec924 100644
--- a/input/gcamdata/man/module_energy_batch_Off_road_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_Off_road_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Off_road_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_Off_road_SSP_xml.R
 \name{module_energy_batch_Off_road_incelas_SSP_xml}
 \alias{module_energy_batch_Off_road_incelas_SSP_xml}
 \title{module_energy_batch_Off_road_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_Off_road_xml.Rd b/input/gcamdata/man/module_energy_batch_Off_road_xml.Rd
index 24528b32ee..1a42a0d3ae 100644
--- a/input/gcamdata/man/module_energy_batch_Off_road_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_Off_road_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Off_road_xml.R
+% Please edit documentation in R/zenergy_batch_Off_road_xml.R
 \name{module_energy_batch_Off_road_xml}
 \alias{module_energy_batch_Off_road_xml}
 \title{module_energy_batch_Off_road_xml}
diff --git a/input/gcamdata/man/module_energy_batch_aluminum_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_aluminum_incelas_SSP_xml.Rd
index 9dc24f43d9..1ffbcd978a 100644
--- a/input/gcamdata/man/module_energy_batch_aluminum_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_aluminum_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_aluminum_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_aluminum_SSP_xml.R
 \name{module_energy_batch_aluminum_incelas_SSP_xml}
 \alias{module_energy_batch_aluminum_incelas_SSP_xml}
 \title{module_energy_batch_aluminum_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_aluminum_xml.Rd b/input/gcamdata/man/module_energy_batch_aluminum_xml.Rd
index d54471cc6b..bdd6236c81 100644
--- a/input/gcamdata/man/module_energy_batch_aluminum_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_aluminum_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_aluminum_xml.R
+% Please edit documentation in R/zenergy_batch_aluminum_xml.R
 \name{module_energy_batch_aluminum_xml}
 \alias{module_energy_batch_aluminum_xml}
 \title{module_energy_batch_aluminum_xml}
diff --git a/input/gcamdata/man/module_energy_batch_bio_externality_xml.Rd b/input/gcamdata/man/module_energy_batch_bio_externality_xml.Rd
index 98db810a25..c078f632cb 100644
--- a/input/gcamdata/man/module_energy_batch_bio_externality_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_bio_externality_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_bio_externality_cost_xml.R
+% Please edit documentation in R/zenergy_batch_bio_externality_cost_xml.R
 \name{module_energy_batch_bio_externality_xml}
 \alias{module_energy_batch_bio_externality_xml}
 \title{module_energy_batch_bio_externality_xml}
diff --git a/input/gcamdata/man/module_energy_batch_building_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_building_SSP_xml.Rd
index ee4e703f7d..5618df3bf5 100644
--- a/input/gcamdata/man/module_energy_batch_building_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_building_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_building_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_building_SSP_xml.R
 \name{module_energy_batch_building_SSP_xml}
 \alias{module_energy_batch_building_SSP_xml}
 \title{module_energy_batch_building_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_building_agg_xml.Rd b/input/gcamdata/man/module_energy_batch_building_agg_xml.Rd
index 6ca1ca56a4..2afbf84ac9 100644
--- a/input/gcamdata/man/module_energy_batch_building_agg_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_building_agg_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_building_agg_xml.R
+% Please edit documentation in R/zenergy_batch_building_agg_xml.R
 \name{module_energy_batch_building_agg_xml}
 \alias{module_energy_batch_building_agg_xml}
 \title{module_energy_batch_building_agg_xml}
diff --git a/input/gcamdata/man/module_energy_batch_building_det_xml.Rd b/input/gcamdata/man/module_energy_batch_building_det_xml.Rd
index 5e7e9d695d..8310fe1b99 100644
--- a/input/gcamdata/man/module_energy_batch_building_det_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_building_det_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_building_det_xml.R
+% Please edit documentation in R/zenergy_batch_building_det_xml.R
 \name{module_energy_batch_building_det_xml}
 \alias{module_energy_batch_building_det_xml}
 \title{module_energy_batch_building_det_xml}
diff --git a/input/gcamdata/man/module_energy_batch_ccs_supply_high_xml.Rd b/input/gcamdata/man/module_energy_batch_ccs_supply_high_xml.Rd
index 900411a791..fb42fdd0a7 100644
--- a/input/gcamdata/man/module_energy_batch_ccs_supply_high_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_ccs_supply_high_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ccs_supply_high_xml.R
+% Please edit documentation in R/zenergy_batch_ccs_supply_high_xml.R
 \name{module_energy_batch_ccs_supply_high_xml}
 \alias{module_energy_batch_ccs_supply_high_xml}
 \title{module_energy_batch_ccs_supply_high_xml}
diff --git a/input/gcamdata/man/module_energy_batch_ccs_supply_low_xml.Rd b/input/gcamdata/man/module_energy_batch_ccs_supply_low_xml.Rd
index 75e1196910..84c60c4bf7 100644
--- a/input/gcamdata/man/module_energy_batch_ccs_supply_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_ccs_supply_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ccs_supply_low_xml.R
+% Please edit documentation in R/zenergy_batch_ccs_supply_low_xml.R
 \name{module_energy_batch_ccs_supply_low_xml}
 \alias{module_energy_batch_ccs_supply_low_xml}
 \title{module_energy_batch_ccs_supply_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_ccs_supply_lowest_xml.Rd b/input/gcamdata/man/module_energy_batch_ccs_supply_lowest_xml.Rd
index 26d75fa7fa..5d06cf58ff 100644
--- a/input/gcamdata/man/module_energy_batch_ccs_supply_lowest_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_ccs_supply_lowest_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ccs_supply_lowest_xml.R
+% Please edit documentation in R/zenergy_batch_ccs_supply_lowest_xml.R
 \name{module_energy_batch_ccs_supply_lowest_xml}
 \alias{module_energy_batch_ccs_supply_lowest_xml}
 \title{module_energy_batch_ccs_supply_lowest_xml}
diff --git a/input/gcamdata/man/module_energy_batch_cement_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_cement_incelas_SSP_xml.Rd
index ae3f2f23a8..0c65ab5d26 100644
--- a/input/gcamdata/man/module_energy_batch_cement_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_cement_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_cement_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_cement_SSP_xml.R
 \name{module_energy_batch_cement_incelas_SSP_xml}
 \alias{module_energy_batch_cement_incelas_SSP_xml}
 \title{module_energy_batch_cement_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_cement_xml.Rd b/input/gcamdata/man/module_energy_batch_cement_xml.Rd
index 44708f4503..88436d4e9f 100644
--- a/input/gcamdata/man/module_energy_batch_cement_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_cement_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_cement_xml.R
+% Please edit documentation in R/zenergy_batch_cement_xml.R
 \name{module_energy_batch_cement_xml}
 \alias{module_energy_batch_cement_xml}
 \title{module_energy_batch_cement_xml}
diff --git a/input/gcamdata/man/module_energy_batch_chemical_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_chemical_incelas_SSP_xml.Rd
index 88619e036c..37cde2559f 100644
--- a/input/gcamdata/man/module_energy_batch_chemical_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_chemical_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_chemical_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_chemical_SSP_xml.R
 \name{module_energy_batch_chemical_incelas_SSP_xml}
 \alias{module_energy_batch_chemical_incelas_SSP_xml}
 \title{module_energy_batch_chemical_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_chemical_xml.Rd b/input/gcamdata/man/module_energy_batch_chemical_xml.Rd
index 3072c2bdcc..666c6715a0 100644
--- a/input/gcamdata/man/module_energy_batch_chemical_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_chemical_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_chemical_xml.R
+% Please edit documentation in R/zenergy_batch_chemical_xml.R
 \name{module_energy_batch_chemical_xml}
 \alias{module_energy_batch_chemical_xml}
 \title{module_energy_batch_chemical_xml}
diff --git a/input/gcamdata/man/module_energy_batch_dac_xml.Rd b/input/gcamdata/man/module_energy_batch_dac_xml.Rd
index 25e36b0d4a..3dd294e382 100644
--- a/input/gcamdata/man/module_energy_batch_dac_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_dac_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_dac_xml.R
+% Please edit documentation in R/zenergy_batch_dac_xml.R
 \name{module_energy_batch_dac_xml}
 \alias{module_energy_batch_dac_xml}
 \title{module_energy_batch_dac_xml}
diff --git a/input/gcamdata/man/module_energy_batch_elec_bio_low_xml.Rd b/input/gcamdata/man/module_energy_batch_elec_bio_low_xml.Rd
index cbef46a7fa..c99682bfdb 100644
--- a/input/gcamdata/man/module_energy_batch_elec_bio_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_elec_bio_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elec_bio_low_xml.R
+% Please edit documentation in R/zenergy_batch_elec_bio_low_xml.R
 \name{module_energy_batch_elec_bio_low_xml}
 \alias{module_energy_batch_elec_bio_low_xml}
 \title{module_energy_batch_elec_bio_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_electricity_xml.Rd b/input/gcamdata/man/module_energy_batch_electricity_xml.Rd
index 131231b197..3516cb8df8 100644
--- a/input/gcamdata/man/module_energy_batch_electricity_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_electricity_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_electricity_xml.R
+% Please edit documentation in R/zenergy_batch_electricity_xml.R
 \name{module_energy_batch_electricity_xml}
 \alias{module_energy_batch_electricity_xml}
 \title{module_energy_batch_electricity_xml}
diff --git a/input/gcamdata/man/module_energy_batch_en_Fert_xml.Rd b/input/gcamdata/man/module_energy_batch_en_Fert_xml.Rd
index 1d50adbc31..6fd7bb1f01 100644
--- a/input/gcamdata/man/module_energy_batch_en_Fert_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_en_Fert_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_Fert_xml.R
+% Please edit documentation in R/zenergy_batch_en_Fert_xml.R
 \name{module_energy_batch_en_Fert_xml}
 \alias{module_energy_batch_en_Fert_xml}
 \title{module_energy_batch_en_Fert_xml}
diff --git a/input/gcamdata/man/module_energy_batch_en_distribution_xml.Rd b/input/gcamdata/man/module_energy_batch_en_distribution_xml.Rd
index 689165c365..97f6671dae 100644
--- a/input/gcamdata/man/module_energy_batch_en_distribution_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_en_distribution_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_distribution_xml.R
+% Please edit documentation in R/zenergy_batch_en_distribution_xml.R
 \name{module_energy_batch_en_distribution_xml}
 \alias{module_energy_batch_en_distribution_xml}
 \title{module_energy_batch_en_distribution_xml}
diff --git a/input/gcamdata/man/module_energy_batch_en_supply_xml.Rd b/input/gcamdata/man/module_energy_batch_en_supply_xml.Rd
index fa74f6d45b..ccde9f5e21 100644
--- a/input/gcamdata/man/module_energy_batch_en_supply_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_en_supply_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_supply_xml.R
+% Please edit documentation in R/zenergy_batch_en_supply_xml.R
 \name{module_energy_batch_en_supply_xml}
 \alias{module_energy_batch_en_supply_xml}
 \title{module_energy_batch_en_supply_xml}
diff --git a/input/gcamdata/man/module_energy_batch_en_transformation_low_xml.Rd b/input/gcamdata/man/module_energy_batch_en_transformation_low_xml.Rd
index 68d9bb805d..7f1a806a66 100644
--- a/input/gcamdata/man/module_energy_batch_en_transformation_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_en_transformation_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_transformation_low_xml.R
+% Please edit documentation in R/zenergy_batch_en_transformation_low_xml.R
 \name{module_energy_batch_en_transformation_low_xml}
 \alias{module_energy_batch_en_transformation_low_xml}
 \title{module_energy_batch_en_transformation_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_en_transformation_xml.Rd b/input/gcamdata/man/module_energy_batch_en_transformation_xml.Rd
index b0a803ba61..5e02b33ed6 100644
--- a/input/gcamdata/man/module_energy_batch_en_transformation_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_en_transformation_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_transformation_xml.R
+% Please edit documentation in R/zenergy_batch_en_transformation_xml.R
 \name{module_energy_batch_en_transformation_xml}
 \alias{module_energy_batch_en_transformation_xml}
 \title{module_energy_batch_en_transformation_xml}
diff --git a/input/gcamdata/man/module_energy_batch_geo_adv_xml.Rd b/input/gcamdata/man/module_energy_batch_geo_adv_xml.Rd
index d91160e5d5..64d5871879 100644
--- a/input/gcamdata/man/module_energy_batch_geo_adv_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_geo_adv_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_geo_adv_xml.R
+% Please edit documentation in R/zenergy_batch_geo_adv_xml.R
 \name{module_energy_batch_geo_adv_xml}
 \alias{module_energy_batch_geo_adv_xml}
 \title{module_energy_batch_geo_adv_xml}
diff --git a/input/gcamdata/man/module_energy_batch_geo_low_xml.Rd b/input/gcamdata/man/module_energy_batch_geo_low_xml.Rd
index 6f3ab62203..4ae66efc7d 100644
--- a/input/gcamdata/man/module_energy_batch_geo_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_geo_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_geo_low_xml.R
+% Please edit documentation in R/zenergy_batch_geo_low_xml.R
 \name{module_energy_batch_geo_low_xml}
 \alias{module_energy_batch_geo_low_xml}
 \title{module_energy_batch_geo_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_geo_tech_adv_xml.Rd b/input/gcamdata/man/module_energy_batch_geo_tech_adv_xml.Rd
index b97764b981..c4b4a42148 100644
--- a/input/gcamdata/man/module_energy_batch_geo_tech_adv_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_geo_tech_adv_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_geo_tech_adv_xml.R
+% Please edit documentation in R/zenergy_batch_geo_tech_adv_xml.R
 \name{module_energy_batch_geo_tech_adv_xml}
 \alias{module_energy_batch_geo_tech_adv_xml}
 \title{module_energy_batch_geo_tech_adv_xml}
diff --git a/input/gcamdata/man/module_energy_batch_heat_xml.Rd b/input/gcamdata/man/module_energy_batch_heat_xml.Rd
index 07b0d5025d..b6808acd03 100644
--- a/input/gcamdata/man/module_energy_batch_heat_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_heat_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_heat_xml.R
+% Please edit documentation in R/zenergy_batch_heat_xml.R
 \name{module_energy_batch_heat_xml}
 \alias{module_energy_batch_heat_xml}
 \title{module_energy_batch_heat_xml}
diff --git a/input/gcamdata/man/module_energy_batch_high_cost_ccs_xml.Rd b/input/gcamdata/man/module_energy_batch_high_cost_ccs_xml.Rd
index 3711da1784..3c0c6f0935 100644
--- a/input/gcamdata/man/module_energy_batch_high_cost_ccs_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_high_cost_ccs_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_high_cost_ccs_xml.R
+% Please edit documentation in R/zenergy_batch_high_cost_ccs_xml.R
 \name{module_energy_batch_high_cost_ccs_xml}
 \alias{module_energy_batch_high_cost_ccs_xml}
 \title{module_energy_batch_high_cost_ccs_xml}
diff --git a/input/gcamdata/man/module_energy_batch_hydrogen_xml.Rd b/input/gcamdata/man/module_energy_batch_hydrogen_xml.Rd
index f63db56f49..97623f5dd8 100644
--- a/input/gcamdata/man/module_energy_batch_hydrogen_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_hydrogen_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_hydrogen_xml.R
+% Please edit documentation in R/zenergy_batch_hydrogen_xml.R
 \name{module_energy_batch_hydrogen_xml}
 \alias{module_energy_batch_hydrogen_xml}
 \title{module_energy_batch_hydrogen_xml}
diff --git a/input/gcamdata/man/module_energy_batch_iron_steel_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_iron_steel_incelas_SSP_xml.Rd
index 19c8051773..d8c000ca84 100644
--- a/input/gcamdata/man/module_energy_batch_iron_steel_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_iron_steel_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_iron_steel_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_iron_steel_SSP_xml.R
 \name{module_energy_batch_iron_steel_incelas_SSP_xml}
 \alias{module_energy_batch_iron_steel_incelas_SSP_xml}
 \title{module_energy_batch_iron_steel_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_iron_steel_xml.Rd b/input/gcamdata/man/module_energy_batch_iron_steel_xml.Rd
index 4188db177b..f413affc31 100644
--- a/input/gcamdata/man/module_energy_batch_iron_steel_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_iron_steel_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_iron_steel_xml.R
+% Please edit documentation in R/zenergy_batch_iron_steel_xml.R
 \name{module_energy_batch_iron_steel_xml}
 \alias{module_energy_batch_iron_steel_xml}
 \title{module_energy_batch_iron_steel_xml}
diff --git a/input/gcamdata/man/module_energy_batch_liquids_limits_xml.Rd b/input/gcamdata/man/module_energy_batch_liquids_limits_xml.Rd
index 6eba253204..5b06fb1ffc 100644
--- a/input/gcamdata/man/module_energy_batch_liquids_limits_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_liquids_limits_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_liquids_limits_xml.R
+% Please edit documentation in R/zenergy_batch_liquids_limits_xml.R
 \name{module_energy_batch_liquids_limits_xml}
 \alias{module_energy_batch_liquids_limits_xml}
 \title{module_energy_batch_liquids_limits_xml}
diff --git a/input/gcamdata/man/module_energy_batch_negative_emissions_budget_xml.Rd b/input/gcamdata/man/module_energy_batch_negative_emissions_budget_xml.Rd
index 770c4df56d..b20794b709 100644
--- a/input/gcamdata/man/module_energy_batch_negative_emissions_budget_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_negative_emissions_budget_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_negative_emissions_budget_xml.R
+% Please edit documentation in R/zenergy_batch_negative_emissions_budget_xml.R
 \name{module_energy_batch_negative_emissions_budget_xml}
 \alias{module_energy_batch_negative_emissions_budget_xml}
 \title{module_energy_batch_negative_emissions_budget_xml}
diff --git a/input/gcamdata/man/module_energy_batch_no_offshore_ccs_xml.Rd b/input/gcamdata/man/module_energy_batch_no_offshore_ccs_xml.Rd
index 5a79ac706e..df6e185bc5 100644
--- a/input/gcamdata/man/module_energy_batch_no_offshore_ccs_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_no_offshore_ccs_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_no_offshore_ccs_xml.R
+% Please edit documentation in R/zenergy_batch_no_offshore_ccs_xml.R
 \name{module_energy_batch_no_offshore_ccs_xml}
 \alias{module_energy_batch_no_offshore_ccs_xml}
 \title{module_energy_batch_no_offshore_ccs_xml}
diff --git a/input/gcamdata/man/module_energy_batch_nuclear_adv_xml.Rd b/input/gcamdata/man/module_energy_batch_nuclear_adv_xml.Rd
index fad536b765..b148cb7db5 100644
--- a/input/gcamdata/man/module_energy_batch_nuclear_adv_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_nuclear_adv_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_nuclear_adv_xml.R
+% Please edit documentation in R/zenergy_batch_nuclear_adv_xml.R
 \name{module_energy_batch_nuclear_adv_xml}
 \alias{module_energy_batch_nuclear_adv_xml}
 \title{module_energy_batch_nuclear_adv_xml}
diff --git a/input/gcamdata/man/module_energy_batch_nuclear_low_xml.Rd b/input/gcamdata/man/module_energy_batch_nuclear_low_xml.Rd
index 66703a7578..06123b8c93 100644
--- a/input/gcamdata/man/module_energy_batch_nuclear_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_nuclear_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_nuclear_low_xml.R
+% Please edit documentation in R/zenergy_batch_nuclear_low_xml.R
 \name{module_energy_batch_nuclear_low_xml}
 \alias{module_energy_batch_nuclear_low_xml}
 \title{module_energy_batch_nuclear_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_onshore_wind_xml.Rd b/input/gcamdata/man/module_energy_batch_onshore_wind_xml.Rd
index dcc7e3149c..4f1a1b65a7 100644
--- a/input/gcamdata/man/module_energy_batch_onshore_wind_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_onshore_wind_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_onshore_wind_xml.R
+% Please edit documentation in R/zenergy_batch_onshore_wind_xml.R
 \name{module_energy_batch_onshore_wind_xml}
 \alias{module_energy_batch_onshore_wind_xml}
 \title{module_energy_batch_onshore_wind_xml}
diff --git a/input/gcamdata/man/module_energy_batch_other_industry_incelas_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_other_industry_incelas_SSP_xml.Rd
index ffae07bce3..5faafa43ba 100644
--- a/input/gcamdata/man/module_energy_batch_other_industry_incelas_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_other_industry_incelas_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_other_industry_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_other_industry_SSP_xml.R
 \name{module_energy_batch_other_industry_incelas_SSP_xml}
 \alias{module_energy_batch_other_industry_incelas_SSP_xml}
 \title{module_energy_batch_other_industry_incelas_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_other_industry_xml.Rd b/input/gcamdata/man/module_energy_batch_other_industry_xml.Rd
index d084e04c6b..f406f86e58 100644
--- a/input/gcamdata/man/module_energy_batch_other_industry_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_other_industry_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_other_industry_xml.R
+% Please edit documentation in R/zenergy_batch_other_industry_xml.R
 \name{module_energy_batch_other_industry_xml}
 \alias{module_energy_batch_other_industry_xml}
 \title{module_energy_batch_other_industry_xml}
diff --git a/input/gcamdata/man/module_energy_batch_resources_SSP_xml.Rd b/input/gcamdata/man/module_energy_batch_resources_SSP_xml.Rd
index 71ebe8c91e..5c026a0cfd 100644
--- a/input/gcamdata/man/module_energy_batch_resources_SSP_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_resources_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_resources_SSP_xml.R
+% Please edit documentation in R/zenergy_batch_resources_SSP_xml.R
 \name{module_energy_batch_resources_SSP_xml}
 \alias{module_energy_batch_resources_SSP_xml}
 \title{module_energy_batch_resources_SSP_xml}
diff --git a/input/gcamdata/man/module_energy_batch_resources_xml.Rd b/input/gcamdata/man/module_energy_batch_resources_xml.Rd
index c25159dcf0..52379f5000 100644
--- a/input/gcamdata/man/module_energy_batch_resources_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_resources_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_resources_xml.R
+% Please edit documentation in R/zenergy_batch_resources_xml.R
 \name{module_energy_batch_resources_xml}
 \alias{module_energy_batch_resources_xml}
 \title{module_energy_batch_resources_xml}
diff --git a/input/gcamdata/man/module_energy_batch_solar_adv_xml.Rd b/input/gcamdata/man/module_energy_batch_solar_adv_xml.Rd
index 0d6e6e68ff..5201a0d431 100644
--- a/input/gcamdata/man/module_energy_batch_solar_adv_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_solar_adv_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_solar_adv_xml.R
+% Please edit documentation in R/zenergy_batch_solar_adv_xml.R
 \name{module_energy_batch_solar_adv_xml}
 \alias{module_energy_batch_solar_adv_xml}
 \title{module_energy_batch_solar_adv_xml}
diff --git a/input/gcamdata/man/module_energy_batch_solar_low_xml.Rd b/input/gcamdata/man/module_energy_batch_solar_low_xml.Rd
index 3f6df5bcb6..47aa9381f2 100644
--- a/input/gcamdata/man/module_energy_batch_solar_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_solar_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_solar_low_xml.R
+% Please edit documentation in R/zenergy_batch_solar_low_xml.R
 \name{module_energy_batch_solar_low_xml}
 \alias{module_energy_batch_solar_low_xml}
 \title{module_energy_batch_solar_low_xml}
diff --git a/input/gcamdata/man/module_energy_batch_transportation_UCD_CORE_xml.Rd b/input/gcamdata/man/module_energy_batch_transportation_UCD_CORE_xml.Rd
index 331f00ade6..2cd12585f7 100644
--- a/input/gcamdata/man/module_energy_batch_transportation_UCD_CORE_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_transportation_UCD_CORE_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_transportation_UCD_CORE_xml.R
+% Please edit documentation in R/zenergy_batch_transportation_UCD_CORE_xml.R
 \name{module_energy_batch_transportation_UCD_CORE_xml}
 \alias{module_energy_batch_transportation_UCD_CORE_xml}
 \title{module_energy_batch_transportation_UCD_CORE_xml}
diff --git a/input/gcamdata/man/module_energy_batch_wind_adv_xml.Rd b/input/gcamdata/man/module_energy_batch_wind_adv_xml.Rd
index 6b01b95759..a270451a10 100644
--- a/input/gcamdata/man/module_energy_batch_wind_adv_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_wind_adv_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_wind_adv_xml.R
+% Please edit documentation in R/zenergy_batch_wind_adv_xml.R
 \name{module_energy_batch_wind_adv_xml}
 \alias{module_energy_batch_wind_adv_xml}
 \title{module_energy_batch_wind_adv_xml}
diff --git a/input/gcamdata/man/module_energy_batch_wind_low_xml.Rd b/input/gcamdata/man/module_energy_batch_wind_low_xml.Rd
index 0aa64c0491..a34ba0c05d 100644
--- a/input/gcamdata/man/module_energy_batch_wind_low_xml.Rd
+++ b/input/gcamdata/man/module_energy_batch_wind_low_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_wind_low_xml.R
+% Please edit documentation in R/zenergy_batch_wind_low_xml.R
 \name{module_energy_batch_wind_low_xml}
 \alias{module_energy_batch_wind_low_xml}
 \title{module_energy_batch_wind_low_xml}
diff --git a/input/gcamdata/man/module_gcamusa_LA100.Socioeconomics.Rd b/input/gcamdata/man/module_gcamusa_L100.Socioeconomics.Rd
similarity index 72%
rename from input/gcamdata/man/module_gcamusa_LA100.Socioeconomics.Rd
rename to input/gcamdata/man/module_gcamusa_L100.Socioeconomics.Rd
index a247282742..50932598a2 100644
--- a/input/gcamdata/man/module_gcamusa_LA100.Socioeconomics.Rd
+++ b/input/gcamdata/man/module_gcamusa_L100.Socioeconomics.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA100.Socioeconomics.R
-\name{module_gcamusa_LA100.Socioeconomics}
-\alias{module_gcamusa_LA100.Socioeconomics}
-\title{module_gcamusa_LA100.Socioeconomics}
+% Please edit documentation in R/zgcamusa_L100.Socioeconomics.R
+\name{module_gcamusa_L100.Socioeconomics}
+\alias{module_gcamusa_L100.Socioeconomics}
+\title{module_gcamusa_L100.Socioeconomics}
 \usage{
-module_gcamusa_LA100.Socioeconomics(command, ...)
+module_gcamusa_L100.Socioeconomics(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA101.EIA_SEDS.Rd b/input/gcamdata/man/module_gcamusa_L101.EIA_SEDS.Rd
similarity index 82%
rename from input/gcamdata/man/module_gcamusa_LA101.EIA_SEDS.Rd
rename to input/gcamdata/man/module_gcamusa_L101.EIA_SEDS.Rd
index def589a181..cad5b33b00 100644
--- a/input/gcamdata/man/module_gcamusa_LA101.EIA_SEDS.Rd
+++ b/input/gcamdata/man/module_gcamusa_L101.EIA_SEDS.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA101.EIA_SEDS.R
-\name{module_gcamusa_LA101.EIA_SEDS}
-\alias{module_gcamusa_LA101.EIA_SEDS}
-\title{module_gcamusa_LA101.EIA_SEDS}
+% Please edit documentation in R/zgcamusa_L101.EIA_SEDS.R
+\name{module_gcamusa_L101.EIA_SEDS}
+\alias{module_gcamusa_L101.EIA_SEDS}
+\title{module_gcamusa_L101.EIA_SEDS}
 \usage{
-module_gcamusa_LA101.EIA_SEDS(command, ...)
+module_gcamusa_L101.EIA_SEDS(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L103.water_mapping_USA.Rd b/input/gcamdata/man/module_gcamusa_L103.water_mapping_USA.Rd
index be5bfb4ab2..7f08df9eb9 100644
--- a/input/gcamdata/man/module_gcamusa_L103.water_mapping_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L103.water_mapping_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L103.water_mapping_USA.R
+% Please edit documentation in R/zgcamusa_L103.water_mapping_USA.R
 \name{module_gcamusa_L103.water_mapping_USA}
 \alias{module_gcamusa_L103.water_mapping_USA}
 \title{module_gcamusa_L103.water_mapping_USA}
diff --git a/input/gcamdata/man/module_gcamusa_LA114.wind.Rd b/input/gcamdata/man/module_gcamusa_L114.wind.Rd
similarity index 75%
rename from input/gcamdata/man/module_gcamusa_LA114.wind.Rd
rename to input/gcamdata/man/module_gcamusa_L114.wind.Rd
index 5ea4e688c2..984436896b 100644
--- a/input/gcamdata/man/module_gcamusa_LA114.wind.Rd
+++ b/input/gcamdata/man/module_gcamusa_L114.wind.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA114.wind_USA.R
-\name{module_gcamusa_LA114.wind}
-\alias{module_gcamusa_LA114.wind}
-\title{module_gcamusa_LA114.Wind}
+% Please edit documentation in R/zgcamusa_L114.wind_USA.R
+\name{module_gcamusa_L114.wind}
+\alias{module_gcamusa_L114.wind}
+\title{module_gcamusa_L114.Wind}
 \usage{
-module_gcamusa_LA114.wind(command, ...)
+module_gcamusa_L114.wind(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA115.rooftopPV.Rd b/input/gcamdata/man/module_gcamusa_L115.rooftopPV.Rd
similarity index 75%
rename from input/gcamdata/man/module_gcamusa_LA115.rooftopPV.Rd
rename to input/gcamdata/man/module_gcamusa_L115.rooftopPV.Rd
index 3067a32857..edf6004296 100644
--- a/input/gcamdata/man/module_gcamusa_LA115.rooftopPV.Rd
+++ b/input/gcamdata/man/module_gcamusa_L115.rooftopPV.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA115.rooftopPV_USA.R
-\name{module_gcamusa_LA115.rooftopPV}
-\alias{module_gcamusa_LA115.rooftopPV}
-\title{module_gcamusa_LA115.RooftopPV}
+% Please edit documentation in R/zgcamusa_L115.rooftopPV_USA.R
+\name{module_gcamusa_L115.rooftopPV}
+\alias{module_gcamusa_L115.rooftopPV}
+\title{module_gcamusa_L115.RooftopPV}
 \usage{
-module_gcamusa_LA115.rooftopPV(command, ...)
+module_gcamusa_L115.rooftopPV(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA119.solar.Rd b/input/gcamdata/man/module_gcamusa_L119.solar.Rd
similarity index 78%
rename from input/gcamdata/man/module_gcamusa_LA119.solar.Rd
rename to input/gcamdata/man/module_gcamusa_L119.solar.Rd
index d5b2e6517b..3cb6e50200 100644
--- a/input/gcamdata/man/module_gcamusa_LA119.solar.Rd
+++ b/input/gcamdata/man/module_gcamusa_L119.solar.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA119.solar_USA.R
-\name{module_gcamusa_LA119.solar}
-\alias{module_gcamusa_LA119.solar}
-\title{module_gcamusa_LA119.Solar}
+% Please edit documentation in R/zgcamusa_L119.solar_USA.R
+\name{module_gcamusa_L119.solar}
+\alias{module_gcamusa_L119.solar}
+\title{module_gcamusa_L119.Solar}
 \usage{
-module_gcamusa_LA119.solar(command, ...)
+module_gcamusa_L119.solar(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA120.offshore_wind_reeds_USA.Rd b/input/gcamdata/man/module_gcamusa_L120.offshore_wind_reeds_USA.Rd
similarity index 77%
rename from input/gcamdata/man/module_gcamusa_LA120.offshore_wind_reeds_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L120.offshore_wind_reeds_USA.Rd
index 777282971a..4cd8fb02a9 100644
--- a/input/gcamdata/man/module_gcamusa_LA120.offshore_wind_reeds_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L120.offshore_wind_reeds_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA120.offshore_wind_reeds_USA.R
-\name{module_gcamusa_LA120.offshore_wind_reeds_USA}
-\alias{module_gcamusa_LA120.offshore_wind_reeds_USA}
-\title{module_gcamusa_LA120.offshore_wind_reeds_USA}
+% Please edit documentation in R/zgcamusa_L120.offshore_wind_reeds_USA.R
+\name{module_gcamusa_L120.offshore_wind_reeds_USA}
+\alias{module_gcamusa_L120.offshore_wind_reeds_USA}
+\title{module_gcamusa_L120.offshore_wind_reeds_USA}
 \usage{
-module_gcamusa_LA120.offshore_wind_reeds_USA(command, ...)
+module_gcamusa_L120.offshore_wind_reeds_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA122.refining.Rd b/input/gcamdata/man/module_gcamusa_L122.refining.Rd
similarity index 77%
rename from input/gcamdata/man/module_gcamusa_LA122.refining.Rd
rename to input/gcamdata/man/module_gcamusa_L122.refining.Rd
index d63def756e..69378c0094 100644
--- a/input/gcamdata/man/module_gcamusa_LA122.refining.Rd
+++ b/input/gcamdata/man/module_gcamusa_L122.refining.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA122.Refining.R
-\name{module_gcamusa_LA122.refining}
-\alias{module_gcamusa_LA122.refining}
-\title{module_gcamusa_LA122.Refining}
+% Please edit documentation in R/zgcamusa_L122.Refining.R
+\name{module_gcamusa_L122.refining}
+\alias{module_gcamusa_L122.refining}
+\title{module_gcamusa_L122.Refining}
 \usage{
-module_gcamusa_LA122.refining(command, ...)
+module_gcamusa_L122.refining(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB123.Electricity.Rd b/input/gcamdata/man/module_gcamusa_L123.Electricity.Rd
similarity index 79%
rename from input/gcamdata/man/module_gcamusa_LB123.Electricity.Rd
rename to input/gcamdata/man/module_gcamusa_L123.Electricity.Rd
index 21bb66fdda..2103d2e2cc 100644
--- a/input/gcamdata/man/module_gcamusa_LB123.Electricity.Rd
+++ b/input/gcamdata/man/module_gcamusa_L123.Electricity.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB123.Electricity.R
-\name{module_gcamusa_LB123.Electricity}
-\alias{module_gcamusa_LB123.Electricity}
-\title{module_gcamusa_LB123.Electricity}
+% Please edit documentation in R/zgcamusa_L123.Electricity.R
+\name{module_gcamusa_L123.Electricity}
+\alias{module_gcamusa_L123.Electricity}
+\title{module_gcamusa_L123.Electricity}
 \usage{
-module_gcamusa_LB123.Electricity(command, ...)
+module_gcamusa_L123.Electricity(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1231.Elec_tech.Rd b/input/gcamdata/man/module_gcamusa_L1231.Elec_tech.Rd
similarity index 75%
rename from input/gcamdata/man/module_gcamusa_LB1231.Elec_tech.Rd
rename to input/gcamdata/man/module_gcamusa_L1231.Elec_tech.Rd
index 9164b99c7d..2176dfa1fb 100644
--- a/input/gcamdata/man/module_gcamusa_LB1231.Elec_tech.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1231.Elec_tech.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1231.Elec_tech.R
-\name{module_gcamusa_LB1231.Elec_tech}
-\alias{module_gcamusa_LB1231.Elec_tech}
-\title{module_gcamusa_LB1231.Elec_tech}
+% Please edit documentation in R/zgcamusa_L1231.Elec_tech.R
+\name{module_gcamusa_L1231.Elec_tech}
+\alias{module_gcamusa_L1231.Elec_tech}
+\title{module_gcamusa_L1231.Elec_tech}
 \usage{
-module_gcamusa_LB1231.Elec_tech(command, ...)
+module_gcamusa_L1231.Elec_tech(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1232.Elec_subregions.Rd b/input/gcamdata/man/module_gcamusa_L1232.Elec_subregions.Rd
similarity index 72%
rename from input/gcamdata/man/module_gcamusa_LB1232.Elec_subregions.Rd
rename to input/gcamdata/man/module_gcamusa_L1232.Elec_subregions.Rd
index d4c49160f3..898a518da5 100644
--- a/input/gcamdata/man/module_gcamusa_LB1232.Elec_subregions.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1232.Elec_subregions.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1232.Elec_subregions.R
-\name{module_gcamusa_LB1232.Elec_subregions}
-\alias{module_gcamusa_LB1232.Elec_subregions}
-\title{module_gcamusa_LB1232.Elec_subregions}
+% Please edit documentation in R/zgcamusa_L1232.Elec_subregions.R
+\name{module_gcamusa_L1232.Elec_subregions}
+\alias{module_gcamusa_L1232.Elec_subregions}
+\title{module_gcamusa_L1232.Elec_subregions}
 \usage{
-module_gcamusa_LB1232.Elec_subregions(command, ...)
+module_gcamusa_L1232.Elec_subregions(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1233.elec_water_USA.Rd b/input/gcamdata/man/module_gcamusa_L1233.elec_water_USA.Rd
similarity index 75%
rename from input/gcamdata/man/module_gcamusa_LB1233.elec_water_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L1233.elec_water_USA.Rd
index ee0b3cd1bf..5cca920f62 100644
--- a/input/gcamdata/man/module_gcamusa_LB1233.elec_water_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1233.elec_water_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1233.elec_water_USA.R
-\name{module_gcamusa_LB1233.elec_water_USA}
-\alias{module_gcamusa_LB1233.elec_water_USA}
-\title{module_gcamusa_LB1233.elec_water_USA}
+% Please edit documentation in R/zgcamusa_L1233.elec_water_USA.R
+\name{module_gcamusa_L1233.elec_water_USA}
+\alias{module_gcamusa_L1233.elec_water_USA}
+\title{module_gcamusa_L1233.elec_water_USA}
 \usage{
-module_gcamusa_LB1233.elec_water_USA(command, ...)
+module_gcamusa_L1233.elec_water_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1234.elec_gridregions_USA.Rd b/input/gcamdata/man/module_gcamusa_L1234.elec_gridregions_USA.Rd
similarity index 72%
rename from input/gcamdata/man/module_gcamusa_LB1234.elec_gridregions_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L1234.elec_gridregions_USA.Rd
index 6735e10a29..6f8d929b6a 100644
--- a/input/gcamdata/man/module_gcamusa_LB1234.elec_gridregions_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1234.elec_gridregions_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1234.elec_gridregions_USA.R
-\name{module_gcamusa_LB1234.elec_gridregions_USA}
-\alias{module_gcamusa_LB1234.elec_gridregions_USA}
-\title{module_gcamusa_LB1234.elec_gridregions_USA}
+% Please edit documentation in R/zgcamusa_L1234.elec_gridregions_USA.R
+\name{module_gcamusa_L1234.elec_gridregions_USA}
+\alias{module_gcamusa_L1234.elec_gridregions_USA}
+\title{module_gcamusa_L1234.elec_gridregions_USA}
 \usage{
-module_gcamusa_LB1234.elec_gridregions_USA(command, ...)
+module_gcamusa_L1234.elec_gridregions_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1235.elec_load_segments_USA.Rd b/input/gcamdata/man/module_gcamusa_L1235.elec_load_segments_USA.Rd
similarity index 76%
rename from input/gcamdata/man/module_gcamusa_LB1235.elec_load_segments_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L1235.elec_load_segments_USA.Rd
index 4a80caac99..c408042e82 100644
--- a/input/gcamdata/man/module_gcamusa_LB1235.elec_load_segments_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1235.elec_load_segments_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1235.elec_load_segments_USA.R
-\name{module_gcamusa_LB1235.elec_load_segments_USA}
-\alias{module_gcamusa_LB1235.elec_load_segments_USA}
-\title{module_gcamusa_LB1235.elec_load_segments_USA}
+% Please edit documentation in R/zgcamusa_L1235.elec_load_segments_USA.R
+\name{module_gcamusa_L1235.elec_load_segments_USA}
+\alias{module_gcamusa_L1235.elec_load_segments_USA}
+\title{module_gcamusa_L1235.elec_load_segments_USA}
 \usage{
-module_gcamusa_LB1235.elec_load_segments_USA(command, ...)
+module_gcamusa_L1235.elec_load_segments_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1236.elec_load_segments_solver_USA.Rd b/input/gcamdata/man/module_gcamusa_L1236.elec_load_segments_solver_USA.Rd
similarity index 72%
rename from input/gcamdata/man/module_gcamusa_LB1236.elec_load_segments_solver_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L1236.elec_load_segments_solver_USA.Rd
index 05dda936bf..0f1ba8f314 100644
--- a/input/gcamdata/man/module_gcamusa_LB1236.elec_load_segments_solver_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1236.elec_load_segments_solver_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1236.elec_load_segments_solver_USA.R
-\name{module_gcamusa_LB1236.elec_load_segments_solver_USA}
-\alias{module_gcamusa_LB1236.elec_load_segments_solver_USA}
-\title{module_gcamusa_LB1236.elec_load_segments_solver_USA}
+% Please edit documentation in R/zgcamusa_L1236.elec_load_segments_solver_USA.R
+\name{module_gcamusa_L1236.elec_load_segments_solver_USA}
+\alias{module_gcamusa_L1236.elec_load_segments_solver_USA}
+\title{module_gcamusa_L1236.elec_load_segments_solver_USA}
 \usage{
-module_gcamusa_LB1236.elec_load_segments_solver_USA(command, ...)
+module_gcamusa_L1236.elec_load_segments_solver_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB1239.elec_state_fractions_USA.Rd b/input/gcamdata/man/module_gcamusa_L1239.elec_state_fractions_USA.Rd
similarity index 74%
rename from input/gcamdata/man/module_gcamusa_LB1239.elec_state_fractions_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L1239.elec_state_fractions_USA.Rd
index 6aa9d2dfdb..c9a746ba66 100644
--- a/input/gcamdata/man/module_gcamusa_LB1239.elec_state_fractions_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1239.elec_state_fractions_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB1239.elec_state_fractions_USA.R
-\name{module_gcamusa_LB1239.elec_state_fractions_USA}
-\alias{module_gcamusa_LB1239.elec_state_fractions_USA}
-\title{module_gcamusa_LB1239.elec_state_fractions_USA}
+% Please edit documentation in R/zgcamusa_L1239.elec_state_fractions_USA.R
+\name{module_gcamusa_L1239.elec_state_fractions_USA}
+\alias{module_gcamusa_L1239.elec_state_fractions_USA}
+\title{module_gcamusa_L1239.elec_state_fractions_USA}
 \usage{
-module_gcamusa_LB1239.elec_state_fractions_USA(command, ...)
+module_gcamusa_L1239.elec_state_fractions_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LB126.Gas_ElecTD.Rd b/input/gcamdata/man/module_gcamusa_L126.Gas_ElecTD.Rd
similarity index 81%
rename from input/gcamdata/man/module_gcamusa_LB126.Gas_ElecTD.Rd
rename to input/gcamdata/man/module_gcamusa_L126.Gas_ElecTD.Rd
index 7c20921562..1054046f81 100644
--- a/input/gcamdata/man/module_gcamusa_LB126.Gas_ElecTD.Rd
+++ b/input/gcamdata/man/module_gcamusa_L126.Gas_ElecTD.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LB126.Gas_ElecTD.R
-\name{module_gcamusa_LB126.Gas_ElecTD}
-\alias{module_gcamusa_LB126.Gas_ElecTD}
-\title{module_gcamusa_LB126.Gas_ElecTD}
+% Please edit documentation in R/zgcamusa_L126.Gas_ElecTD.R
+\name{module_gcamusa_L126.Gas_ElecTD}
+\alias{module_gcamusa_L126.Gas_ElecTD}
+\title{module_gcamusa_L126.Gas_ElecTD}
 \usage{
-module_gcamusa_LB126.Gas_ElecTD(command, ...)
+module_gcamusa_L126.Gas_ElecTD(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA131.enduse_noEFW_USA.Rd b/input/gcamdata/man/module_gcamusa_L131.enduse_noEFW_USA.Rd
similarity index 65%
rename from input/gcamdata/man/module_gcamusa_LA131.enduse_noEFW_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L131.enduse_noEFW_USA.Rd
index d1297510eb..1d2b908298 100644
--- a/input/gcamdata/man/module_gcamusa_LA131.enduse_noEFW_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L131.enduse_noEFW_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA131.enduse_noEFW_USA.R
-\name{module_gcamusa_LA131.enduse_noEFW_USA}
-\alias{module_gcamusa_LA131.enduse_noEFW_USA}
-\title{module_gcamusa_LA131.enduse_noEFW_USA}
+% Please edit documentation in R/zgcamusa_L131.enduse_noEFW_USA.R
+\name{module_gcamusa_L131.enduse_noEFW_USA}
+\alias{module_gcamusa_L131.enduse_noEFW_USA}
+\title{module_gcamusa_L131.enduse_noEFW_USA}
 \usage{
-module_gcamusa_LA131.enduse_noEFW_USA(command, ...)
+module_gcamusa_L131.enduse_noEFW_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
@@ -23,7 +23,7 @@ Generate the following two tables:
 }
 }
 \details{
-This chunk performs the same steps as module_energy_LA131.enduse, but works from the energy balances prior to the
+This chunk performs the same steps as module_energy_L131.enduse, but works from the energy balances prior to the
 energy-for-water deductions, in order to generate information for GCAM-USA which does not have energy-for-water
 }
 \author{
diff --git a/input/gcamdata/man/module_gcamusa_LA132.industry_USA.Rd b/input/gcamdata/man/module_gcamusa_L132.industry_USA.Rd
similarity index 79%
rename from input/gcamdata/man/module_gcamusa_LA132.industry_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L132.industry_USA.Rd
index 80b200ac07..bf54e7e5b8 100644
--- a/input/gcamdata/man/module_gcamusa_LA132.industry_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L132.industry_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA132.industry_USA.R
-\name{module_gcamusa_LA132.industry_USA}
-\alias{module_gcamusa_LA132.industry_USA}
-\title{module_gcamusa_LA132.industry_USA}
+% Please edit documentation in R/zgcamusa_L132.industry_USA.R
+\name{module_gcamusa_L132.industry_USA}
+\alias{module_gcamusa_L132.industry_USA}
+\title{module_gcamusa_L132.industry_USA}
 \usage{
-module_gcamusa_LA132.industry_USA(command, ...)
+module_gcamusa_L132.industry_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L132.water_demand_industry.Rd b/input/gcamdata/man/module_gcamusa_L132.water_demand_industry.Rd
index afb1f57c80..fa692cc556 100644
--- a/input/gcamdata/man/module_gcamusa_L132.water_demand_industry.Rd
+++ b/input/gcamdata/man/module_gcamusa_L132.water_demand_industry.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L132.water_demand_industry_USA.R
+% Please edit documentation in R/zgcamusa_L132.water_demand_industry_USA.R
 \name{module_gcamusa_L132.water_demand_industry}
 \alias{module_gcamusa_L132.water_demand_industry}
 \title{module_gcamusa_L132.water_demand_industry}
diff --git a/input/gcamdata/man/module_gcamusa_LA1321.cement.Rd b/input/gcamdata/man/module_gcamusa_L1321.cement.Rd
similarity index 82%
rename from input/gcamdata/man/module_gcamusa_LA1321.cement.Rd
rename to input/gcamdata/man/module_gcamusa_L1321.cement.Rd
index b26f094e9a..e583da3d72 100644
--- a/input/gcamdata/man/module_gcamusa_LA1321.cement.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1321.cement.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1321.cement_USA.R
-\name{module_gcamusa_LA1321.cement}
-\alias{module_gcamusa_LA1321.cement}
-\title{module_gcamusa_LA1321.Cement}
+% Please edit documentation in R/zgcamusa_L1321.cement_USA.R
+\name{module_gcamusa_L1321.cement}
+\alias{module_gcamusa_L1321.cement}
+\title{module_gcamusa_L1321.Cement}
 \usage{
-module_gcamusa_LA1321.cement(command, ...)
+module_gcamusa_L1321.cement(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA1322.Fert.Rd b/input/gcamdata/man/module_gcamusa_L1322.Fert.Rd
similarity index 80%
rename from input/gcamdata/man/module_gcamusa_LA1322.Fert.Rd
rename to input/gcamdata/man/module_gcamusa_L1322.Fert.Rd
index d8740d8065..83c489d054 100644
--- a/input/gcamdata/man/module_gcamusa_LA1322.Fert.Rd
+++ b/input/gcamdata/man/module_gcamusa_L1322.Fert.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA1322.Fert.R
-\name{module_gcamusa_LA1322.Fert}
-\alias{module_gcamusa_LA1322.Fert}
-\title{module_gcamusa_LA1322.Fert}
+% Please edit documentation in R/zgcamusa_L1322.Fert.R
+\name{module_gcamusa_L1322.Fert}
+\alias{module_gcamusa_L1322.Fert}
+\title{module_gcamusa_L1322.Fert}
 \usage{
-module_gcamusa_LA1322.Fert(command, ...)
+module_gcamusa_L1322.Fert(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA142.Building_USA.Rd b/input/gcamdata/man/module_gcamusa_L142.Building_USA.Rd
similarity index 75%
rename from input/gcamdata/man/module_gcamusa_LA142.Building_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L142.Building_USA.Rd
index 2de2163f3b..34cb255171 100644
--- a/input/gcamdata/man/module_gcamusa_LA142.Building_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L142.Building_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA142.Building_USA.R
-\name{module_gcamusa_LA142.Building_USA}
-\alias{module_gcamusa_LA142.Building_USA}
-\title{module_gcamusa_LA142.Building_USA}
+% Please edit documentation in R/zgcamusa_L142.Building_USA.R
+\name{module_gcamusa_L142.Building_USA}
+\alias{module_gcamusa_L142.Building_USA}
+\title{module_gcamusa_L142.Building_USA}
 \usage{
-module_gcamusa_LA142.Building_USA(command, ...)
+module_gcamusa_L142.Building_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA143.HDDCDD.Rd b/input/gcamdata/man/module_gcamusa_L143.HDDCDD.Rd
similarity index 78%
rename from input/gcamdata/man/module_gcamusa_LA143.HDDCDD.Rd
rename to input/gcamdata/man/module_gcamusa_L143.HDDCDD.Rd
index 76fc8f8b86..ac2531c8d2 100644
--- a/input/gcamdata/man/module_gcamusa_LA143.HDDCDD.Rd
+++ b/input/gcamdata/man/module_gcamusa_L143.HDDCDD.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA143.HDDCDD_USA.R
-\name{module_gcamusa_LA143.HDDCDD}
-\alias{module_gcamusa_LA143.HDDCDD}
-\title{module_gcamusa_LA143.HDDCDD}
+% Please edit documentation in R/zgcamusa_L143.HDDCDD_USA.R
+\name{module_gcamusa_L143.HDDCDD}
+\alias{module_gcamusa_L143.HDDCDD}
+\title{module_gcamusa_L143.HDDCDD}
 \usage{
-module_gcamusa_LA143.HDDCDD(command, ...)
+module_gcamusa_L143.HDDCDD(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA144.Commercial.Rd b/input/gcamdata/man/module_gcamusa_L144.Commercial.Rd
similarity index 76%
rename from input/gcamdata/man/module_gcamusa_LA144.Commercial.Rd
rename to input/gcamdata/man/module_gcamusa_L144.Commercial.Rd
index d1261a52ae..1a55bb8a6f 100644
--- a/input/gcamdata/man/module_gcamusa_LA144.Commercial.Rd
+++ b/input/gcamdata/man/module_gcamusa_L144.Commercial.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA144.Commercial.R
-\name{module_gcamusa_LA144.Commercial}
-\alias{module_gcamusa_LA144.Commercial}
-\title{module_gcamusa_LA144.Commercial}
+% Please edit documentation in R/zgcamusa_L144.Commercial.R
+\name{module_gcamusa_L144.Commercial}
+\alias{module_gcamusa_L144.Commercial}
+\title{module_gcamusa_L144.Commercial}
 \usage{
-module_gcamusa_LA144.Commercial(command, ...)
+module_gcamusa_L144.Commercial(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA144.Residential.Rd b/input/gcamdata/man/module_gcamusa_L144.Residential.Rd
similarity index 77%
rename from input/gcamdata/man/module_gcamusa_LA144.Residential.Rd
rename to input/gcamdata/man/module_gcamusa_L144.Residential.Rd
index 8e59f74e1f..0c86ad6c9b 100644
--- a/input/gcamdata/man/module_gcamusa_LA144.Residential.Rd
+++ b/input/gcamdata/man/module_gcamusa_L144.Residential.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA144.Residential.R
-\name{module_gcamusa_LA144.Residential}
-\alias{module_gcamusa_LA144.Residential}
-\title{module_gcamusa_LA144.Residential}
+% Please edit documentation in R/zgcamusa_L144.Residential.R
+\name{module_gcamusa_L144.Residential}
+\alias{module_gcamusa_L144.Residential}
+\title{module_gcamusa_L144.Residential}
 \usage{
-module_gcamusa_LA144.Residential(command, ...)
+module_gcamusa_L144.Residential(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L145.water_demand_municipal.Rd b/input/gcamdata/man/module_gcamusa_L145.water_demand_municipal.Rd
index 82516deed6..353541d766 100644
--- a/input/gcamdata/man/module_gcamusa_L145.water_demand_municipal.Rd
+++ b/input/gcamdata/man/module_gcamusa_L145.water_demand_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L145.water_demand_municipal_USA.R
+% Please edit documentation in R/zgcamusa_L145.water_demand_municipal_USA.R
 \name{module_gcamusa_L145.water_demand_municipal}
 \alias{module_gcamusa_L145.water_demand_municipal}
 \title{module_gcamusa_L145.water_demand_municipal}
diff --git a/input/gcamdata/man/module_gcamusa_LA154.Transport.Rd b/input/gcamdata/man/module_gcamusa_L154.Transport.Rd
similarity index 80%
rename from input/gcamdata/man/module_gcamusa_LA154.Transport.Rd
rename to input/gcamdata/man/module_gcamusa_L154.Transport.Rd
index 4699b4dad0..b619d40629 100644
--- a/input/gcamdata/man/module_gcamusa_LA154.Transport.Rd
+++ b/input/gcamdata/man/module_gcamusa_L154.Transport.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA154.Transport.R
-\name{module_gcamusa_LA154.Transport}
-\alias{module_gcamusa_LA154.Transport}
-\title{module_gcamusa_LA154.Transport}
+% Please edit documentation in R/zgcamusa_L154.Transport.R
+\name{module_gcamusa_L154.Transport}
+\alias{module_gcamusa_L154.Transport}
+\title{module_gcamusa_L154.Transport}
 \usage{
-module_gcamusa_LA154.Transport(command, ...)
+module_gcamusa_L154.Transport(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_LA161.Cstorage.Rd b/input/gcamdata/man/module_gcamusa_L161.Cstorage.Rd
similarity index 73%
rename from input/gcamdata/man/module_gcamusa_LA161.Cstorage.Rd
rename to input/gcamdata/man/module_gcamusa_L161.Cstorage.Rd
index 3bf8468552..a8b65c6e72 100644
--- a/input/gcamdata/man/module_gcamusa_LA161.Cstorage.Rd
+++ b/input/gcamdata/man/module_gcamusa_L161.Cstorage.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA161.Cstorage_USA.R
-\name{module_gcamusa_LA161.Cstorage}
-\alias{module_gcamusa_LA161.Cstorage}
-\title{module_gcamusa_LA161.Cstorage}
+% Please edit documentation in R/zgcamusa_L161.Cstorage_USA.R
+\name{module_gcamusa_L161.Cstorage}
+\alias{module_gcamusa_L161.Cstorage}
+\title{module_gcamusa_L161.Cstorage}
 \usage{
-module_gcamusa_LA161.Cstorage(command, ...)
+module_gcamusa_L161.Cstorage(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L171.nonghg_trn_USA.Rd b/input/gcamdata/man/module_gcamusa_L171.nonghg_trn_USA.Rd
index 7e62651362..a1fe0c50d2 100644
--- a/input/gcamdata/man/module_gcamusa_L171.nonghg_trn_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L171.nonghg_trn_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L171.nonghg_trn_USA.R
+% Please edit documentation in R/zgcamusa_L171.nonghg_trn_USA.R
 \name{module_gcamusa_L171.nonghg_trn_USA}
 \alias{module_gcamusa_L171.nonghg_trn_USA}
 \title{module_gcamusa_L171.nonghg_trn_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L201.socioeconomics_USA.Rd b/input/gcamdata/man/module_gcamusa_L201.socioeconomics_USA.Rd
index e94d46617d..9e2f85863c 100644
--- a/input/gcamdata/man/module_gcamusa_L201.socioeconomics_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L201.socioeconomics_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L201.socioeconomics_USA.R
+% Please edit documentation in R/zgcamusa_L201.socioeconomics_USA.R
 \name{module_gcamusa_L201.socioeconomics_USA}
 \alias{module_gcamusa_L201.socioeconomics_USA}
 \title{module_gcamusa_L201.socioeconomics_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L203.water_td_USA.Rd b/input/gcamdata/man/module_gcamusa_L203.water_td_USA.Rd
index 3b31f5df3b..f422530520 100644
--- a/input/gcamdata/man/module_gcamusa_L203.water_td_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L203.water_td_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L203.water_td_USA.R
+% Please edit documentation in R/zgcamusa_L203.water_td_USA.R
 \name{module_gcamusa_L203.water_td_USA}
 \alias{module_gcamusa_L203.water_td_USA}
 \title{module_gcamusa_L203.water_td_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L210.resources_USA.Rd b/input/gcamdata/man/module_gcamusa_L210.resources_USA.Rd
index 6837e57a92..6e7e08098c 100644
--- a/input/gcamdata/man/module_gcamusa_L210.resources_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L210.resources_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L210.resources_USA.R
+% Please edit documentation in R/zgcamusa_L210.resources_USA.R
 \name{module_gcamusa_L210.resources_USA}
 \alias{module_gcamusa_L210.resources_USA}
 \title{module_gcamusa_L210.resources_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L222.en_transformation_USA.Rd b/input/gcamdata/man/module_gcamusa_L222.en_transformation_USA.Rd
index e80c6f6ff8..123455a282 100644
--- a/input/gcamdata/man/module_gcamusa_L222.en_transformation_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L222.en_transformation_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L222.en_transformation_USA.R
+% Please edit documentation in R/zgcamusa_L222.en_transformation_USA.R
 \name{module_gcamusa_L222.en_transformation_USA}
 \alias{module_gcamusa_L222.en_transformation_USA}
 \title{module_gcamusa_L222.en_transformation_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L223.electricity_USA.Rd b/input/gcamdata/man/module_gcamusa_L223.electricity_USA.Rd
index 22c763b273..5660c95532 100644
--- a/input/gcamdata/man/module_gcamusa_L223.electricity_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L223.electricity_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L223.electricity_USA.R
+% Please edit documentation in R/zgcamusa_L223.electricity_USA.R
 \name{module_gcamusa_L223.electricity_USA}
 \alias{module_gcamusa_L223.electricity_USA}
 \title{module_gcamusa_L223.electricity_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2231.nonewcoal_USA.Rd b/input/gcamdata/man/module_gcamusa_L2231.nonewcoal_USA.Rd
index 777613c2e2..87248b9061 100644
--- a/input/gcamdata/man/module_gcamusa_L2231.nonewcoal_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2231.nonewcoal_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2231.nonewcoal_USA.R
+% Please edit documentation in R/zgcamusa_L2231.nonewcoal_USA.R
 \name{module_gcamusa_L2231.nonewcoal_USA}
 \alias{module_gcamusa_L2231.nonewcoal_USA}
 \title{module_gcamusa_L2231.nonewcoal_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2232.electricity_FERC_USA.Rd b/input/gcamdata/man/module_gcamusa_L2232.electricity_FERC_USA.Rd
index b712da8f79..4b7099311d 100644
--- a/input/gcamdata/man/module_gcamusa_L2232.electricity_FERC_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2232.electricity_FERC_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2232.electricity_FERC_USA.R
+% Please edit documentation in R/zgcamusa_L2232.electricity_FERC_USA.R
 \name{module_gcamusa_L2232.electricity_FERC_USA}
 \alias{module_gcamusa_L2232.electricity_FERC_USA}
 \title{module_gcamusa_L2232.electricity_FERC_USA}
diff --git a/input/gcamdata/man/module_gcamusa_LA2233.elec_segments_water_USA.Rd b/input/gcamdata/man/module_gcamusa_L2233.elec_segments_water_USA.Rd
similarity index 91%
rename from input/gcamdata/man/module_gcamusa_LA2233.elec_segments_water_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L2233.elec_segments_water_USA.Rd
index 4b55104187..5ef30e632b 100644
--- a/input/gcamdata/man/module_gcamusa_LA2233.elec_segments_water_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2233.elec_segments_water_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_LA2233.elec_segments_water_USA.R
-\name{module_gcamusa_LA2233.elec_segments_water_USA}
-\alias{module_gcamusa_LA2233.elec_segments_water_USA}
-\title{module_gcamusa_LA2233.elec_segments_water_USA}
+% Please edit documentation in R/zgcamusa_L2233.elec_segments_water_USA.R
+\name{module_gcamusa_L2233.elec_segments_water_USA}
+\alias{module_gcamusa_L2233.elec_segments_water_USA}
+\title{module_gcamusa_L2233.elec_segments_water_USA}
 \usage{
-module_gcamusa_LA2233.elec_segments_water_USA(command, ...)
+module_gcamusa_L2233.elec_segments_water_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L2234.elec_segments_USA.Rd b/input/gcamdata/man/module_gcamusa_L2234.elec_segments_USA.Rd
index 19ab8dcdba..af06691b97 100644
--- a/input/gcamdata/man/module_gcamusa_L2234.elec_segments_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2234.elec_segments_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2234.elec_segments_USA.R
+% Please edit documentation in R/zgcamusa_L2234.elec_segments_USA.R
 \name{module_gcamusa_L2234.elec_segments_USA}
 \alias{module_gcamusa_L2234.elec_segments_USA}
 \title{module_gcamusa_L2234.elec_segments_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2235.elec_segments_FERC_USA.Rd b/input/gcamdata/man/module_gcamusa_L2235.elec_segments_FERC_USA.Rd
index 9db4f4d43a..d4862e5289 100644
--- a/input/gcamdata/man/module_gcamusa_L2235.elec_segments_FERC_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2235.elec_segments_FERC_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2235.elec_segments_FERC_USA.R
+% Please edit documentation in R/zgcamusa_L2235.elec_segments_FERC_USA.R
 \name{module_gcamusa_L2235.elec_segments_FERC_USA}
 \alias{module_gcamusa_L2235.elec_segments_FERC_USA}
 \title{module_gcamusa_L2235.elec_segments_FERC_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2236.elecS_ghg_emissions_USA.Rd b/input/gcamdata/man/module_gcamusa_L2236.elecS_ghg_emissions_USA.Rd
index d875e6211e..f90fc08993 100644
--- a/input/gcamdata/man/module_gcamusa_L2236.elecS_ghg_emissions_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2236.elecS_ghg_emissions_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2236.elecS_ghg_emissions_USA.R
+% Please edit documentation in R/zgcamusa_L2236.elecS_ghg_emissions_USA.R
 \name{module_gcamusa_L2236.elecS_ghg_emissions_USA}
 \alias{module_gcamusa_L2236.elecS_ghg_emissions_USA}
 \title{module_gcamusa_L2236.elecS_ghg_emissions_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2237.wind_reeds_USA.Rd b/input/gcamdata/man/module_gcamusa_L2237.wind_reeds_USA.Rd
index cc6debceb3..715121f043 100644
--- a/input/gcamdata/man/module_gcamusa_L2237.wind_reeds_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2237.wind_reeds_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2237.wind_reeds_USA.R
+% Please edit documentation in R/zgcamusa_L2237.wind_reeds_USA.R
 \name{module_gcamusa_L2237.wind_reeds_USA}
 \alias{module_gcamusa_L2237.wind_reeds_USA}
 \title{module_gcamusa_L2237.wind_reeds_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2238.PV_reeds_USA.Rd b/input/gcamdata/man/module_gcamusa_L2238.PV_reeds_USA.Rd
index 499eedd326..f8cacaa98d 100644
--- a/input/gcamdata/man/module_gcamusa_L2238.PV_reeds_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2238.PV_reeds_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2238.PV_reeds_USA.R
+% Please edit documentation in R/zgcamusa_L2238.PV_reeds_USA.R
 \name{module_gcamusa_L2238.PV_reeds_USA}
 \alias{module_gcamusa_L2238.PV_reeds_USA}
 \title{module_gcamusa_L2238.PV_reeds_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2239.CSP_reeds_USA.Rd b/input/gcamdata/man/module_gcamusa_L2239.CSP_reeds_USA.Rd
index d68d1d9940..f5f4898eba 100644
--- a/input/gcamdata/man/module_gcamusa_L2239.CSP_reeds_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2239.CSP_reeds_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2239.CSP_reeds_USA.R
+% Please edit documentation in R/zgcamusa_L2239.CSP_reeds_USA.R
 \name{module_gcamusa_L2239.CSP_reeds_USA}
 \alias{module_gcamusa_L2239.CSP_reeds_USA}
 \title{module_gcamusa_L2239.CSP_reeds_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2241.coal_retire_USA.Rd b/input/gcamdata/man/module_gcamusa_L2241.coal_retire_USA.Rd
index 02445890e1..4dfbb144d2 100644
--- a/input/gcamdata/man/module_gcamusa_L2241.coal_retire_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2241.coal_retire_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2241.coal_retire_USA.R
+% Please edit documentation in R/zgcamusa_L2241.coal_retire_USA.R
 \name{module_gcamusa_L2241.coal_retire_USA}
 \alias{module_gcamusa_L2241.coal_retire_USA}
 \title{module_gcamusa_L2241.coal_retire_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2242.elec_hydro_USA.Rd b/input/gcamdata/man/module_gcamusa_L2242.elec_hydro_USA.Rd
index f0c492e1f6..f0cc57a7ba 100644
--- a/input/gcamdata/man/module_gcamusa_L2242.elec_hydro_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2242.elec_hydro_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2242.elec_hydro_USA.R
+% Please edit documentation in R/zgcamusa_L2242.elec_hydro_USA.R
 \name{module_gcamusa_L2242.elec_hydro_USA}
 \alias{module_gcamusa_L2242.elec_hydro_USA}
 \title{module_gcamusa_L2242.elec_hydro_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2244.nuclear_USA.Rd b/input/gcamdata/man/module_gcamusa_L2244.nuclear_USA.Rd
index 535006a65a..e0553a0dc2 100644
--- a/input/gcamdata/man/module_gcamusa_L2244.nuclear_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2244.nuclear_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2244.nuclear_USA.R
+% Please edit documentation in R/zgcamusa_L2244.nuclear_USA.R
 \name{module_gcamusa_L2244.nuclear_USA}
 \alias{module_gcamusa_L2244.nuclear_USA}
 \title{module_gcamusa_L2244.nuclear_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2245.geothermal_fixed_USA.Rd b/input/gcamdata/man/module_gcamusa_L2245.geothermal_fixed_USA.Rd
index aaf4418c9f..15e0b82306 100644
--- a/input/gcamdata/man/module_gcamusa_L2245.geothermal_fixed_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2245.geothermal_fixed_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2245.geothermal_fixed_USA.R
+% Please edit documentation in R/zgcamusa_L2245.geothermal_fixed_USA.R
 \name{module_gcamusa_L2245.geothermal_fixed_USA}
 \alias{module_gcamusa_L2245.geothermal_fixed_USA}
 \title{module_gcamusa_L2245.geothermal_fixed_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2247.elecS_tech_costs_USA.Rd b/input/gcamdata/man/module_gcamusa_L2247.elecS_tech_costs_USA.Rd
index 16bead18ec..d03e935192 100644
--- a/input/gcamdata/man/module_gcamusa_L2247.elecS_tech_costs_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2247.elecS_tech_costs_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2247.elecS_tech_costs_USA.R
+% Please edit documentation in R/zgcamusa_L2247.elecS_tech_costs_USA.R
 \name{module_gcamusa_L2247.elecS_tech_costs_USA}
 \alias{module_gcamusa_L2247.elecS_tech_costs_USA}
 \title{module_gcamusa_L2247.elecS_tech_costs_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L225.hydrogen_USA.Rd b/input/gcamdata/man/module_gcamusa_L225.hydrogen_USA.Rd
index d58fa153c3..5e93a6c4a7 100644
--- a/input/gcamdata/man/module_gcamusa_L225.hydrogen_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L225.hydrogen_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L225.hydrogen_USA.R
+% Please edit documentation in R/zgcamusa_L225.hydrogen_USA.R
 \name{module_gcamusa_L225.hydrogen_USA}
 \alias{module_gcamusa_L225.hydrogen_USA}
 \title{module_gcamusa_L225.hydrogen_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L226.en_distribution_USA.Rd b/input/gcamdata/man/module_gcamusa_L226.en_distribution_USA.Rd
index c3d0051b4e..f0ce0c899d 100644
--- a/input/gcamdata/man/module_gcamusa_L226.en_distribution_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L226.en_distribution_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L226.en_distribution_USA.R
+% Please edit documentation in R/zgcamusa_L226.en_distribution_USA.R
 \name{module_gcamusa_L226.en_distribution_USA}
 \alias{module_gcamusa_L226.en_distribution_USA}
 \title{module_gcamusa_L226.en_distribution_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2261.regional_biomass_USA.Rd b/input/gcamdata/man/module_gcamusa_L2261.regional_biomass_USA.Rd
index e4aa89d00d..8a1e1f06db 100644
--- a/input/gcamdata/man/module_gcamusa_L2261.regional_biomass_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2261.regional_biomass_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2261.regional_biomass_USA.R
+% Please edit documentation in R/zgcamusa_L2261.regional_biomass_USA.R
 \name{module_gcamusa_L2261.regional_biomass_USA}
 \alias{module_gcamusa_L2261.regional_biomass_USA}
 \title{module_gcamusa_L2261.regional_biomass_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L231.proc_sector_USA.Rd b/input/gcamdata/man/module_gcamusa_L231.proc_sector_USA.Rd
index 0ee5ecb61f..ed648b925c 100644
--- a/input/gcamdata/man/module_gcamusa_L231.proc_sector_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L231.proc_sector_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L231.proc_sector_USA.R
+% Please edit documentation in R/zgcamusa_L231.proc_sector_USA.R
 \name{module_gcamusa_L231.proc_sector_USA}
 \alias{module_gcamusa_L231.proc_sector_USA}
 \title{module_gcamusa_L231.proc_sector_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L232.industry_USA.Rd b/input/gcamdata/man/module_gcamusa_L232.industry_USA.Rd
index 14420f8f5e..d47aaca71e 100644
--- a/input/gcamdata/man/module_gcamusa_L232.industry_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L232.industry_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L232.industry_USA.R
+% Please edit documentation in R/zgcamusa_L232.industry_USA.R
 \name{module_gcamusa_L232.industry_USA}
 \alias{module_gcamusa_L232.industry_USA}
 \title{module_gcamusa_L232.industry_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L232.water_demand_industry.Rd b/input/gcamdata/man/module_gcamusa_L232.water_demand_industry.Rd
index 82afa42f98..d379e43006 100644
--- a/input/gcamdata/man/module_gcamusa_L232.water_demand_industry.Rd
+++ b/input/gcamdata/man/module_gcamusa_L232.water_demand_industry.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L232.water_demand_industry_USA.R
+% Please edit documentation in R/zgcamusa_L232.water_demand_industry_USA.R
 \name{module_gcamusa_L232.water_demand_industry}
 \alias{module_gcamusa_L232.water_demand_industry}
 \title{module_gcamusa_L232.water_demand_industry}
diff --git a/input/gcamdata/man/module_gcamusa_L2321.cement_USA.Rd b/input/gcamdata/man/module_gcamusa_L2321.cement_USA.Rd
index c0074bde9f..9b6e4c1b3d 100644
--- a/input/gcamdata/man/module_gcamusa_L2321.cement_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2321.cement_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2321.cement_USA.R
+% Please edit documentation in R/zgcamusa_L2321.cement_USA.R
 \name{module_gcamusa_L2321.cement_USA}
 \alias{module_gcamusa_L2321.cement_USA}
 \title{module_gcamusa_L2321.cement_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2322.Fert_USA.Rd b/input/gcamdata/man/module_gcamusa_L2322.Fert_USA.Rd
index b4a771f062..15dcedebb9 100644
--- a/input/gcamdata/man/module_gcamusa_L2322.Fert_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2322.Fert_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2322.Fert_USA.R
+% Please edit documentation in R/zgcamusa_L2322.Fert_USA.R
 \name{module_gcamusa_L2322.Fert_USA}
 \alias{module_gcamusa_L2322.Fert_USA}
 \title{module_gcamusa_L2322.Fert_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2322.industry_vintage_USA.Rd b/input/gcamdata/man/module_gcamusa_L2322.industry_vintage_USA.Rd
index 0234b29078..342db847d5 100644
--- a/input/gcamdata/man/module_gcamusa_L2322.industry_vintage_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2322.industry_vintage_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2322.industry_vintage_USA.R
+% Please edit documentation in R/zgcamusa_L2322.industry_vintage_USA.R
 \name{module_gcamusa_L2322.industry_vintage_USA}
 \alias{module_gcamusa_L2322.industry_vintage_USA}
 \title{module_gcamusa_L2322.industry_vintage_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L244.building_USA.Rd b/input/gcamdata/man/module_gcamusa_L244.building_USA.Rd
index 4e76c9e885..f05b724955 100644
--- a/input/gcamdata/man/module_gcamusa_L244.building_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L244.building_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L244.building_USA.R
+% Please edit documentation in R/zgcamusa_L244.building_USA.R
 \name{module_gcamusa_L244.building_USA}
 \alias{module_gcamusa_L244.building_USA}
 \title{module_gcamusa_L244.building_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L245.water_demand_municipal.Rd b/input/gcamdata/man/module_gcamusa_L245.water_demand_municipal.Rd
index bb65bac118..abfdcf2bf0 100644
--- a/input/gcamdata/man/module_gcamusa_L245.water_demand_municipal.Rd
+++ b/input/gcamdata/man/module_gcamusa_L245.water_demand_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L245.water_demand_municipal_USA.R
+% Please edit documentation in R/zgcamusa_L245.water_demand_municipal_USA.R
 \name{module_gcamusa_L245.water_demand_municipal}
 \alias{module_gcamusa_L245.water_demand_municipal}
 \title{module_gcamusa_L245.water_demand_municipal}
diff --git a/input/gcamdata/man/module_gcamusa_L254.transportation_USA.Rd b/input/gcamdata/man/module_gcamusa_L254.transportation_USA.Rd
index 533fd9f97a..b773c0731e 100644
--- a/input/gcamdata/man/module_gcamusa_L254.transportation_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L254.transportation_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L254.transportation_USA.R
+% Please edit documentation in R/zgcamusa_L254.transportation_USA.R
 \name{module_gcamusa_L254.transportation_USA}
 \alias{module_gcamusa_L254.transportation_USA}
 \title{module_gcamusa_L254.transportation_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L261.carbon_storage_USA.Rd b/input/gcamdata/man/module_gcamusa_L261.carbon_storage_USA.Rd
index d605f62b14..05f04f7346 100644
--- a/input/gcamdata/man/module_gcamusa_L261.carbon_storage_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L261.carbon_storage_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L261.carbon_storage_USA.R
+% Please edit documentation in R/zgcamusa_L261.carbon_storage_USA.R
 \name{module_gcamusa_L261.carbon_storage_USA}
 \alias{module_gcamusa_L261.carbon_storage_USA}
 \title{module_gcamusa_L261.carbon_storage_USA}
diff --git a/input/gcamdata/man/module_gcamdata_L262.dac_USA.Rd b/input/gcamdata/man/module_gcamusa_L262.dac_USA.Rd
similarity index 88%
rename from input/gcamdata/man/module_gcamdata_L262.dac_USA.Rd
rename to input/gcamdata/man/module_gcamusa_L262.dac_USA.Rd
index a55721a6a6..27d6b715d9 100644
--- a/input/gcamdata/man/module_gcamdata_L262.dac_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L262.dac_USA.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L262.dac_USA.R
-\name{module_gcamdata_L262.dac_USA}
-\alias{module_gcamdata_L262.dac_USA}
-\title{module_gcamdata_L262.dac_USA}
+% Please edit documentation in R/zgcamusa_L262.dac_USA.R
+\name{module_gcamusa_L262.dac_USA}
+\alias{module_gcamusa_L262.dac_USA}
+\title{module_gcamusa_L262.dac_USA}
 \usage{
-module_gcamdata_L262.dac_USA(command, ...)
+module_gcamusa_L262.dac_USA(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_gcamusa_L270.limits_USA.Rd b/input/gcamdata/man/module_gcamusa_L270.limits_USA.Rd
index 822ea1d1d6..2b629413c6 100644
--- a/input/gcamdata/man/module_gcamusa_L270.limits_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L270.limits_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L270.limits_USA.R
+% Please edit documentation in R/zgcamusa_L270.limits_USA.R
 \name{module_gcamusa_L270.limits_USA}
 \alias{module_gcamusa_L270.limits_USA}
 \title{module_gcamusa_L270.limits_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L271.ghg_trn_USA.Rd b/input/gcamdata/man/module_gcamusa_L271.ghg_trn_USA.Rd
index 05a1235fe3..310fe4a6ab 100644
--- a/input/gcamdata/man/module_gcamusa_L271.ghg_trn_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L271.ghg_trn_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L271.ghg_trn_USA.R
+% Please edit documentation in R/zgcamusa_L271.ghg_trn_USA.R
 \name{module_gcamusa_L271.ghg_trn_USA}
 \alias{module_gcamusa_L271.ghg_trn_USA}
 \title{module_gcamusa_L271.ghg_trn_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L271.nonghg_trn_USA.Rd b/input/gcamdata/man/module_gcamusa_L271.nonghg_trn_USA.Rd
index 296b335f3e..88c906e7c0 100644
--- a/input/gcamdata/man/module_gcamusa_L271.nonghg_trn_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L271.nonghg_trn_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L271.nonghg_trn_USA.R
+% Please edit documentation in R/zgcamusa_L271.nonghg_trn_USA.R
 \name{module_gcamusa_L271.nonghg_trn_USA}
 \alias{module_gcamusa_L271.nonghg_trn_USA}
 \title{module_gcamusa_L271.nonghg_trn_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L272.elc_nonghg_USA.Rd b/input/gcamdata/man/module_gcamusa_L272.elc_nonghg_USA.Rd
index 8d05fd1b57..a53063d3b9 100644
--- a/input/gcamdata/man/module_gcamusa_L272.elc_nonghg_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L272.elc_nonghg_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L272.nonghg_elc_USA.R
+% Please edit documentation in R/zgcamusa_L272.nonghg_elc_USA.R
 \name{module_gcamusa_L272.elc_nonghg_USA}
 \alias{module_gcamusa_L272.elc_nonghg_USA}
 \title{module_gcamusa_L272.elc_nonghg_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L2722.nonghg_elc_linear_control_USA.Rd b/input/gcamdata/man/module_gcamusa_L2722.nonghg_elc_linear_control_USA.Rd
index ab9c7139ae..d8716af018 100644
--- a/input/gcamdata/man/module_gcamusa_L2722.nonghg_elc_linear_control_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L2722.nonghg_elc_linear_control_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2722.nonghg_elc_linear_control_USA.R
+% Please edit documentation in R/zgcamusa_L2722.nonghg_elc_linear_control_USA.R
 \name{module_gcamusa_L2722.nonghg_elc_linear_control_USA}
 \alias{module_gcamusa_L2722.nonghg_elc_linear_control_USA}
 \title{module_gcamusa_L2722.nonghg_elc_linear_control_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L273.en_ghg_emissions_USA.Rd b/input/gcamdata/man/module_gcamusa_L273.en_ghg_emissions_USA.Rd
index e8816fc6e7..a515343896 100644
--- a/input/gcamdata/man/module_gcamusa_L273.en_ghg_emissions_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L273.en_ghg_emissions_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L273.en_ghg_emissions_USA.R
+% Please edit documentation in R/zgcamusa_L273.en_ghg_emissions_USA.R
 \name{module_gcamusa_L273.en_ghg_emissions_USA}
 \alias{module_gcamusa_L273.en_ghg_emissions_USA}
 \title{module_gcamusa_L273.en_ghg_emissions_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L273.nonghg_refinery_USA.Rd b/input/gcamdata/man/module_gcamusa_L273.nonghg_refinery_USA.Rd
index cf8ac89449..1bae15cdac 100644
--- a/input/gcamdata/man/module_gcamusa_L273.nonghg_refinery_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L273.nonghg_refinery_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L273.nonghg_refinery_USA.R
+% Please edit documentation in R/zgcamusa_L273.nonghg_refinery_USA.R
 \name{module_gcamusa_L273.nonghg_refinery_USA}
 \alias{module_gcamusa_L273.nonghg_refinery_USA}
 \title{module_gcamusa_L273.nonghg_refinery_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L274.nonghg_bld_USA.Rd b/input/gcamdata/man/module_gcamusa_L274.nonghg_bld_USA.Rd
index daa46632f0..a2e65de104 100644
--- a/input/gcamdata/man/module_gcamusa_L274.nonghg_bld_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L274.nonghg_bld_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L274.nonghg_bld_USA.R
+% Please edit documentation in R/zgcamusa_L274.nonghg_bld_USA.R
 \name{module_gcamusa_L274.nonghg_bld_USA}
 \alias{module_gcamusa_L274.nonghg_bld_USA}
 \title{module_gcamusa_L274.nonghg_bld_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L275.indenergy_nonghg_USA.Rd b/input/gcamdata/man/module_gcamusa_L275.indenergy_nonghg_USA.Rd
index 24d1f12b78..33211dcfb7 100644
--- a/input/gcamdata/man/module_gcamusa_L275.indenergy_nonghg_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L275.indenergy_nonghg_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L275.nonghg_indenergy_USA.R
+% Please edit documentation in R/zgcamusa_L275.nonghg_indenergy_USA.R
 \name{module_gcamusa_L275.indenergy_nonghg_USA}
 \alias{module_gcamusa_L275.indenergy_nonghg_USA}
 \title{module_gcamusa_L275.indenergy_nonghg_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L276.nonghg_othertrn_USA.Rd b/input/gcamdata/man/module_gcamusa_L276.nonghg_othertrn_USA.Rd
index 66585427a9..e8efb7d996 100644
--- a/input/gcamdata/man/module_gcamusa_L276.nonghg_othertrn_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L276.nonghg_othertrn_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L276.nonghg_othertrn_USA.R
+% Please edit documentation in R/zgcamusa_L276.nonghg_othertrn_USA.R
 \name{module_gcamusa_L276.nonghg_othertrn_USA}
 \alias{module_gcamusa_L276.nonghg_othertrn_USA}
 \title{module_gcamusa_L276.nonghg_othertrn_USA}
diff --git a/input/gcamdata/man/module_gcamusa_L277.nonghg_prc_USA.Rd b/input/gcamdata/man/module_gcamusa_L277.nonghg_prc_USA.Rd
index b311cef51e..239b7a0e9a 100644
--- a/input/gcamdata/man/module_gcamusa_L277.nonghg_prc_USA.Rd
+++ b/input/gcamdata/man/module_gcamusa_L277.nonghg_prc_USA.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L277.nonghg_prc_USA.R
+% Please edit documentation in R/zgcamusa_L277.nonghg_prc_USA.R
 \name{module_gcamusa_L277.nonghg_prc_USA}
 \alias{module_gcamusa_L277.nonghg_prc_USA}
 \title{module_gcamusa_L277.nonghg_prc_USA}
diff --git a/input/gcamdata/man/module_gcamusa_batch_Cstorage_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_Cstorage_USA_xml.Rd
index 0fa4389402..dddddbf885 100644
--- a/input/gcamdata/man/module_gcamusa_batch_Cstorage_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_Cstorage_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Cstorage_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_Cstorage_USA_xml.R
 \name{module_gcamusa_batch_Cstorage_USA_xml}
 \alias{module_gcamusa_batch_Cstorage_USA_xml}
 \title{module_gcamusa_batch_Cstorage_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_Fert_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_Fert_USA_xml.Rd
index dc5c625d7e..fdadf3b561 100644
--- a/input/gcamdata/man/module_gcamusa_batch_Fert_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_Fert_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_Fert_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_Fert_USA_xml.R
 \name{module_gcamusa_batch_Fert_USA_xml}
 \alias{module_gcamusa_batch_Fert_USA_xml}
 \title{module_gcamusa_batch_Fert_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml.Rd
index 4ab33d125d..787c83d2f2 100644
--- a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_HDDCDD_A2_GFDL_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_HDDCDD_A2_GFDL_USA_xml.R
 \name{module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml}
 \alias{module_gcamusa_batch_HDDCDD_A2_GFDL_USA_xml}
 \title{module_gcamusa_batch_HDDCDD_A2_GFDL_USA.xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml.Rd
index 338f0efefb..6879bddecb 100644
--- a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_HDDCDD_AEO_2015_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_HDDCDD_AEO_2015_USA_xml.R
 \name{module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml}
 \alias{module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml}
 \title{module_gcamusa_batch_HDDCDD_AEO_2015_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_constdds_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_constdds_USA_xml.Rd
index ae01d72d9f..4dbdafd27b 100644
--- a/input/gcamdata/man/module_gcamusa_batch_HDDCDD_constdds_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_HDDCDD_constdds_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_HDDCDD_constdds_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_HDDCDD_constdds_USA_xml.R
 \name{module_gcamusa_batch_HDDCDD_constdds_USA_xml}
 \alias{module_gcamusa_batch_HDDCDD_constdds_USA_xml}
 \title{module_gcamusa_batch_HDDCDD_constdds_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_bld_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_bld_emissions_USA_xml.Rd
index 07a24f6283..085144b3f9 100644
--- a/input/gcamdata/man/module_gcamusa_batch_bld_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_bld_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_bld_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_bld_emissions_USA_xml.R
 \name{module_gcamusa_batch_bld_emissions_USA_xml}
 \alias{module_gcamusa_batch_bld_emissions_USA_xml}
 \title{module_gcamusa_batch_bld_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_building_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_building_USA_xml.Rd
index c8c1974086..0a5f872ede 100644
--- a/input/gcamdata/man/module_gcamusa_batch_building_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_building_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_building_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_building_USA_xml.R
 \name{module_gcamusa_batch_building_USA_xml}
 \alias{module_gcamusa_batch_building_USA_xml}
 \title{module_gcamusa_batch_building_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_cement_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_cement_USA_xml.Rd
index 4dc35feab1..16c60f6fb2 100644
--- a/input/gcamdata/man/module_gcamusa_batch_cement_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_cement_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_cement_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_cement_USA_xml.R
 \name{module_gcamusa_batch_cement_USA_xml}
 \alias{module_gcamusa_batch_cement_USA_xml}
 \title{module_gcamusa_batch_cement_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_coal_delay_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_coal_delay_USA_xml.Rd
index ea0978cdc3..3c9c0564f3 100644
--- a/input/gcamdata/man/module_gcamusa_batch_coal_delay_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_coal_delay_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_coal_delay_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_coal_delay_USA_xml.R
 \name{module_gcamusa_batch_coal_delay_USA_xml}
 \alias{module_gcamusa_batch_coal_delay_USA_xml}
 \title{module_gcamusa_batch_coal_delay_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_coal_retire_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_coal_retire_USA_xml.Rd
index 746f25ae36..4d62ec5b6d 100644
--- a/input/gcamdata/man/module_gcamusa_batch_coal_retire_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_coal_retire_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_coal_retire_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_coal_retire_USA_xml.R
 \name{module_gcamusa_batch_coal_retire_USA_xml}
 \alias{module_gcamusa_batch_coal_retire_USA_xml}
 \title{module_gcamusa_batch_coal_retire_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_dac_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_dac_USA_xml.Rd
index e299fa6209..b9016efef8 100644
--- a/input/gcamdata/man/module_gcamusa_batch_dac_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_dac_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_dac_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_dac_USA_xml.R
 \name{module_gcamusa_batch_dac_USA_xml}
 \alias{module_gcamusa_batch_dac_USA_xml}
 \title{module_gcamusa_batch_dac_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elc_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elc_emissions_USA_xml.Rd
index 751097e7fc..e8e46e38d8 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elc_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elc_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elc_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_elc_emissions_USA_xml.R
 \name{module_gcamusa_batch_elc_emissions_USA_xml}
 \alias{module_gcamusa_batch_elc_emissions_USA_xml}
 \title{module_gcamusa_batch_elc_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_itc_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_itc_xml.Rd
index 2a203f903d..c9e207c6fc 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_itc_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_itc_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elecS_costs_USA_itc_xml.R
+% Please edit documentation in R/zgcamusa_batch_elecS_costs_USA_itc_xml.R
 \name{module_gcamusa_batch_elecS_costs_USA_itc_xml}
 \alias{module_gcamusa_batch_elecS_costs_USA_itc_xml}
 \title{module_gcamusa_batch_elecS_costs_USA_itc_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_ptc_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_ptc_xml.Rd
index e0510a77cb..00f63ab9ff 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_ptc_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elecS_costs_USA_ptc_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elecS_costs_USA_ptc_xml.R
+% Please edit documentation in R/zgcamusa_batch_elecS_costs_USA_ptc_xml.R
 \name{module_gcamusa_batch_elecS_costs_USA_ptc_xml}
 \alias{module_gcamusa_batch_elecS_costs_USA_ptc_xml}
 \title{module_gcamusa_batch_elecS_costs_USA_ptc_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml.Rd
index 61c20e2f64..6e356c077c 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml.Rd
@@ -1,6 +1,6 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in
-%   R/zchunk_batch_elecS_ghg_emissions_water_USA_xml.R
+%   R/zgcamusa_batch_elecS_ghg_emissions_water_USA_xml.R
 \name{module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml}
 \alias{module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml}
 \title{module_gcamusa_batch_elecS_ghg_emissions_water_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elec_hydro_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elec_hydro_USA_xml.Rd
index b3edb04100..0a433e0962 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elec_hydro_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elec_hydro_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elec_hydro_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_elec_hydro_USA_xml.R
 \name{module_gcamusa_batch_elec_hydro_USA_xml}
 \alias{module_gcamusa_batch_elec_hydro_USA_xml}
 \title{module_gcamusa_batch_elec_hydro_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elec_segments_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elec_segments_USA_xml.Rd
index e999ac8737..712087cf49 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elec_segments_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elec_segments_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elec_segments_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_elec_segments_USA_xml.R
 \name{module_gcamusa_batch_elec_segments_USA_xml}
 \alias{module_gcamusa_batch_elec_segments_USA_xml}
 \title{module_gcamusa_batch_elec_segments_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_elec_segments_water_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_elec_segments_water_USA_xml.Rd
index e4807798ba..8841d1a64d 100644
--- a/input/gcamdata/man/module_gcamusa_batch_elec_segments_water_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_elec_segments_water_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_elec_segments_water_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_elec_segments_water_USA_xml.R
 \name{module_gcamusa_batch_elec_segments_water_USA_xml}
 \alias{module_gcamusa_batch_elec_segments_water_USA_xml}
 \title{module_gcamusa_batch_elec_segments_water_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_electd_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_electd_USA_xml.Rd
index 32c934847e..6c5891c277 100644
--- a/input/gcamdata/man/module_gcamusa_batch_electd_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_electd_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_electd_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_electd_USA_xml.R
 \name{module_gcamusa_batch_electd_USA_xml}
 \alias{module_gcamusa_batch_electd_USA_xml}
 \title{module_gcamusa_batch_electd_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_electricity_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_electricity_USA_xml.Rd
index ac4cb14ce4..d4bdfc0c8a 100644
--- a/input/gcamdata/man/module_gcamusa_batch_electricity_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_electricity_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_electricity_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_electricity_USA_xml.R
 \name{module_gcamusa_batch_electricity_USA_xml}
 \alias{module_gcamusa_batch_electricity_USA_xml}
 \title{module_gcamusa_batch_electricity_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_en_prices_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_en_prices_USA_xml.Rd
index 7deb7d5e1a..04fa366ccf 100644
--- a/input/gcamdata/man/module_gcamusa_batch_en_prices_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_en_prices_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_prices_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_en_prices_USA_xml.R
 \name{module_gcamusa_batch_en_prices_USA_xml}
 \alias{module_gcamusa_batch_en_prices_USA_xml}
 \title{module_gcamusa_batch_en_prices_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_en_transformation_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_en_transformation_USA_xml.Rd
index 1fa2afcfff..0947038995 100644
--- a/input/gcamdata/man/module_gcamusa_batch_en_transformation_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_en_transformation_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_en_transformation_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_en_transformation_USA_xml.R
 \name{module_gcamusa_batch_en_transformation_USA_xml}
 \alias{module_gcamusa_batch_en_transformation_USA_xml}
 \title{module_gcamusa_batch_en_transformation_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_geothermal_fixed_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_geothermal_fixed_USA_xml.Rd
index 000ee2b5a5..261b7984a9 100644
--- a/input/gcamdata/man/module_gcamusa_batch_geothermal_fixed_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_geothermal_fixed_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_geothermal_fixed_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_geothermal_fixed_USA_xml.R
 \name{module_gcamusa_batch_geothermal_fixed_USA_xml}
 \alias{module_gcamusa_batch_geothermal_fixed_USA_xml}
 \title{module_gcamusa_batch_geothermal_fixed_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_ghg_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_ghg_emissions_USA_xml.Rd
index 853d5dee8c..180ab7b3c1 100644
--- a/input/gcamdata/man/module_gcamusa_batch_ghg_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_ghg_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ghg_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_ghg_emissions_USA_xml.R
 \name{module_gcamusa_batch_ghg_emissions_USA_xml}
 \alias{module_gcamusa_batch_ghg_emissions_USA_xml}
 \title{module_gcamusa_batch_ghg_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_hydrogen_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_hydrogen_USA_xml.Rd
index b24a96bc53..32ff6893a0 100644
--- a/input/gcamdata/man/module_gcamusa_batch_hydrogen_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_hydrogen_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_hydrogen_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_hydrogen_USA_xml.R
 \name{module_gcamusa_batch_hydrogen_USA_xml}
 \alias{module_gcamusa_batch_hydrogen_USA_xml}
 \title{module_gcamusa_batch_hydrogen_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_ind_urb_proc_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_ind_urb_proc_emissions_USA_xml.Rd
index 2f82d5fd0c..e1c1fa26cc 100644
--- a/input/gcamdata/man/module_gcamusa_batch_ind_urb_proc_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_ind_urb_proc_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_ind_urb_proc_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_ind_urb_proc_emissions_USA_xml.R
 \name{module_gcamusa_batch_ind_urb_proc_emissions_USA_xml}
 \alias{module_gcamusa_batch_ind_urb_proc_emissions_USA_xml}
 \title{module_gcamusa_batch_ind_urb_proc_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_ind_urb_processing_sectors_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_ind_urb_processing_sectors_USA_xml.Rd
index 42474a5749..d69485f1c8 100644
--- a/input/gcamdata/man/module_gcamusa_batch_ind_urb_processing_sectors_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_ind_urb_processing_sectors_USA_xml.Rd
@@ -1,6 +1,6 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in
-%   R/zchunk_batch_ind_urb_processing_sectors_USA_xml.R
+%   R/zgcamusa_batch_ind_urb_processing_sectors_USA_xml.R
 \name{module_gcamusa_batch_ind_urb_processing_sectors_USA_xml}
 \alias{module_gcamusa_batch_ind_urb_processing_sectors_USA_xml}
 \title{module_gcamusa_batch_ind_urb_processing_sectors_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_indenergy_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_indenergy_emissions_USA_xml.Rd
index 47a08ba8f1..392720fcd4 100644
--- a/input/gcamdata/man/module_gcamusa_batch_indenergy_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_indenergy_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_indenergy_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_indenergy_emissions_USA_xml.R
 \name{module_gcamusa_batch_indenergy_emissions_USA_xml}
 \alias{module_gcamusa_batch_indenergy_emissions_USA_xml}
 \title{module_gcamusa_batch_indenergy_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_industry_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_industry_USA_xml.Rd
index 741eff5360..ba136a77d3 100644
--- a/input/gcamdata/man/module_gcamusa_batch_industry_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_industry_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_industry_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_industry_USA_xml.R
 \name{module_gcamusa_batch_industry_USA_xml}
 \alias{module_gcamusa_batch_industry_USA_xml}
 \title{module_gcamusa_batch_industry_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_industry_vintage_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_industry_vintage_USA_xml.Rd
index 3cf944e2bb..1ae7369d0b 100644
--- a/input/gcamdata/man/module_gcamusa_batch_industry_vintage_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_industry_vintage_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_industry_vintage_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_industry_vintage_USA_xml.R
 \name{module_gcamusa_batch_industry_vintage_USA_xml}
 \alias{module_gcamusa_batch_industry_vintage_USA_xml}
 \title{module_gcamusa_batch_industry_vintage_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_liquids_limits_usa_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_liquids_limits_usa_xml.Rd
index 1c6f3c9849..e7dabded60 100644
--- a/input/gcamdata/man/module_gcamusa_batch_liquids_limits_usa_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_liquids_limits_usa_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_liquids_limits_usa_xml.R
+% Please edit documentation in R/zgcamusa_batch_liquids_limits_usa_xml.R
 \name{module_gcamusa_batch_liquids_limits_usa_xml}
 \alias{module_gcamusa_batch_liquids_limits_usa_xml}
 \title{module_gcamusa_batch_liquids_limits_usa_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_negative_emissions_budget_usa_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_negative_emissions_budget_usa_xml.Rd
index 3d00b8f074..8711e19fb0 100644
--- a/input/gcamdata/man/module_gcamusa_batch_negative_emissions_budget_usa_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_negative_emissions_budget_usa_xml.Rd
@@ -1,6 +1,6 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in
-%   R/zchunk_batch_negative_emissions_budget_usa_xml.R
+%   R/zgcamusa_batch_negative_emissions_budget_usa_xml.R
 \name{module_gcamusa_batch_negative_emissions_budget_usa_xml}
 \alias{module_gcamusa_batch_negative_emissions_budget_usa_xml}
 \title{module_gcamusa_batch_negative_emissions_budget_usa_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_nonewcoal_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_nonewcoal_USA_xml.Rd
index 000b482e4a..981497d113 100644
--- a/input/gcamdata/man/module_gcamusa_batch_nonewcoal_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_nonewcoal_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_nonewcoal_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_nonewcoal_USA_xml.R
 \name{module_gcamusa_batch_nonewcoal_USA_xml}
 \alias{module_gcamusa_batch_nonewcoal_USA_xml}
 \title{module_gcamusa_batch_nonewcoal_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_nuclear_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_nuclear_USA_xml.Rd
index 5706345b0e..1308424c92 100644
--- a/input/gcamdata/man/module_gcamusa_batch_nuclear_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_nuclear_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_nuclear_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_nuclear_USA_xml.R
 \name{module_gcamusa_batch_nuclear_USA_xml}
 \alias{module_gcamusa_batch_nuclear_USA_xml}
 \title{module_gcamusa_batch_nuclear_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_othertrn_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_othertrn_emissions_USA_xml.Rd
index b5f7c941ae..5c8cf8c285 100644
--- a/input/gcamdata/man/module_gcamusa_batch_othertrn_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_othertrn_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_othertrn_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_othertrn_emissions_USA_xml.R
 \name{module_gcamusa_batch_othertrn_emissions_USA_xml}
 \alias{module_gcamusa_batch_othertrn_emissions_USA_xml}
 \title{module_gcamusa_batch_othertrn_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_refinery_nonghg_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_refinery_nonghg_emissions_USA_xml.Rd
index cd312fb195..5733f279c2 100644
--- a/input/gcamdata/man/module_gcamusa_batch_refinery_nonghg_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_refinery_nonghg_emissions_USA_xml.Rd
@@ -1,6 +1,6 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in
-%   R/zchunk_batch_refinery_nonghg_emissions_USA_xml.R
+%   R/zgcamusa_batch_refinery_nonghg_emissions_USA_xml.R
 \name{module_gcamusa_batch_refinery_nonghg_emissions_USA_xml}
 \alias{module_gcamusa_batch_refinery_nonghg_emissions_USA_xml}
 \title{module_gcamusa_batch_refinery_nonghg_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_regional_biomass_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_regional_biomass_USA_xml.Rd
index ec06148cb1..570a2093ca 100644
--- a/input/gcamdata/man/module_gcamusa_batch_regional_biomass_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_regional_biomass_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_regional_biomass_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_regional_biomass_USA_xml.R
 \name{module_gcamusa_batch_regional_biomass_USA_xml}
 \alias{module_gcamusa_batch_regional_biomass_USA_xml}
 \title{module_gcamusa_batch_regional_biomass_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_resources_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_resources_USA_xml.Rd
index 0188ad8199..bc5167f5d2 100644
--- a/input/gcamdata/man/module_gcamusa_batch_resources_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_resources_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_resources_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_resources_USA_xml.R
 \name{module_gcamusa_batch_resources_USA_xml}
 \alias{module_gcamusa_batch_resources_USA_xml}
 \title{module_gcamusa_batch_resources_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_socioeconomics_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_socioeconomics_USA_xml.Rd
index 82f7a41a9c..cc02bb034b 100644
--- a/input/gcamdata/man/module_gcamusa_batch_socioeconomics_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_socioeconomics_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_socioeconomics_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_socioeconomics_USA_xml.R
 \name{module_gcamusa_batch_socioeconomics_USA_xml}
 \alias{module_gcamusa_batch_socioeconomics_USA_xml}
 \title{module_gcamusa_batch_socioeconomics_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_solar_reeds_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_solar_reeds_USA_xml.Rd
index c790bdd0f7..66823d0565 100644
--- a/input/gcamdata/man/module_gcamusa_batch_solar_reeds_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_solar_reeds_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_solar_reeds_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_solar_reeds_USA_xml.R
 \name{module_gcamusa_batch_solar_reeds_USA_xml}
 \alias{module_gcamusa_batch_solar_reeds_USA_xml}
 \title{module_gcamusa_batch_solar_reeds_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_transport_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_transport_emissions_USA_xml.Rd
index 77a6c9f944..e1feea2336 100644
--- a/input/gcamdata/man/module_gcamusa_batch_transport_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_transport_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_transport_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_transport_emissions_USA_xml.R
 \name{module_gcamusa_batch_transport_emissions_USA_xml}
 \alias{module_gcamusa_batch_transport_emissions_USA_xml}
 \title{module_gcamusa_batch_transport_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_transportation_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_transportation_USA_xml.Rd
index cfc9752270..79e2f3ebb4 100644
--- a/input/gcamdata/man/module_gcamusa_batch_transportation_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_transportation_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_transportation_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_transportation_USA_xml.R
 \name{module_gcamusa_batch_transportation_USA_xml}
 \alias{module_gcamusa_batch_transportation_USA_xml}
 \title{module_gcamusa_batch_transportation_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_trn_ghg_emissions_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_trn_ghg_emissions_USA_xml.Rd
index 8354743f82..8d88441a80 100644
--- a/input/gcamdata/man/module_gcamusa_batch_trn_ghg_emissions_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_trn_ghg_emissions_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_trn_ghg_emissions_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_trn_ghg_emissions_USA_xml.R
 \name{module_gcamusa_batch_trn_ghg_emissions_USA_xml}
 \alias{module_gcamusa_batch_trn_ghg_emissions_USA_xml}
 \title{module_gcamusa_batch_trn_ghg_emissions_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_water_demand_industry_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_water_demand_industry_USA_xml.Rd
index 57d8ffdb26..6feaef0268 100644
--- a/input/gcamdata/man/module_gcamusa_batch_water_demand_industry_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_water_demand_industry_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_industry_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_water_demand_industry_USA_xml.R
 \name{module_gcamusa_batch_water_demand_industry_USA_xml}
 \alias{module_gcamusa_batch_water_demand_industry_USA_xml}
 \title{module_gcamusa_batch_water_demand_industry_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_water_demand_municipal_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_water_demand_municipal_xml.Rd
index 4da082fbc9..b97886133e 100644
--- a/input/gcamdata/man/module_gcamusa_batch_water_demand_municipal_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_water_demand_municipal_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_municipal_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_water_demand_municipal_USA_xml.R
 \name{module_gcamusa_batch_water_demand_municipal_xml}
 \alias{module_gcamusa_batch_water_demand_municipal_xml}
 \title{module_gcamusa_batch_water_demand_municipal_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_water_td_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_water_td_USA_xml.Rd
index 92c81557d6..474860f002 100644
--- a/input/gcamdata/man/module_gcamusa_batch_water_td_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_water_td_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_td_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_water_td_USA_xml.R
 \name{module_gcamusa_batch_water_td_USA_xml}
 \alias{module_gcamusa_batch_water_td_USA_xml}
 \title{module_gcamusa_batch_water_td_USA_xml}
diff --git a/input/gcamdata/man/module_gcamusa_batch_wind_reeds_USA_xml.Rd b/input/gcamdata/man/module_gcamusa_batch_wind_reeds_USA_xml.Rd
index a8ec554034..1562327b4a 100644
--- a/input/gcamdata/man/module_gcamusa_batch_wind_reeds_USA_xml.Rd
+++ b/input/gcamdata/man/module_gcamusa_batch_wind_reeds_USA_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_wind_reeds_USA_xml.R
+% Please edit documentation in R/zgcamusa_batch_wind_reeds_USA_xml.R
 \name{module_gcamusa_batch_wind_reeds_USA_xml}
 \alias{module_gcamusa_batch_wind_reeds_USA_xml}
 \title{module_gcamusa_batch_wind_reeds_USA_xml}
diff --git a/input/gcamdata/man/module_modeltime_L200.modeltime.Rd b/input/gcamdata/man/module_modeltime_L200.modeltime.Rd
index aad626bfc6..649f6a6d37 100644
--- a/input/gcamdata/man/module_modeltime_L200.modeltime.Rd
+++ b/input/gcamdata/man/module_modeltime_L200.modeltime.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L200.modeltime.R
+% Please edit documentation in R/zmodeltime_L200.modeltime.R
 \name{module_modeltime_L200.modeltime}
 \alias{module_modeltime_L200.modeltime}
 \title{module_modeltime_L200.modeltime}
diff --git a/input/gcamdata/man/module_modeltime_batch_modeltime_xml.Rd b/input/gcamdata/man/module_modeltime_batch_modeltime_xml.Rd
index df6a430950..97af55cf13 100644
--- a/input/gcamdata/man/module_modeltime_batch_modeltime_xml.Rd
+++ b/input/gcamdata/man/module_modeltime_batch_modeltime_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_modeltime_xml.R
+% Please edit documentation in R/zmodeltime_batch_modeltime_xml.R
 \name{module_modeltime_batch_modeltime_xml}
 \alias{module_modeltime_batch_modeltime_xml}
 \title{module_modeltime_batch_modeltime_xml}
diff --git a/input/gcamdata/man/module_socioeconomics_L100.GDP_hist.Rd b/input/gcamdata/man/module_socio_L100.GDP_hist.Rd
similarity index 78%
rename from input/gcamdata/man/module_socioeconomics_L100.GDP_hist.Rd
rename to input/gcamdata/man/module_socio_L100.GDP_hist.Rd
index 03f3c9256e..f167cc84a6 100644
--- a/input/gcamdata/man/module_socioeconomics_L100.GDP_hist.Rd
+++ b/input/gcamdata/man/module_socio_L100.GDP_hist.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L100.GDP_hist.R
-\name{module_socioeconomics_L100.GDP_hist}
-\alias{module_socioeconomics_L100.GDP_hist}
-\title{module_socioeconomics_L100.GDP_hist}
+% Please edit documentation in R/zsocio_L100.GDP_hist.R
+\name{module_socio_L100.GDP_hist}
+\alias{module_socio_L100.GDP_hist}
+\title{module_socio_L100.GDP_hist}
 \usage{
-module_socioeconomics_L100.GDP_hist(command, ...)
+module_socio_L100.GDP_hist(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L100.Population_downscale_ctry.Rd b/input/gcamdata/man/module_socio_L100.Population_downscale_ctry.Rd
similarity index 73%
rename from input/gcamdata/man/module_socioeconomics_L100.Population_downscale_ctry.Rd
rename to input/gcamdata/man/module_socio_L100.Population_downscale_ctry.Rd
index 1ba62387fd..4c98267ad6 100644
--- a/input/gcamdata/man/module_socioeconomics_L100.Population_downscale_ctry.Rd
+++ b/input/gcamdata/man/module_socio_L100.Population_downscale_ctry.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L100.Population_downscale_ctry.R
-\name{module_socioeconomics_L100.Population_downscale_ctry}
-\alias{module_socioeconomics_L100.Population_downscale_ctry}
-\title{module_socioeconomics_L100.Population_downscale_ctry}
+% Please edit documentation in R/zsocio_L100.Population_downscale_ctry.R
+\name{module_socio_L100.Population_downscale_ctry}
+\alias{module_socio_L100.Population_downscale_ctry}
+\title{module_socio_L100.Population_downscale_ctry}
 \usage{
-module_socioeconomics_L100.Population_downscale_ctry(command, ...)
+module_socio_L100.Population_downscale_ctry(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L101.Population.Rd b/input/gcamdata/man/module_socio_L101.Population.Rd
similarity index 76%
rename from input/gcamdata/man/module_socioeconomics_L101.Population.Rd
rename to input/gcamdata/man/module_socio_L101.Population.Rd
index 401dd0c13b..f7e07a728e 100644
--- a/input/gcamdata/man/module_socioeconomics_L101.Population.Rd
+++ b/input/gcamdata/man/module_socio_L101.Population.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L101.Population.R
-\name{module_socioeconomics_L101.Population}
-\alias{module_socioeconomics_L101.Population}
-\title{module_socioeconomics_L101.Population}
+% Please edit documentation in R/zsocio_L101.Population.R
+\name{module_socio_L101.Population}
+\alias{module_socio_L101.Population}
+\title{module_socio_L101.Population}
 \usage{
-module_socioeconomics_L101.Population(command, ...)
+module_socio_L101.Population(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L102.GDP.Rd b/input/gcamdata/man/module_socio_L102.GDP.Rd
similarity index 86%
rename from input/gcamdata/man/module_socioeconomics_L102.GDP.Rd
rename to input/gcamdata/man/module_socio_L102.GDP.Rd
index c81702068c..4f642b8cbc 100644
--- a/input/gcamdata/man/module_socioeconomics_L102.GDP.Rd
+++ b/input/gcamdata/man/module_socio_L102.GDP.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L102.GDP.R
-\name{module_socioeconomics_L102.GDP}
-\alias{module_socioeconomics_L102.GDP}
-\title{module_socioeconomics_L102.GDP}
+% Please edit documentation in R/zsocio_L102.GDP.R
+\name{module_socio_L102.GDP}
+\alias{module_socio_L102.GDP}
+\title{module_socio_L102.GDP}
 \usage{
-module_socioeconomics_L102.GDP(command, ...)
+module_socio_L102.GDP(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L201.Pop_GDP_scenarios.Rd b/input/gcamdata/man/module_socio_L201.Pop_GDP_scenarios.Rd
similarity index 83%
rename from input/gcamdata/man/module_socioeconomics_L201.Pop_GDP_scenarios.Rd
rename to input/gcamdata/man/module_socio_L201.Pop_GDP_scenarios.Rd
index 22a09bb22b..ca0f60e603 100644
--- a/input/gcamdata/man/module_socioeconomics_L201.Pop_GDP_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L201.Pop_GDP_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L201.Pop_GDP_scenarios.R
-\name{module_socioeconomics_L201.Pop_GDP_scenarios}
-\alias{module_socioeconomics_L201.Pop_GDP_scenarios}
-\title{module_socioeconomics_L201.Pop_GDP_scenarios}
+% Please edit documentation in R/zsocio_L201.Pop_GDP_scenarios.R
+\name{module_socio_L201.Pop_GDP_scenarios}
+\alias{module_socio_L201.Pop_GDP_scenarios}
+\title{module_socio_L201.Pop_GDP_scenarios}
 \usage{
-module_socioeconomics_L201.Pop_GDP_scenarios(command, ...)
+module_socio_L201.Pop_GDP_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L2323.iron_steel_Inc_Elas_scenarios.Rd
similarity index 71%
rename from input/gcamdata/man/module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L2323.iron_steel_Inc_Elas_scenarios.Rd
index eddd609fc8..9a22b93bd7 100644
--- a/input/gcamdata/man/module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L2323.iron_steel_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2323.iron_steel_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios}
-\title{module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L2323.iron_steel_Inc_Elas_scenarios.R
+\name{module_socio_L2323.iron_steel_Inc_Elas_scenarios}
+\alias{module_socio_L2323.iron_steel_Inc_Elas_scenarios}
+\title{module_socio_L2323.iron_steel_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L2323.iron_steel_Inc_Elas_scenarios(command, ...)
+module_socio_L2323.iron_steel_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L2324.Off_road_Inc_Elas_scenarios.Rd
similarity index 71%
rename from input/gcamdata/man/module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L2324.Off_road_Inc_Elas_scenarios.Rd
index 7e5ad5c8eb..1b3b40ae2f 100644
--- a/input/gcamdata/man/module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L2324.Off_road_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2324.Off_road_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios}
-\title{module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L2324.Off_road_Inc_Elas_scenarios.R
+\name{module_socio_L2324.Off_road_Inc_Elas_scenarios}
+\alias{module_socio_L2324.Off_road_Inc_Elas_scenarios}
+\title{module_socio_L2324.Off_road_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L2324.Off_road_Inc_Elas_scenarios(command, ...)
+module_socio_L2324.Off_road_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L2325.chemical_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L2325.chemical_Inc_Elas_scenarios.Rd
similarity index 71%
rename from input/gcamdata/man/module_socioeconomics_L2325.chemical_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L2325.chemical_Inc_Elas_scenarios.Rd
index 55364e1fb7..c14e222adf 100644
--- a/input/gcamdata/man/module_socioeconomics_L2325.chemical_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L2325.chemical_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2325.chemical_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L2325.chemical_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L2325.chemical_Inc_Elas_scenarios}
-\title{module_socioeconomics_L2325.chemical_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L2325.chemical_Inc_Elas_scenarios.R
+\name{module_socio_L2325.chemical_Inc_Elas_scenarios}
+\alias{module_socio_L2325.chemical_Inc_Elas_scenarios}
+\title{module_socio_L2325.chemical_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L2325.chemical_Inc_Elas_scenarios(command, ...)
+module_socio_L2325.chemical_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L2326.aluminum_Inc_Elas_scenarios.Rd
similarity index 71%
rename from input/gcamdata/man/module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L2326.aluminum_Inc_Elas_scenarios.Rd
index def7072159..517902f3e2 100644
--- a/input/gcamdata/man/module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L2326.aluminum_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2326.aluminum_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios}
-\title{module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L2326.aluminum_Inc_Elas_scenarios.R
+\name{module_socio_L2326.aluminum_Inc_Elas_scenarios}
+\alias{module_socio_L2326.aluminum_Inc_Elas_scenarios}
+\title{module_socio_L2326.aluminum_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L2326.aluminum_Inc_Elas_scenarios(command, ...)
+module_socio_L2326.aluminum_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L242.Bld_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L242.Bld_Inc_Elas_scenarios.Rd
similarity index 73%
rename from input/gcamdata/man/module_socioeconomics_L242.Bld_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L242.Bld_Inc_Elas_scenarios.Rd
index 595027f729..00a2660a03 100644
--- a/input/gcamdata/man/module_socioeconomics_L242.Bld_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L242.Bld_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L242.Bld_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L242.Bld_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L242.Bld_Inc_Elas_scenarios}
-\title{module_socioeconomics_L242.Bld_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L242.Bld_Inc_Elas_scenarios.R
+\name{module_socio_L242.Bld_Inc_Elas_scenarios}
+\alias{module_socio_L242.Bld_Inc_Elas_scenarios}
+\title{module_socio_L242.Bld_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L242.Bld_Inc_Elas_scenarios(command, ...)
+module_socio_L242.Bld_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socioeconomics_L252.Trn_Inc_Elas_scenarios.Rd b/input/gcamdata/man/module_socio_L252.Trn_Inc_Elas_scenarios.Rd
similarity index 72%
rename from input/gcamdata/man/module_socioeconomics_L252.Trn_Inc_Elas_scenarios.Rd
rename to input/gcamdata/man/module_socio_L252.Trn_Inc_Elas_scenarios.Rd
index 6cf4012c4f..848026c66a 100644
--- a/input/gcamdata/man/module_socioeconomics_L252.Trn_Inc_Elas_scenarios.Rd
+++ b/input/gcamdata/man/module_socio_L252.Trn_Inc_Elas_scenarios.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L252.Trn_Inc_Elas_scenarios.R
-\name{module_socioeconomics_L252.Trn_Inc_Elas_scenarios}
-\alias{module_socioeconomics_L252.Trn_Inc_Elas_scenarios}
-\title{module_socioeconomics_L252.Trn_Inc_Elas_scenarios}
+% Please edit documentation in R/zsocio_L252.Trn_Inc_Elas_scenarios.R
+\name{module_socio_L252.Trn_Inc_Elas_scenarios}
+\alias{module_socio_L252.Trn_Inc_Elas_scenarios}
+\title{module_socio_L252.Trn_Inc_Elas_scenarios}
 \usage{
-module_socioeconomics_L252.Trn_Inc_Elas_scenarios(command, ...)
+module_socio_L252.Trn_Inc_Elas_scenarios(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_socio_batch_SSP_xml.Rd b/input/gcamdata/man/module_socio_batch_SSP_xml.Rd
index d2501024c5..48987155ad 100644
--- a/input/gcamdata/man/module_socio_batch_SSP_xml.Rd
+++ b/input/gcamdata/man/module_socio_batch_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_socioeconomics_SSP_xml.R
+% Please edit documentation in R/zsocio_batch_socioeconomics_SSP_xml.R
 \name{module_socio_batch_SSP_xml}
 \alias{module_socio_batch_SSP_xml}
 \title{module_socio_batch_SSP_xml}
diff --git a/input/gcamdata/man/module_socio_batch_bld_agg_xml.Rd b/input/gcamdata/man/module_socio_batch_bld_agg_xml.Rd
index a756018758..d0f79b7d8e 100644
--- a/input/gcamdata/man/module_socio_batch_bld_agg_xml.Rd
+++ b/input/gcamdata/man/module_socio_batch_bld_agg_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_bld_agg_xml.R
+% Please edit documentation in R/zsocio_batch_bld_agg_xml.R
 \name{module_socio_batch_bld_agg_xml}
 \alias{module_socio_batch_bld_agg_xml}
 \title{module_socio_batch_bld_agg_xml}
diff --git a/input/gcamdata/man/module_data_Maddison_population.Rd b/input/gcamdata/man/module_socio_data_Maddison_population.Rd
similarity index 73%
rename from input/gcamdata/man/module_data_Maddison_population.Rd
rename to input/gcamdata/man/module_socio_data_Maddison_population.Rd
index f223b84c03..00dc71e90e 100644
--- a/input/gcamdata/man/module_data_Maddison_population.Rd
+++ b/input/gcamdata/man/module_socio_data_Maddison_population.Rd
@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_data_Maddison_population.R
-\name{module_data_Maddison_population}
-\alias{module_data_Maddison_population}
-\title{module_data_Maddison_population}
+% Please edit documentation in R/zsocio_data_Maddison_population.R
+\name{module_socio_data_Maddison_population}
+\alias{module_socio_data_Maddison_population}
+\title{module_socio_data_Maddison_population}
 \usage{
-module_data_Maddison_population(command, ...)
+module_socio_data_Maddison_population(command, ...)
 }
 \arguments{
 \item{command}{API command to execute}
diff --git a/input/gcamdata/man/module_water_L100.water_supply_runoff.Rd b/input/gcamdata/man/module_water_L100.water_supply_runoff.Rd
index a795b3f962..163c0b3267 100644
--- a/input/gcamdata/man/module_water_L100.water_supply_runoff.Rd
+++ b/input/gcamdata/man/module_water_L100.water_supply_runoff.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L100.water_supply_runoff.R
+% Please edit documentation in R/zwater_L100.water_supply_runoff.R
 \name{module_water_L100.water_supply_runoff}
 \alias{module_water_L100.water_supply_runoff}
 \title{module_water_L100.water_supply_runoff}
diff --git a/input/gcamdata/man/module_water_L101.water_supply_groundwater.Rd b/input/gcamdata/man/module_water_L101.water_supply_groundwater.Rd
index 3551ccf237..eb427439cb 100644
--- a/input/gcamdata/man/module_water_L101.water_supply_groundwater.Rd
+++ b/input/gcamdata/man/module_water_L101.water_supply_groundwater.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L101.water_supply_groundwater.R
+% Please edit documentation in R/zwater_L101.water_supply_groundwater.R
 \name{module_water_L101.water_supply_groundwater}
 \alias{module_water_L101.water_supply_groundwater}
 \title{module_water_L101.water_supply_groundwater}
diff --git a/input/gcamdata/man/module_water_L102.water_supply_unlimited.Rd b/input/gcamdata/man/module_water_L102.water_supply_unlimited.Rd
index 13e92de544..357d9239c6 100644
--- a/input/gcamdata/man/module_water_L102.water_supply_unlimited.Rd
+++ b/input/gcamdata/man/module_water_L102.water_supply_unlimited.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L102.water_supply_unlimited.R
+% Please edit documentation in R/zwater_L102.water_supply_unlimited.R
 \name{module_water_L102.water_supply_unlimited}
 \alias{module_water_L102.water_supply_unlimited}
 \title{module_water_L102.water_supply_unlimited}
diff --git a/input/gcamdata/man/module_water_L103.water_basin_mapping.Rd b/input/gcamdata/man/module_water_L103.water_basin_mapping.Rd
index 854986d16e..cf92058769 100644
--- a/input/gcamdata/man/module_water_L103.water_basin_mapping.Rd
+++ b/input/gcamdata/man/module_water_L103.water_basin_mapping.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L103.water_basin_mapping.R
+% Please edit documentation in R/zwater_L103.water_basin_mapping.R
 \name{module_water_L103.water_basin_mapping}
 \alias{module_water_L103.water_basin_mapping}
 \title{module_water_L103.water_basin_mapping}
diff --git a/input/gcamdata/man/module_water_L110.water_demand_primary.Rd b/input/gcamdata/man/module_water_L110.water_demand_primary.Rd
index ca08c675a0..9dad45f453 100644
--- a/input/gcamdata/man/module_water_L110.water_demand_primary.Rd
+++ b/input/gcamdata/man/module_water_L110.water_demand_primary.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L110.water_demand_primary.R
+% Please edit documentation in R/zwater_L110.water_demand_primary.R
 \name{module_water_L110.water_demand_primary}
 \alias{module_water_L110.water_demand_primary}
 \title{module_water_L110.water_demand_primary}
diff --git a/input/gcamdata/man/module_water_L1233.Elec_water.Rd b/input/gcamdata/man/module_water_L1233.Elec_water.Rd
index 6cdf3ac797..8f3b62b5e9 100644
--- a/input/gcamdata/man/module_water_L1233.Elec_water.Rd
+++ b/input/gcamdata/man/module_water_L1233.Elec_water.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L1233.Elec_water.R
+% Please edit documentation in R/zwater_L1233.Elec_water.R
 \name{module_water_L1233.Elec_water}
 \alias{module_water_L1233.Elec_water}
 \title{module_water_L1233.Elec_water}
diff --git a/input/gcamdata/man/module_water_L132.water_demand_manufacturing.Rd b/input/gcamdata/man/module_water_L132.water_demand_manufacturing.Rd
index b41483e23f..8874826e9f 100644
--- a/input/gcamdata/man/module_water_L132.water_demand_manufacturing.Rd
+++ b/input/gcamdata/man/module_water_L132.water_demand_manufacturing.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L132.water_demand_manufacturing.R
+% Please edit documentation in R/zwater_L132.water_demand_manufacturing.R
 \name{module_water_L132.water_demand_manufacturing}
 \alias{module_water_L132.water_demand_manufacturing}
 \title{module_water_L132.water_demand_manufacturing}
diff --git a/input/gcamdata/man/module_water_L133.water_demand_livestock.Rd b/input/gcamdata/man/module_water_L133.water_demand_livestock.Rd
index 689cbef3bf..24bc978ab7 100644
--- a/input/gcamdata/man/module_water_L133.water_demand_livestock.Rd
+++ b/input/gcamdata/man/module_water_L133.water_demand_livestock.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L133.water_demand_livestock.R
+% Please edit documentation in R/zwater_L133.water_demand_livestock.R
 \name{module_water_L133.water_demand_livestock}
 \alias{module_water_L133.water_demand_livestock}
 \title{module_water_L133.water_demand_livestock}
diff --git a/input/gcamdata/man/module_water_L145.water_demand_municipal.Rd b/input/gcamdata/man/module_water_L145.water_demand_municipal.Rd
index 63d231fdfe..dddc687c09 100644
--- a/input/gcamdata/man/module_water_L145.water_demand_municipal.Rd
+++ b/input/gcamdata/man/module_water_L145.water_demand_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L145.water_demand_municipal.R
+% Please edit documentation in R/zwater_L145.water_demand_municipal.R
 \name{module_water_L145.water_demand_municipal}
 \alias{module_water_L145.water_demand_municipal}
 \title{module_water_L145.water_demand_municipal}
diff --git a/input/gcamdata/man/module_water_L171.desalination.Rd b/input/gcamdata/man/module_water_L171.desalination.Rd
index 0588d52333..56379e4f06 100644
--- a/input/gcamdata/man/module_water_L171.desalination.Rd
+++ b/input/gcamdata/man/module_water_L171.desalination.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L171.desalination.R
+% Please edit documentation in R/zwater_L171.desalination.R
 \name{module_water_L171.desalination}
 \alias{module_water_L171.desalination}
 \title{module_water_L171.desalination}
diff --git a/input/gcamdata/man/module_water_L172.EFW_irrigation.Rd b/input/gcamdata/man/module_water_L172.EFW_irrigation.Rd
index ce24ff5b01..4dd30b3c50 100644
--- a/input/gcamdata/man/module_water_L172.EFW_irrigation.Rd
+++ b/input/gcamdata/man/module_water_L172.EFW_irrigation.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L172.EFW_irrigation.R
+% Please edit documentation in R/zwater_L172.EFW_irrigation.R
 \name{module_water_L172.EFW_irrigation}
 \alias{module_water_L172.EFW_irrigation}
 \title{module_water_L172.EFW_irrigation}
diff --git a/input/gcamdata/man/module_water_L173.EFW_manufacturing.Rd b/input/gcamdata/man/module_water_L173.EFW_manufacturing.Rd
index 3f7d25dd2b..0056d3906f 100644
--- a/input/gcamdata/man/module_water_L173.EFW_manufacturing.Rd
+++ b/input/gcamdata/man/module_water_L173.EFW_manufacturing.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L173.EFW_manufacturing.R
+% Please edit documentation in R/zwater_L173.EFW_manufacturing.R
 \name{module_water_L173.EFW_manufacturing}
 \alias{module_water_L173.EFW_manufacturing}
 \title{module_water_L173.EFW_manufacturing}
diff --git a/input/gcamdata/man/module_water_L174.EFW_municipal.Rd b/input/gcamdata/man/module_water_L174.EFW_municipal.Rd
index ceeb4869bb..632371ca9a 100644
--- a/input/gcamdata/man/module_water_L174.EFW_municipal.Rd
+++ b/input/gcamdata/man/module_water_L174.EFW_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L174.EFW_municipal.R
+% Please edit documentation in R/zwater_L174.EFW_municipal.R
 \name{module_water_L174.EFW_municipal}
 \alias{module_water_L174.EFW_municipal}
 \title{module_water_L174.EFW_municipal}
diff --git a/input/gcamdata/man/module_water_L201.water_resources_constrained.Rd b/input/gcamdata/man/module_water_L201.water_resources_constrained.Rd
index 413bd4cc19..c540ef5d65 100644
--- a/input/gcamdata/man/module_water_L201.water_resources_constrained.Rd
+++ b/input/gcamdata/man/module_water_L201.water_resources_constrained.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L201.water_resources_constrained.R
+% Please edit documentation in R/zwater_L201.water_resources_constrained.R
 \name{module_water_L201.water_resources_constrained}
 \alias{module_water_L201.water_resources_constrained}
 \title{module_water_L201.water_resources_constrained}
diff --git a/input/gcamdata/man/module_water_L202.water_resources_unlimited.Rd b/input/gcamdata/man/module_water_L202.water_resources_unlimited.Rd
index f6e7d595a1..c3df9abc6b 100644
--- a/input/gcamdata/man/module_water_L202.water_resources_unlimited.Rd
+++ b/input/gcamdata/man/module_water_L202.water_resources_unlimited.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L202.water_resources_unlimited.R
+% Please edit documentation in R/zwater_L202.water_resources_unlimited.R
 \name{module_water_L202.water_resources_unlimited}
 \alias{module_water_L202.water_resources_unlimited}
 \title{module_water_L202.water_resources_unlimited}
diff --git a/input/gcamdata/man/module_water_L203.water_td.Rd b/input/gcamdata/man/module_water_L203.water_td.Rd
index 05195e6209..a2205c4b0c 100644
--- a/input/gcamdata/man/module_water_L203.water_td.Rd
+++ b/input/gcamdata/man/module_water_L203.water_td.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L203.water_td.R
+% Please edit documentation in R/zwater_L203.water_td.R
 \name{module_water_L203.water_td}
 \alias{module_water_L203.water_td}
 \title{module_water_L203.water_td}
diff --git a/input/gcamdata/man/module_water_L210.water_demand_primary.Rd b/input/gcamdata/man/module_water_L210.water_demand_primary.Rd
index ffa2268015..2da9d80850 100644
--- a/input/gcamdata/man/module_water_L210.water_demand_primary.Rd
+++ b/input/gcamdata/man/module_water_L210.water_demand_primary.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L210.water_demand_primary.R
+% Please edit documentation in R/zwater_L210.water_demand_primary.R
 \name{module_water_L210.water_demand_primary}
 \alias{module_water_L210.water_demand_primary}
 \title{module_water_L210.water_demand_primary}
diff --git a/input/gcamdata/man/module_water_L2233.electricity_water.Rd b/input/gcamdata/man/module_water_L2233.electricity_water.Rd
index a6392fba86..53ce553fef 100644
--- a/input/gcamdata/man/module_water_L2233.electricity_water.Rd
+++ b/input/gcamdata/man/module_water_L2233.electricity_water.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L2233.electricity_water.R
+% Please edit documentation in R/zwater_L2233.electricity_water.R
 \name{module_water_L2233.electricity_water}
 \alias{module_water_L2233.electricity_water}
 \title{module_water_L2233.electricity_water}
diff --git a/input/gcamdata/man/module_water_L232.water_demand_manufacturing.Rd b/input/gcamdata/man/module_water_L232.water_demand_manufacturing.Rd
index 117b28090d..43a3eadd5c 100644
--- a/input/gcamdata/man/module_water_L232.water_demand_manufacturing.Rd
+++ b/input/gcamdata/man/module_water_L232.water_demand_manufacturing.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L232.water_demand_manufacturing.R
+% Please edit documentation in R/zwater_L232.water_demand_manufacturing.R
 \name{module_water_L232.water_demand_manufacturing}
 \alias{module_water_L232.water_demand_manufacturing}
 \title{module_water_L232.water_demand_manufacturing}
diff --git a/input/gcamdata/man/module_water_L233.water_demand_livestock.Rd b/input/gcamdata/man/module_water_L233.water_demand_livestock.Rd
index 674f4eca63..f3c19c1540 100644
--- a/input/gcamdata/man/module_water_L233.water_demand_livestock.Rd
+++ b/input/gcamdata/man/module_water_L233.water_demand_livestock.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L233.water_demand_livestock.R
+% Please edit documentation in R/zwater_L233.water_demand_livestock.R
 \name{module_water_L233.water_demand_livestock}
 \alias{module_water_L233.water_demand_livestock}
 \title{module_water_L233.water_demand_livestock}
diff --git a/input/gcamdata/man/module_water_L245.water_demand_municipal.Rd b/input/gcamdata/man/module_water_L245.water_demand_municipal.Rd
index 542d223a02..eb08f75ab5 100644
--- a/input/gcamdata/man/module_water_L245.water_demand_municipal.Rd
+++ b/input/gcamdata/man/module_water_L245.water_demand_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L245.water_demand_municipal.R
+% Please edit documentation in R/zwater_L245.water_demand_municipal.R
 \name{module_water_L245.water_demand_municipal}
 \alias{module_water_L245.water_demand_municipal}
 \title{module_water_L245.water_demand_municipal}
diff --git a/input/gcamdata/man/module_water_L270.EFW_input_coefs.Rd b/input/gcamdata/man/module_water_L270.EFW_input_coefs.Rd
index 587c147714..2220281ebb 100644
--- a/input/gcamdata/man/module_water_L270.EFW_input_coefs.Rd
+++ b/input/gcamdata/man/module_water_L270.EFW_input_coefs.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L270.EFW_input_coefs.R
+% Please edit documentation in R/zwater_L270.EFW_input_coefs.R
 \name{module_water_L270.EFW_input_coefs}
 \alias{module_water_L270.EFW_input_coefs}
 \title{module_water_L270.EFW_input_coefs}
diff --git a/input/gcamdata/man/module_water_L271.desalination.Rd b/input/gcamdata/man/module_water_L271.desalination.Rd
index bf5726345e..5092468371 100644
--- a/input/gcamdata/man/module_water_L271.desalination.Rd
+++ b/input/gcamdata/man/module_water_L271.desalination.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L271.desalination.R
+% Please edit documentation in R/zwater_L271.desalination.R
 \name{module_water_L271.desalination}
 \alias{module_water_L271.desalination}
 \title{module_water_L271.desalination}
diff --git a/input/gcamdata/man/module_water_L272.EFW_irrigation.Rd b/input/gcamdata/man/module_water_L272.EFW_irrigation.Rd
index 8cc203b7d0..c8055e4b84 100644
--- a/input/gcamdata/man/module_water_L272.EFW_irrigation.Rd
+++ b/input/gcamdata/man/module_water_L272.EFW_irrigation.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L272.EFW_irrigation.R
+% Please edit documentation in R/zwater_L272.EFW_irrigation.R
 \name{module_water_L272.EFW_irrigation}
 \alias{module_water_L272.EFW_irrigation}
 \title{module_water_L272.EFW_irrigation}
diff --git a/input/gcamdata/man/module_water_L273.EFW_manufacturing.Rd b/input/gcamdata/man/module_water_L273.EFW_manufacturing.Rd
index 72ad1dba9d..9970475efe 100644
--- a/input/gcamdata/man/module_water_L273.EFW_manufacturing.Rd
+++ b/input/gcamdata/man/module_water_L273.EFW_manufacturing.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L273.EFW_manufacturing.R
+% Please edit documentation in R/zwater_L273.EFW_manufacturing.R
 \name{module_water_L273.EFW_manufacturing}
 \alias{module_water_L273.EFW_manufacturing}
 \title{module_water_L273.EFW_manufacturing}
diff --git a/input/gcamdata/man/module_water_L274.EFW_municipal.Rd b/input/gcamdata/man/module_water_L274.EFW_municipal.Rd
index 1ab05b23d2..56e7627190 100644
--- a/input/gcamdata/man/module_water_L274.EFW_municipal.Rd
+++ b/input/gcamdata/man/module_water_L274.EFW_municipal.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_L274.EFW_municipal.R
+% Please edit documentation in R/zwater_L274.EFW_municipal.R
 \name{module_water_L274.EFW_municipal}
 \alias{module_water_L274.EFW_municipal}
 \title{module_water_L274.EFW_municipal}
diff --git a/input/gcamdata/man/module_water_batch_EFW_WWtrt_coefs_SSP_xml.Rd b/input/gcamdata/man/module_water_batch_EFW_WWtrt_coefs_SSP_xml.Rd
index 55256fcb98..e2b1e1663e 100644
--- a/input/gcamdata/man/module_water_batch_EFW_WWtrt_coefs_SSP_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_EFW_WWtrt_coefs_SSP_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_EFW_WWtrt_coefs_SSP_xml.R
+% Please edit documentation in R/zwater_batch_EFW_WWtrt_coefs_SSP_xml.R
 \name{module_water_batch_EFW_WWtrt_coefs_SSP_xml}
 \alias{module_water_batch_EFW_WWtrt_coefs_SSP_xml}
 \title{module_water_batch_EFW_WWtrt_coefs_SSP_xml}
diff --git a/input/gcamdata/man/module_water_batch_EFW_input_coefs_xml.Rd b/input/gcamdata/man/module_water_batch_EFW_input_coefs_xml.Rd
index 0cdda2cb14..5409e01994 100644
--- a/input/gcamdata/man/module_water_batch_EFW_input_coefs_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_EFW_input_coefs_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_EFW_input_coefs_xml.R
+% Please edit documentation in R/zwater_batch_EFW_input_coefs_xml.R
 \name{module_water_batch_EFW_input_coefs_xml}
 \alias{module_water_batch_EFW_input_coefs_xml}
 \title{module_water_batch_EFW_input_coefs_xml}
diff --git a/input/gcamdata/man/module_water_batch_EFW_irrigation_xml.Rd b/input/gcamdata/man/module_water_batch_EFW_irrigation_xml.Rd
index af9cdcb1b6..0c2c6a9940 100644
--- a/input/gcamdata/man/module_water_batch_EFW_irrigation_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_EFW_irrigation_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_EFW_irrigation_xml.R
+% Please edit documentation in R/zwater_batch_EFW_irrigation_xml.R
 \name{module_water_batch_EFW_irrigation_xml}
 \alias{module_water_batch_EFW_irrigation_xml}
 \title{module_water_batch_EFW_irrigation_xml}
diff --git a/input/gcamdata/man/module_water_batch_EFW_manufacturing_xml.Rd b/input/gcamdata/man/module_water_batch_EFW_manufacturing_xml.Rd
index 42e2838e64..4706ee7397 100644
--- a/input/gcamdata/man/module_water_batch_EFW_manufacturing_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_EFW_manufacturing_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_EFW_manufacturing_xml.R
+% Please edit documentation in R/zwater_batch_EFW_manufacturing_xml.R
 \name{module_water_batch_EFW_manufacturing_xml}
 \alias{module_water_batch_EFW_manufacturing_xml}
 \title{module_water_batch_EFW_manufacturing_xml}
diff --git a/input/gcamdata/man/module_water_batch_EFW_municipal_xml.Rd b/input/gcamdata/man/module_water_batch_EFW_municipal_xml.Rd
index a36d9d1729..7881a37c8b 100644
--- a/input/gcamdata/man/module_water_batch_EFW_municipal_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_EFW_municipal_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_EFW_municipal_xml.R
+% Please edit documentation in R/zwater_batch_EFW_municipal_xml.R
 \name{module_water_batch_EFW_municipal_xml}
 \alias{module_water_batch_EFW_municipal_xml}
 \title{module_water_batch_EFW_municipal_xml}
diff --git a/input/gcamdata/man/module_water_batch_desalination_xml.Rd b/input/gcamdata/man/module_water_batch_desalination_xml.Rd
index f19d03d1af..1757218740 100644
--- a/input/gcamdata/man/module_water_batch_desalination_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_desalination_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_desalination_xml.R
+% Please edit documentation in R/zwater_batch_desalination_xml.R
 \name{module_water_batch_desalination_xml}
 \alias{module_water_batch_desalination_xml}
 \title{module_water_batch_desalination_xml}
diff --git a/input/gcamdata/man/module_water_batch_electricity_water_coefs_xml.Rd b/input/gcamdata/man/module_water_batch_electricity_water_coefs_xml.Rd
index 5f2f8670d5..2ce3ba04a0 100644
--- a/input/gcamdata/man/module_water_batch_electricity_water_coefs_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_electricity_water_coefs_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_electricity_water_coefs_xml.R
+% Please edit documentation in R/zwater_batch_electricity_water_coefs_xml.R
 \name{module_water_batch_electricity_water_coefs_xml}
 \alias{module_water_batch_electricity_water_coefs_xml}
 \title{module_water_batch_electricity_water_coefs_xml}
diff --git a/input/gcamdata/man/module_water_batch_electricity_water_xml.Rd b/input/gcamdata/man/module_water_batch_electricity_water_xml.Rd
index 2d8ad522be..50048c6092 100644
--- a/input/gcamdata/man/module_water_batch_electricity_water_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_electricity_water_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_electricity_water_xml.R
+% Please edit documentation in R/zwater_batch_electricity_water_xml.R
 \name{module_water_batch_electricity_water_xml}
 \alias{module_water_batch_electricity_water_xml}
 \title{module_water_batch_electricity_water_xml}
diff --git a/input/gcamdata/man/module_water_batch_unlimited_water_supply_xml.Rd b/input/gcamdata/man/module_water_batch_unlimited_water_supply_xml.Rd
index c5d8c7978e..4a527bc9a9 100644
--- a/input/gcamdata/man/module_water_batch_unlimited_water_supply_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_unlimited_water_supply_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_unlimited_water_supply_xml.R
+% Please edit documentation in R/zwater_batch_unlimited_water_supply_xml.R
 \name{module_water_batch_unlimited_water_supply_xml}
 \alias{module_water_batch_unlimited_water_supply_xml}
 \title{module_water_batch_unlimited_water_supply_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_demand_industry_xml.Rd b/input/gcamdata/man/module_water_batch_water_demand_industry_xml.Rd
index b30dbe9bea..844467fd51 100644
--- a/input/gcamdata/man/module_water_batch_water_demand_industry_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_demand_industry_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_industry_xml.R
+% Please edit documentation in R/zwater_batch_water_demand_industry_xml.R
 \name{module_water_batch_water_demand_industry_xml}
 \alias{module_water_batch_water_demand_industry_xml}
 \title{module_water_batch_water_demand_industry_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_demand_livestock_xml.Rd b/input/gcamdata/man/module_water_batch_water_demand_livestock_xml.Rd
index 02c3d12eac..e55d152fb1 100644
--- a/input/gcamdata/man/module_water_batch_water_demand_livestock_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_demand_livestock_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_livestock_xml.R
+% Please edit documentation in R/zwater_batch_water_demand_livestock_xml.R
 \name{module_water_batch_water_demand_livestock_xml}
 \alias{module_water_batch_water_demand_livestock_xml}
 \title{module_water_batch_water_demand_livestock_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_demand_municipal_xml.Rd b/input/gcamdata/man/module_water_batch_water_demand_municipal_xml.Rd
index 28b54c81a3..3000b2cd10 100644
--- a/input/gcamdata/man/module_water_batch_water_demand_municipal_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_demand_municipal_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_municipal_xml.R
+% Please edit documentation in R/zwater_batch_water_demand_municipal_xml.R
 \name{module_water_batch_water_demand_municipal_xml}
 \alias{module_water_batch_water_demand_municipal_xml}
 \title{module_water_batch_water_demand_municipal_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_demand_primary_xml.Rd b/input/gcamdata/man/module_water_batch_water_demand_primary_xml.Rd
index 2b3a9076d5..cd55dba763 100644
--- a/input/gcamdata/man/module_water_batch_water_demand_primary_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_demand_primary_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_demand_primary_xml.R
+% Please edit documentation in R/zwater_batch_water_demand_primary_xml.R
 \name{module_water_batch_water_demand_primary_xml}
 \alias{module_water_batch_water_demand_primary_xml}
 \title{module_water_batch_water_demand_primary_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_elec_liquids_limits_xml.Rd b/input/gcamdata/man/module_water_batch_water_elec_liquids_limits_xml.Rd
index cf43c9d045..14294e3108 100644
--- a/input/gcamdata/man/module_water_batch_water_elec_liquids_limits_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_elec_liquids_limits_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_elec_liquids_limits_xml.R
+% Please edit documentation in R/zwater_batch_water_elec_liquids_limits_xml.R
 \name{module_water_batch_water_elec_liquids_limits_xml}
 \alias{module_water_batch_water_elec_liquids_limits_xml}
 \title{module_water_batch_water_elec_liquids_limits_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_supply_constrained_xml.Rd b/input/gcamdata/man/module_water_batch_water_supply_constrained_xml.Rd
index ac55428ab0..6e2b9791f6 100644
--- a/input/gcamdata/man/module_water_batch_water_supply_constrained_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_supply_constrained_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_supply_constrained_xml.R
+% Please edit documentation in R/zwater_batch_water_supply_constrained_xml.R
 \name{module_water_batch_water_supply_constrained_xml}
 \alias{module_water_batch_water_supply_constrained_xml}
 \title{module_water_batch_water_supply_constrained_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_supply_uncalibrated_xml.Rd b/input/gcamdata/man/module_water_batch_water_supply_uncalibrated_xml.Rd
index 719d6be4a9..aac6e04eb8 100644
--- a/input/gcamdata/man/module_water_batch_water_supply_uncalibrated_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_supply_uncalibrated_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_supply_uncalibrated_xml.R
+% Please edit documentation in R/zwater_batch_water_supply_uncalibrated_xml.R
 \name{module_water_batch_water_supply_uncalibrated_xml}
 \alias{module_water_batch_water_supply_uncalibrated_xml}
 \title{module_water_batch_water_supply_uncalibrated_xml}
diff --git a/input/gcamdata/man/module_water_batch_water_td_xml.Rd b/input/gcamdata/man/module_water_batch_water_td_xml.Rd
index 80f6d032db..c35d097da3 100644
--- a/input/gcamdata/man/module_water_batch_water_td_xml.Rd
+++ b/input/gcamdata/man/module_water_batch_water_td_xml.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/zchunk_batch_water_td_xml.R
+% Please edit documentation in R/zwater_batch_water_td_xml.R
 \name{module_water_batch_water_td_xml}
 \alias{module_water_batch_water_td_xml}
 \title{module_water_batch_water_td_xml}
diff --git a/input/gcamdata/man/prebuilt_data.Rd b/input/gcamdata/man/prebuilt_data.Rd
deleted file mode 100644
index 318b3c03b8..0000000000
--- a/input/gcamdata/man/prebuilt_data.Rd
+++ /dev/null
@@ -1,24 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.R
-\docType{data}
-\name{PREBUILT_DATA}
-\alias{PREBUILT_DATA}
-\title{A list of prebuilt data objects. These are used when the proprietary IEA
-energy data files are not available, and thus
-\code{\link{module_energy_LA100.IEA_downscale_ctry}} is not able to run.
-Its immediate downstream dependencies then used the prebuilt versions of
-their outputs stored in this object.}
-\format{
-A list object where [[object_name]] <- tibble:
-}
-\usage{
-PREBUILT_DATA
-}
-\description{
-A list of prebuilt data objects. These are used when the proprietary IEA
-energy data files are not available, and thus
-\code{\link{module_energy_LA100.IEA_downscale_ctry}} is not able to run.
-Its immediate downstream dependencies then used the prebuilt versions of
-their outputs stored in this object.
-}
-\keyword{datasets}
diff --git a/input/gcamdata/tests/testthat/test_chunk_readylist.R b/input/gcamdata/tests/testthat/test_chunk_readylist.R
deleted file mode 100644
index aae1b8158a..0000000000
--- a/input/gcamdata/tests/testthat/test_chunk_readylist.R
+++ /dev/null
@@ -1,67 +0,0 @@
-# Test the chunk grapher
-
-context("chunk_readylist")
-
-# The following code is written using the `mockr` package, currently only
-# available via GitHub. Apparently `testthat::with_mock` is going
-# to be deprecated soon.
-
-if(require(mockr, quietly = TRUE, warn.conflicts = FALSE)) {
-
-  test_that("runs-no dependencies", {
-    # Create a couple (fake) chunks that don't depend on each other
-    chunknames <- c("test1", "test2")
-    mockr::with_mock(
-      find_chunks = function(...) tibble(name = chunknames,
-                                         module = c("m1", "m2"),
-                                         chunk = chunknames,
-                                         disabled = c(TRUE, FALSE)),
-      chunk_inputs = function(...) tibble(name = chunknames,
-                                          input = c("i1", "i2"),
-                                          from_file = TRUE),
-      chunk_outputs = function(...) tibble(name = chunknames,
-                                           output = c("o1", "o2"),
-                                           to_xml = FALSE),
-      # output should be a tibble data frame
-      expect_is(chunk_readylist(), "tbl_df"),
-      # only 1 row - enabled chunks don't appear
-      expect_equal(nrow(chunk_readylist()), 1),
-      # no downstream dependencies
-      expect_equal(count_downstream_dependencies(chunknames[1], find_chunks(),
-                                      chunk_inputs(), chunk_outputs())[[1]], 0),
-      expect_equal(count_downstream_dependencies(chunknames[2], find_chunks(),
-                                      chunk_inputs(), chunk_outputs())[[1]], 0)
-    )
-  })
-
-  test_that("runs-dependencies", {
-    # Create a couple (fake) chunks that depend on each other
-    chunknames <- c("test1", "test2")
-    mockr::with_mock(
-      find_chunks = function(...) tibble(name = chunknames,
-                                         module = c("m1", "m2"),
-                                         chunk = chunknames,
-                                         disabled = c(TRUE, TRUE)),
-      chunk_inputs = function(...) tibble(name = chunknames,
-                                          input = c("i1", "o1"),
-                                          from_file = c(TRUE, FALSE)),
-      chunk_outputs = function(...) tibble(name = chunknames,
-                                           output = c("o1", "o2"),
-                                           to_xml = FALSE),
-      # output should be a tibble data frame
-      expect_is(chunk_readylist(), "tbl_df"),
-      # only 1 row - both chunks are disabled
-      expect_equal(nrow(chunk_readylist()), 2),
-      # each chunk has one input
-      expect_equal(chunk_readylist()$n_inputs, c(1, 1)),
-      # first chunk's inputs are available, second's are not
-      expect_equal(chunk_readylist()$n_avail, c(1, 0)),
-      # downstream dependency count
-      expect_equal(chunk_readylist()$n_deps_total, c(1, 0)),
-      expect_equal(count_downstream_dependencies(chunknames[1], find_chunks(),
-                                                 chunk_inputs(), chunk_outputs())[[1]], 1),
-      expect_equal(count_downstream_dependencies(chunknames[2], find_chunks(),
-                                                 chunk_inputs(), chunk_outputs())[[1]], 0)
-    )
-  })
-}
diff --git a/input/gcamdata/tests/testthat/test_chunks.R b/input/gcamdata/tests/testthat/test_chunks.R
index d0edb05734..6f41cdf48b 100644
--- a/input/gcamdata/tests/testthat/test_chunks.R
+++ b/input/gcamdata/tests/testthat/test_chunks.R
@@ -59,3 +59,12 @@ test_that("doesn't use forbidden calls", {
                  info = infostr)
   }
 })
+
+test_that("chunk names are correct", {
+
+  files_to_rename <- data.frame(orig_file_name = list.files("../../R/", full.names = TRUE)) %>%
+    filter(grepl("zchunk", orig_file_name))
+  expect_true(nrow(files_to_rename) == 0)
+
+})
+
diff --git a/input/gcamdata/tests/testthat/test_dstrace.R b/input/gcamdata/tests/testthat/test_dstrace.R
index e9bc443839..dd769cea06 100644
--- a/input/gcamdata/tests/testthat/test_dstrace.R
+++ b/input/gcamdata/tests/testthat/test_dstrace.R
@@ -86,7 +86,7 @@ test_that("info works", {
   expect_error(info("L100.FAO_ag_Exp_t", downstream = 1))
 
   # opens help page
-  expect_is(info("module_aglu_batch_an_input_xml"), "help_files_with_topic")
+  expect_is(info("module_aglu_an_input_xml"), "help_files_with_topic")
 
   # Most of this functionality is tested through the dstrace tests above
 })