diff --git a/modules/12_interest_rate/select_apr20/declarations.gms b/modules/12_interest_rate/select_apr20/declarations.gms
index 903d83e08d..8fdfce2de8 100644
--- a/modules/12_interest_rate/select_apr20/declarations.gms
+++ b/modules/12_interest_rate/select_apr20/declarations.gms
@@ -8,6 +8,6 @@
 parameters
  pm_interest(t_all,i)               Interest rate in each region and timestep (% per yr)
 * country-specific region scenario switch
- p12_country_dummy(iso)              Dummy parameter indicating whether country is affected by interest rate scenario (1)
+ p12_country_switch(iso)              Switch indicating whether country is affected by interest rate scenario (1)
  p12_reg_shr(t_all,i)                Weighted share of region with regards to interest rate scenario of countries (1)
 ;
diff --git a/modules/12_interest_rate/select_apr20/preloop.gms b/modules/12_interest_rate/select_apr20/preloop.gms
index 2f2f490305..71eaace15d 100644
--- a/modules/12_interest_rate/select_apr20/preloop.gms
+++ b/modules/12_interest_rate/select_apr20/preloop.gms
@@ -9,12 +9,12 @@
 * shall be applied.
 * In the default case, the interest rate scenario affects all countries when
 * activated.
-p12_country_dummy(iso) = 0;
-p12_country_dummy(select_countries12) = 1;
+p12_country_switch(iso) = 0;
+p12_country_switch(select_countries12) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p12_reg_shr(t_all,i) = sum(i_to_iso(i,iso), p12_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p12_reg_shr(t_all,i) = sum(i_to_iso(i,iso), p12_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 * Interest rate in countries selected in select_countries12
 $ifthen "%c12_interest_rate%" == "coupling"
diff --git a/modules/15_food/anthro_iso_jun22/declarations.gms b/modules/15_food/anthro_iso_jun22/declarations.gms
index 7d9fc7a1f9..2c7adc6de7 100644
--- a/modules/15_food/anthro_iso_jun22/declarations.gms
+++ b/modules/15_food/anthro_iso_jun22/declarations.gms
@@ -176,7 +176,7 @@ parameters
  i15_exo_foodscen_fader(t,iso)                Fader that converges per capita food consumption to an exogenous diet scenario (1)
 
 * country-specific scenario switch
- p15_country_dummy(iso)                       Dummy parameter indicating whether country is affected by diet scenarios (1)
+ p15_country_switch(iso)                       Switch indicating whether country is affected by diet scenarios (1)
 
 * calculate diet iteration breakpoint
  p15_income_pc_real_ppp(t,i)                  Regional per capita income after price shock on regional level (USD17PPP per capita)
diff --git a/modules/15_food/anthro_iso_jun22/preloop.gms b/modules/15_food/anthro_iso_jun22/preloop.gms
index 77b11ab436..8c05f5927c 100644
--- a/modules/15_food/anthro_iso_jun22/preloop.gms
+++ b/modules/15_food/anthro_iso_jun22/preloop.gms
@@ -58,8 +58,8 @@ Elseif s15_milk_share_fadeout_india = 1,
 * Switch to determine countries for which exogenous food scenarios (EAT Lancet diet and
 * food waste scenarios), and food substitution scenarios shall be applied.
 * In the default case, the exogenous food scenarios affect all countries.
-p15_country_dummy(iso) = 0;
-p15_country_dummy(scen_countries15) = 1;
+p15_country_switch(iso) = 0;
+p15_country_switch(scen_countries15) = 1;
 
 ** The following lines define scenario faders for substituting different food groups
 * If s15_exo_foodscen_functional_form = 1, the exogenous food scenario is faded in linearly.
@@ -96,13 +96,13 @@ elseif s15_food_subst_functional_form = 2,
 
 
 * Food substitution scenarios including functional forms, targets and transition periods
-i15_ruminant_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_ruminant_subst_fader(t);
-i15_fish_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_fish_subst_fader(t);
-i15_alcohol_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_alcohol_subst_fader(t);
-i15_livestock_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_livestock_subst_fader(t);
-i15_rumdairy_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_rumdairy_subst_fader(t);
-i15_rumdairy_scp_fadeout(t,iso) = 1 - p15_country_dummy(iso)*p15_rumdairy_scp_subst_fader(t);
-i15_livestock_fadeout_threshold(t,iso) = 1 - p15_country_dummy(iso)*p15_livestock_threshold_subst_fader(t);
+i15_ruminant_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_ruminant_subst_fader(t);
+i15_fish_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_fish_subst_fader(t);
+i15_alcohol_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_alcohol_subst_fader(t);
+i15_livestock_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_livestock_subst_fader(t);
+i15_rumdairy_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_rumdairy_subst_fader(t);
+i15_rumdairy_scp_fadeout(t,iso) = 1 - p15_country_switch(iso)*p15_rumdairy_scp_subst_fader(t);
+i15_livestock_fadeout_threshold(t,iso) = 1 - p15_country_switch(iso)*p15_livestock_threshold_subst_fader(t);
 
 
 ** The following lines define the scenario fader for the exogeneous food scenario
@@ -117,7 +117,7 @@ elseif s15_exo_foodscen_functional_form = 2,
 );
 
 * Fade in scenarios at country level
-i15_exo_foodscen_fader(t,iso) = p15_exo_food_scenario_fader(t) * p15_country_dummy(iso);
+i15_exo_foodscen_fader(t,iso) = p15_exo_food_scenario_fader(t) * p15_country_switch(iso);
 
 * Select from the data set of EAT Lancet scenarios the target years that are
 * consistent with the target year of the fader:
diff --git a/modules/15_food/anthro_iso_jun22/presolve.gms b/modules/15_food/anthro_iso_jun22/presolve.gms
index 1fed66b995..b76d8279d5 100644
--- a/modules/15_food/anthro_iso_jun22/presolve.gms
+++ b/modules/15_food/anthro_iso_jun22/presolve.gms
@@ -13,14 +13,14 @@ if(m_year(t) <= sm_fix_SSP2,
  i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"SSP2","halfsaturation");
  i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"SSP2","non_saturation");
 else
- i15_dem_intercept(iso,regr15)   = f15_demand_paras(regr15,"%c15_food_scenario%","intercept")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","intercept")*(1-p15_country_dummy(iso));
- i15_dem_saturation(iso,regr15)  = f15_demand_paras(regr15,"%c15_food_scenario%","saturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","saturation")*(1-p15_country_dummy(iso));
- i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"%c15_food_scenario%","halfsaturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","halfsaturation")*(1-p15_country_dummy(iso));
- i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"%c15_food_scenario%","non_saturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","non_saturation")*(1-p15_country_dummy(iso));
+ i15_dem_intercept(iso,regr15)   = f15_demand_paras(regr15,"%c15_food_scenario%","intercept")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","intercept")*(1-p15_country_switch(iso));
+ i15_dem_saturation(iso,regr15)  = f15_demand_paras(regr15,"%c15_food_scenario%","saturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","saturation")*(1-p15_country_switch(iso));
+ i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"%c15_food_scenario%","halfsaturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","halfsaturation")*(1-p15_country_switch(iso));
+ i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"%c15_food_scenario%","non_saturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","non_saturation")*(1-p15_country_switch(iso));
 );
 
 option nlp = conopt4;
diff --git a/modules/15_food/anthropometrics_jan18/declarations.gms b/modules/15_food/anthropometrics_jan18/declarations.gms
index 9bd4ef6563..607dac6395 100644
--- a/modules/15_food/anthropometrics_jan18/declarations.gms
+++ b/modules/15_food/anthropometrics_jan18/declarations.gms
@@ -172,7 +172,7 @@ parameters
  i15_exo_foodscen_fader(t,i)                  Fader that converges per capita food consumption to an exogenous diet scenario (1)
 
 * country-specific scenario switch
- p15_country_dummy(iso)                       Dummy parameter indicating whether country is affected by diet scenarios (1)
+ p15_country_switch(iso)                       Switch indicating whether country is affected by diet scenarios (1)
  p15_foodscen_region_shr(t_all,i)             Weighted share of region with regards to diet scenario of countries (1)
 
 * calculate diet iteration breakpoint
diff --git a/modules/15_food/anthropometrics_jan18/preloop.gms b/modules/15_food/anthropometrics_jan18/preloop.gms
index 6e4bae5792..ad58642464 100644
--- a/modules/15_food/anthropometrics_jan18/preloop.gms
+++ b/modules/15_food/anthropometrics_jan18/preloop.gms
@@ -64,13 +64,13 @@ p15_demand2intake_ratio_ref(i) = 0;
 * Switch to determine countries for which  exogenous food scenarios (EAT Lancet diet and
 * food waste scenarios), and food substitution scenarios shall be applied.
 * In the default case, the food scenario affects all countries when activated.
-p15_country_dummy(iso) = 0;
-p15_country_dummy(scen_countries15) = 1;
+p15_country_switch(iso) = 0;
+p15_country_switch(scen_countries15) = 1;
 
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p15_foodscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p15_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p15_foodscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p15_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 
 ** The following lines define scenario faders for substituting different food groups
diff --git a/modules/15_food/anthropometrics_jan18/presolve.gms b/modules/15_food/anthropometrics_jan18/presolve.gms
index 772a0a383d..1bf780458e 100644
--- a/modules/15_food/anthropometrics_jan18/presolve.gms
+++ b/modules/15_food/anthropometrics_jan18/presolve.gms
@@ -13,14 +13,14 @@ if(m_year(t) <= sm_fix_SSP2,
  i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"SSP2","halfsaturation");
  i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"SSP2","non_saturation");
 else
- i15_dem_intercept(iso,regr15)   = f15_demand_paras(regr15,"%c15_food_scenario%","intercept")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","intercept")*(1-p15_country_dummy(iso));
- i15_dem_saturation(iso,regr15)  = f15_demand_paras(regr15,"%c15_food_scenario%","saturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","saturation")*(1-p15_country_dummy(iso));
- i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"%c15_food_scenario%","halfsaturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","halfsaturation")*(1-p15_country_dummy(iso));
- i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"%c15_food_scenario%","non_saturation")*p15_country_dummy(iso)
-                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","non_saturation")*(1-p15_country_dummy(iso));
+ i15_dem_intercept(iso,regr15)   = f15_demand_paras(regr15,"%c15_food_scenario%","intercept")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","intercept")*(1-p15_country_switch(iso));
+ i15_dem_saturation(iso,regr15)  = f15_demand_paras(regr15,"%c15_food_scenario%","saturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","saturation")*(1-p15_country_switch(iso));
+ i15_dem_halfsat(iso,regr15)     = f15_demand_paras(regr15,"%c15_food_scenario%","halfsaturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","halfsaturation")*(1-p15_country_switch(iso));
+ i15_dem_nonsat(iso,regr15)      = f15_demand_paras(regr15,"%c15_food_scenario%","non_saturation")*p15_country_switch(iso)
+                                 + f15_demand_paras(regr15,"%c15_food_scenario_noselect%","non_saturation")*(1-p15_country_switch(iso));
 );
 
 option nlp = conopt4;
diff --git a/modules/22_land_conservation/area_based_apr22/declarations.gms b/modules/22_land_conservation/area_based_apr22/declarations.gms
index c036eee1ea..7a4302d79a 100644
--- a/modules/22_land_conservation/area_based_apr22/declarations.gms
+++ b/modules/22_land_conservation/area_based_apr22/declarations.gms
@@ -19,7 +19,7 @@ parameters
  p22_past_restore_pot(t,j)                          Potential pasture restoration area (mio. ha)
  p22_other_restore_pot(t,j)                         Potential other land restoration area (mio. ha)
  p22_country_weight(i)                              Land conservation country weight per region (1)
- p22_country_dummy(iso)                             Dummy parameter indicating whether country is affected by selected land conservation policy (1)
+ p22_country_switch(iso)                             Switch indicating whether country is affected by selected land conservation policy (1)
  i22_land_iso(iso)                                  Total land area at ISO level (mio. ha)
 ;
 
diff --git a/modules/22_land_conservation/area_based_apr22/preloop.gms b/modules/22_land_conservation/area_based_apr22/preloop.gms
index ab4b497f81..ab856aaf83 100644
--- a/modules/22_land_conservation/area_based_apr22/preloop.gms
+++ b/modules/22_land_conservation/area_based_apr22/preloop.gms
@@ -12,13 +12,13 @@
 * Regional share of land conservation policies in selective countries:
 * Country switch to determine countries for which land conservation shall be applied.
 * In the default case, the land conservation affects all countries when activated.
-p22_country_dummy(iso) = 0;
-p22_country_dummy(policy_countries22) = 1;
+p22_country_switch(iso) = 0;
+p22_country_switch(policy_countries22) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by total land area.
 i22_land_iso(iso) = sum(land, fm_land_iso("y1995",iso,land));
-p22_country_weight(i) = sum(i_to_iso(i,iso), p22_country_dummy(iso) * i22_land_iso(iso)) / sum(i_to_iso(i,iso), i22_land_iso(iso));
+p22_country_weight(i) = sum(i_to_iso(i,iso), p22_country_switch(iso) * i22_land_iso(iso)) / sum(i_to_iso(i,iso), i22_land_iso(iso));
 
 * ---------------------------------------------------------------------
 * Initialise baseline protection and conservation priority areas
diff --git a/modules/29_cropland/detail_apr24/declarations.gms b/modules/29_cropland/detail_apr24/declarations.gms
index d43f24181c..01ec807afd 100644
--- a/modules/29_cropland/detail_apr24/declarations.gms
+++ b/modules/29_cropland/detail_apr24/declarations.gms
@@ -16,7 +16,7 @@ parameters
  i29_snv_relocation_target(j)       Overall cropland area that requires relocation due to SNV policy (mio. ha)
  p29_snv_relocation(t,j)            Cropland area that is actually relocated during time step (mio. ha)
  p29_max_snv_relocation(t,j)        Maximum cropland relocation during time step (mio. ha)
- p29_country_dummy(iso)             Dummy parameter indicating whether country is affected by selected cropland policy (1)
+ p29_country_switch(iso)             Switch indicating whether country is affected by selected cropland policy (1)
  pm_avl_cropland_iso(iso)           Available land area for cropland at ISO level (mio. ha)
  i29_snv_scenario_fader(t_all)      SNV scenario fader (1)
 
diff --git a/modules/29_cropland/detail_apr24/preloop.gms b/modules/29_cropland/detail_apr24/preloop.gms
index d116470844..2d87573ce5 100644
--- a/modules/29_cropland/detail_apr24/preloop.gms
+++ b/modules/29_cropland/detail_apr24/preloop.gms
@@ -59,13 +59,13 @@ elseif s29_treecover_bii_coeff = 1,
 
 * Country switch to determine countries for which certain policies shall be applied.
 * In the default case, the policy affects all countries when activated.
-p29_country_dummy(iso) = 0;
-p29_country_dummy(policy_countries29) = 1;
+p29_country_switch(iso) = 0;
+p29_country_switch(policy_countries29) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by available cropland area.
 pm_avl_cropland_iso(iso) = f29_avl_cropland_iso(iso,"%c29_marginal_land%");
-p29_country_weight(i) = sum(i_to_iso(i,iso), p29_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
+p29_country_weight(i) = sum(i_to_iso(i,iso), p29_country_switch(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
 
 * Initialize biodiversity value
 vm_fallow.l(j) = 0;
diff --git a/modules/29_cropland/simple_apr24/declarations.gms b/modules/29_cropland/simple_apr24/declarations.gms
index a9e37fac6e..d7aaf7f4ff 100644
--- a/modules/29_cropland/simple_apr24/declarations.gms
+++ b/modules/29_cropland/simple_apr24/declarations.gms
@@ -12,7 +12,7 @@ parameters
  i29_snv_relocation_target(j)       Overall cropland area that requires relocation due to SNV policy (mio. ha)
  p29_snv_relocation(t,j)            Cropland area that is actually relocated during time step (mio. ha)
  p29_max_snv_relocation(t,j)        Maximum cropland relocation during time step (mio. ha)
- p29_country_dummy(iso)             Dummy parameter indicating whether country is affected by selected cropland policy (1)
+ p29_country_switch(iso)             Switch indicating whether country is affected by selected cropland policy (1)
  pm_avl_cropland_iso(iso)           Available land area for cropland at ISO level (mio. ha)
  i29_snv_scenario_fader(t_all)      SNV scenario fader (1)
 ;
diff --git a/modules/29_cropland/simple_apr24/preloop.gms b/modules/29_cropland/simple_apr24/preloop.gms
index 9b06b11d8f..3b4d075840 100644
--- a/modules/29_cropland/simple_apr24/preloop.gms
+++ b/modules/29_cropland/simple_apr24/preloop.gms
@@ -27,10 +27,10 @@ elseif s29_snv_shr > s29_snv_relocation_data_x1,
 
 * Country switch to determine countries for which certain policies shall be applied.
 * In the default case, the policy affects all countries when activated.
-p29_country_dummy(iso) = 0;
-p29_country_dummy(policy_countries29) = 1;
+p29_country_switch(iso) = 0;
+p29_country_switch(policy_countries29) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by available cropland area.
 pm_avl_cropland_iso(iso) = f29_avl_cropland_iso(iso,"%c29_marginal_land%");
-p29_country_weight(i) = sum(i_to_iso(i,iso), p29_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
+p29_country_weight(i) = sum(i_to_iso(i,iso), p29_country_switch(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
diff --git a/modules/30_croparea/detail_apr24/declarations.gms b/modules/30_croparea/detail_apr24/declarations.gms
index f5eedf4e2b..dfb1647f1d 100644
--- a/modules/30_croparea/detail_apr24/declarations.gms
+++ b/modules/30_croparea/detail_apr24/declarations.gms
@@ -14,7 +14,7 @@ parameters
  i30_betr_target(t,j)                   Target share for bioenergy land on total cropland (1)
  i30_betr_penalty(t)                    Penalty for violation of betr target (USD17MER per ha)
  p30_country_weight(i)                  Policy country weight per region (1)
- p30_country_dummy(iso)                 Dummy parameter indicating whether country is affected by selected policy (1)
+ p30_country_switch(iso)                 Switch indicating whether country is affected by selected policy (1)
 ;
 
 positive variables
diff --git a/modules/30_croparea/detail_apr24/preloop.gms b/modules/30_croparea/detail_apr24/preloop.gms
index 54fe834d90..c392b62370 100644
--- a/modules/30_croparea/detail_apr24/preloop.gms
+++ b/modules/30_croparea/detail_apr24/preloop.gms
@@ -33,12 +33,12 @@ if(s30_implementation = 1,
 
 * Country switch to determine countries for which certain policies shall be applied.
 * In the default case, the policy affects all countries when activated.
-p30_country_dummy(iso) = 0;
-p30_country_dummy(policy_countries30) = 1;
+p30_country_switch(iso) = 0;
+p30_country_switch(policy_countries30) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by available cropland area.
-p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
+p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_switch(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
 
 * Initialize biodiversity value
 vm_bv.l(j,"crop_ann",potnatveg) =
diff --git a/modules/30_croparea/simple_apr24/declarations.gms b/modules/30_croparea/simple_apr24/declarations.gms
index 3cfdfb3833..d1584ebe44 100644
--- a/modules/30_croparea/simple_apr24/declarations.gms
+++ b/modules/30_croparea/simple_apr24/declarations.gms
@@ -11,7 +11,7 @@ parameters
  i30_betr_target(t,j)                   Target share for bioenergy land on total cropland (1)
  i30_betr_penalty(t)                    Penalty for violation of betr target (USD17MER per ha)
  p30_country_weight(i)                  Policy country weight per region (1)
- p30_country_dummy(iso)                 Dummy parameter indicating whether country is affected by selected policy (1)
+ p30_country_switch(iso)                 Switch indicating whether country is affected by selected policy (1)
 ;
 
 positive variables
diff --git a/modules/30_croparea/simple_apr24/preloop.gms b/modules/30_croparea/simple_apr24/preloop.gms
index 119943f4a2..97c5e5f7c9 100644
--- a/modules/30_croparea/simple_apr24/preloop.gms
+++ b/modules/30_croparea/simple_apr24/preloop.gms
@@ -17,12 +17,12 @@ fm_croparea(t_past,j,w,kcr)$(fm_croparea(t_past,j,w,kcr)<0) = 0;
 
 * Country switch to determine countries for which certain policies shall be applied.
 * In the default case, the policy affects all countries when activated.
-p30_country_dummy(iso) = 0;
-p30_country_dummy(policy_countries30) = 1;
+p30_country_switch(iso) = 0;
+p30_country_switch(policy_countries30) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by available cropland area.
-p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
+p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_switch(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso));
 
 * Initialize biodiversity value
 vm_bv.l(j,"crop_ann",potnatveg) =
diff --git a/modules/42_water_demand/agr_sector_aug13/declarations.gms b/modules/42_water_demand/agr_sector_aug13/declarations.gms
index 3562706f56..b2de51776b 100644
--- a/modules/42_water_demand/agr_sector_aug13/declarations.gms
+++ b/modules/42_water_demand/agr_sector_aug13/declarations.gms
@@ -14,7 +14,7 @@ parameters
  i42_env_flow_policy(t,i)                  Determines whether environmental flow protection is enforced (1)
  p42_efp(t_all,scen42)                     Determines whether environmental flow protection is enforced and its fading in of environmental flow policy (1)
  p42_efp_fader(t_all)                      Determines the fading in of environmental flow policy (1)
- p42_country_dummy(iso)                    Dummy parameter indicating whether country is affected by EFP (1)
+ p42_country_switch(iso)                    Switch indicating whether country is affected by EFP (1)
  p42_EFP_region_shr(t_all,i)               Weighted share of region with regards to EFP (1)
  ic42_pumping_cost(i)                      Parameter to capture values for pumping costs in a particular time step (USD17MER per m^3)
  i42_watdem_total(t,j,watdem_ineldo,wtype) Non-agricultural water demand for entire year used in post-processing (mio. m^3 per yr)
diff --git a/modules/42_water_demand/agr_sector_aug13/presolve.gms b/modules/42_water_demand/agr_sector_aug13/presolve.gms
index 42b824cdad..b99925d4a7 100644
--- a/modules/42_water_demand/agr_sector_aug13/presolve.gms
+++ b/modules/42_water_demand/agr_sector_aug13/presolve.gms
@@ -45,12 +45,12 @@ i42_watdem_total(t,j,"manufacturing","withdrawal") = sum(wat_src, im_wat_avail(t
 
 * Country switch to determine countries for which EFP holds.
 * In the default case, the EFP affects all countries when activated.
-p42_country_dummy(iso) = 0;
-p42_country_dummy(EFP_countries) = 1;
+p42_country_switch(iso) = 0;
+p42_country_switch(EFP_countries) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p42_EFP_region_shr(t_all,i) = sum(i_to_iso(i,iso), p42_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p42_EFP_region_shr(t_all,i) = sum(i_to_iso(i,iso), p42_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 * Environmental policy switch:
 $ifthen "%c42_env_flow_policy%" == "mixed"
diff --git a/modules/42_water_demand/all_sectors_aug13/declarations.gms b/modules/42_water_demand/all_sectors_aug13/declarations.gms
index 1fa50b6846..9dddf95d94 100644
--- a/modules/42_water_demand/all_sectors_aug13/declarations.gms
+++ b/modules/42_water_demand/all_sectors_aug13/declarations.gms
@@ -14,7 +14,7 @@ parameters
  i42_env_flow_policy(t,i)                  Determines whether environmental flow protection is enforced (1)
  p42_efp(t_all,scen42)                     Determines whether environmental flow protection is enforced and its fading in of environmental flow policy (1)
  p42_efp_fader(t_all)                      Determines the fading in of environmental flow policy (1)
- p42_country_dummy(iso)                    Dummy parameter indicating whether country is affected by EFP (1)
+ p42_country_switch(iso)                    Switch indicating whether country is affected by EFP (1)
  p42_EFP_region_shr(t_all,i)               Weighted share of region with regards to EFP (1)
  ic42_pumping_cost(i)                      Parameter to capture values for pumping costs in a particular time step (USD17MER per m^3)
  i42_watdem_total(t,j,watdem_ineldo,wtype) Non-agricultural water demand for entire year used in post-processing (mio. m^3 per yr)
diff --git a/modules/42_water_demand/all_sectors_aug13/presolve.gms b/modules/42_water_demand/all_sectors_aug13/presolve.gms
index db3266e241..ea02be6521 100644
--- a/modules/42_water_demand/all_sectors_aug13/presolve.gms
+++ b/modules/42_water_demand/all_sectors_aug13/presolve.gms
@@ -66,12 +66,12 @@ Elseif (s42_env_flow_scenario = 1),
 
 * Country switch to determine countries for which EFP holds.
 * In the default case, the EFP affects all countries when activated.
-p42_country_dummy(iso) = 0;
-p42_country_dummy(EFP_countries) = 1;
+p42_country_switch(iso) = 0;
+p42_country_switch(EFP_countries) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p42_EFP_region_shr(t_all,i) = sum(i_to_iso(i,iso), p42_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p42_EFP_region_shr(t_all,i) = sum(i_to_iso(i,iso), p42_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 * Environmental policy switch:
 $ifthen "%c42_env_flow_policy%" == "mixed"
diff --git a/modules/50_nr_soil_budget/macceff_aug22/declarations.gms b/modules/50_nr_soil_budget/macceff_aug22/declarations.gms
index 51180277ef..80f59176aa 100644
--- a/modules/50_nr_soil_budget/macceff_aug22/declarations.gms
+++ b/modules/50_nr_soil_budget/macceff_aug22/declarations.gms
@@ -36,8 +36,8 @@ equations
 parameters
  i50_atmospheric_deposition_rates(t,j,land)   Atmospheric deposition rate (t N per ha)
 * country-specific scenario switch
- p50_country_dummy_cropneff(iso)           Dummy parameter indicating whether country is affected by crop neff scenario (1)
- p50_country_dummy_pastneff(iso)           Dummy parameter indicating whether country is affected by pasture neff scenario (1)
+ p50_country_switch_cropneff(iso)           Switch indicating whether country is affected by crop neff scenario (1)
+ p50_country_switch_pastneff(iso)           Switch indicating whether country is affected by pasture neff scenario (1)
  p50_cropneff_region_shr(t,i)              Weighted share of region with regards to crop neff scenario of countries (1)
  p50_pastneff_region_shr(t,i)              Weighted share of region with regards to pasture neff scenario of countries (1)
  i50_nr_eff_bau(t_all,i)                   Business as usual soil nitrogen uptake efficiency before MACCs mitigation (1)
diff --git a/modules/50_nr_soil_budget/macceff_aug22/preloop.gms b/modules/50_nr_soil_budget/macceff_aug22/preloop.gms
index bd7819097a..6b6249fd23 100644
--- a/modules/50_nr_soil_budget/macceff_aug22/preloop.gms
+++ b/modules/50_nr_soil_budget/macceff_aug22/preloop.gms
@@ -10,15 +10,15 @@
 * Country switches to determine countries for which chosen Neff scenario
 * shall be applied.
 * In the default case, the scenarios affects all countries when activated.
-p50_country_dummy_cropneff(iso) = 0;
-p50_country_dummy_cropneff(cropneff_countries) = 1;
-p50_country_dummy_pastneff(iso) = 0;
-p50_country_dummy_pastneff(pastneff_countries) = 1;
+p50_country_switch_cropneff(iso) = 0;
+p50_country_switch_cropneff(cropneff_countries) = 1;
+p50_country_switch_pastneff(iso) = 0;
+p50_country_switch_pastneff(pastneff_countries) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p50_cropneff_region_shr(t,i) = sum(i_to_iso(i,iso), p50_country_dummy_cropneff(iso) * im_pop_iso(t,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t,iso));
-p50_pastneff_region_shr(t,i) = sum(i_to_iso(i,iso), p50_country_dummy_pastneff(iso) * im_pop_iso(t,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t,iso));
+p50_cropneff_region_shr(t,i) = sum(i_to_iso(i,iso), p50_country_switch_cropneff(iso) * im_pop_iso(t,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t,iso));
+p50_pastneff_region_shr(t,i) = sum(i_to_iso(i,iso), p50_country_switch_pastneff(iso) * im_pop_iso(t,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t,iso));
 
 * Nitrogen use efficiency
 loop(t,
diff --git a/modules/55_awms/ipcc2006_aug16/declarations.gms b/modules/55_awms/ipcc2006_aug16/declarations.gms
index cc9ac5258e..26c8af2ced 100644
--- a/modules/55_awms/ipcc2006_aug16/declarations.gms
+++ b/modules/55_awms/ipcc2006_aug16/declarations.gms
@@ -11,7 +11,7 @@ parameters
  ic55_manure_fuel_shr(i,kli)                      Share of manure excreted on pastures used for fuel (tNr per tNr)
  ic55_awms_shr(i,kli,awms_conf)                   Share of manure Nr managed in each animal waste management systems (tNr per tNr)
  p55_region_shr(t_all,i)                          AWM scenario share of the region (1)
- p55_country_dummy(iso)                           Dummy parameter indicating whether country is affected by selected awm scenario (1)
+ p55_country_switch(iso)                           Switch indicating whether country is affected by selected awm scenario (1)
 ;
 
 
diff --git a/modules/55_awms/ipcc2006_aug16/presolve.gms b/modules/55_awms/ipcc2006_aug16/presolve.gms
index ef9510280e..5b041fb51a 100644
--- a/modules/55_awms/ipcc2006_aug16/presolve.gms
+++ b/modules/55_awms/ipcc2006_aug16/presolve.gms
@@ -8,12 +8,12 @@
 ****** Region price share for awm scenario of selective countries:
 * Country switch to determine countries for which awm scenario shall be applied.
 * In the default case, the awm scenario affects all countries when activated.
-p55_country_dummy(iso) = 0;
-p55_country_dummy(scen_countries55) = 1;
+p55_country_switch(iso) = 0;
+p55_country_switch(scen_countries55) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p55_region_shr(t_all,i) = sum(i_to_iso(i,iso), p55_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p55_region_shr(t_all,i) = sum(i_to_iso(i,iso), p55_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 
 if(m_year(t) <= sm_fix_SSP2,
diff --git a/modules/56_ghg_policy/price_aug22/declarations.gms b/modules/56_ghg_policy/price_aug22/declarations.gms
index 93a708ff16..b5963fd3c8 100644
--- a/modules/56_ghg_policy/price_aug22/declarations.gms
+++ b/modules/56_ghg_policy/price_aug22/declarations.gms
@@ -11,9 +11,9 @@ parameters
  p56_c_price_aff(t_all,i,ac)                      C price used for afforestation decision-making (USD17MER per tC)
  pc56_c_price_induced_aff                         Helper for fixing C price driven afforestation to zero for historic time steps (binary)
  p56_region_price_shr(t_all,i)                    GHG price share of the region (1)
- p56_country_dummy(iso)                           Dummy parameter indicating whether country is affected by selected GHG policy (1)
+ p56_country_switch(iso)                           Switch indicating whether country is affected by selected GHG policy (1)
  p56_region_fader_shr(t_all,i)                    GHG policy fader share of the region (1)
- p56_country_dummy2(iso)                          Dummy parameter indicating whether country is affected by selected GHG policy fader (1)
+ p56_country_switch2(iso)                          Switch indicating whether country is affected by selected GHG policy fader (1)
  p56_fader(t_all)                                 GHG policy fader (1)
  p56_fader_reg(t_all,i)                           Regional GHG policy fader (1)
  pcm_carbon_stock(j,land,c_pools,stockType)       Carbon stock in vegetation soil and litter for different land types (mio. tC)
diff --git a/modules/56_ghg_policy/price_aug22/preloop.gms b/modules/56_ghg_policy/price_aug22/preloop.gms
index fed1fc18ef..3922e0cca3 100644
--- a/modules/56_ghg_policy/price_aug22/preloop.gms
+++ b/modules/56_ghg_policy/price_aug22/preloop.gms
@@ -15,22 +15,22 @@ v56_emis_pricing.fx(i,emis_oneoff,pollutants)$(not sameas(pollutants,"co2_c")) =
 ****** Region price share for ghg policy of selective countries:
 * Country switch to determine countries for which ghg policy shall be applied.
 * In the default case, the ghg policy affects all countries when activated.
-p56_country_dummy(iso) = 0;
-p56_country_dummy(policy_countries56) = 1;
+p56_country_switch(iso) = 0;
+p56_country_switch(policy_countries56) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p56_region_price_shr(t_all,i) = sum(i_to_iso(i,iso), p56_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p56_region_price_shr(t_all,i) = sum(i_to_iso(i,iso), p56_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 ****** Regional fader share for ghg policy fader of selective countries:
 * Country switch to determine countries for which ghg policy fader shall be applied.
 * In the default case, the ghg policy fader affects all countries when activated.
-p56_country_dummy2(iso) = 0;
-p56_country_dummy2(fader_countries56) = 1;
+p56_country_switch2(iso) = 0;
+p56_country_switch2(fader_countries56) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p56_region_fader_shr(t_all,i) = sum(i_to_iso(i,iso), p56_country_dummy2(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p56_region_fader_shr(t_all,i) = sum(i_to_iso(i,iso), p56_country_switch2(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 ****select ghg prices
 $ifthen "%c56_pollutant_prices%" == "coupling"
diff --git a/modules/58_peatland/v2/declarations.gms b/modules/58_peatland/v2/declarations.gms
index 4151322e15..ced2ebeda0 100644
--- a/modules/58_peatland/v2/declarations.gms
+++ b/modules/58_peatland/v2/declarations.gms
@@ -18,7 +18,7 @@ parameters
  p58_availLandExp(t,j)               Available area for expansion of managed land (mio. ha)
  i58_peatland_rewetting_fader(t_all) Temporal fader for exogenous peatland rewetting (1)
  p58_peatland_ref(j,land58)          Peatland area in reference period (mio. ha)
- p58_country_dummy(iso)              Dummy parameter indicating whether country is affected by exogenous peatland rewetting (1)
+ p58_country_switch(iso)              Switch indicating whether country is affected by exogenous peatland rewetting (1)
  p58_country_weight(i)               Policy country weight per region (1)
  i58_rewetting_exo(t,j)              Cellular share of drained peatland in reference period to be rewetted (1)
  i58_intact_protection_exo(j)        Cellular share of intact peatland that should be protected (1)
diff --git a/modules/58_peatland/v2/preloop.gms b/modules/58_peatland/v2/preloop.gms
index ea9fd54f81..beda385ea5 100644
--- a/modules/58_peatland/v2/preloop.gms
+++ b/modules/58_peatland/v2/preloop.gms
@@ -10,12 +10,12 @@ m_linear_time_interpol(i58_peatland_rewetting_fader,s58_rewet_exo_start_year,s58
 
 * Country switch to determine countries for which certain policies shall be applied.
 * In the default case, the policy affects all countries when activated.
-p58_country_dummy(iso) = 0;
-p58_country_dummy(policy_countries58) = 1;
+p58_country_switch(iso) = 0;
+p58_country_switch(policy_countries58) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by total peatland area.
-p58_country_weight(i) = sum(i_to_iso(i,iso), p58_country_dummy(iso) * sum(land58, f58_peatland_area_iso(iso,land58))) 
+p58_country_weight(i) = sum(i_to_iso(i,iso), p58_country_switch(iso) * sum(land58, f58_peatland_area_iso(iso,land58))) 
   / sum(i_to_iso(i,iso), sum(land58, f58_peatland_area_iso(iso,land58)));
 
 * construct exogenous peatland rewetting scenario
diff --git a/modules/60_bioenergy/1st2ndgen_priced_feb24/declarations.gms b/modules/60_bioenergy/1st2ndgen_priced_feb24/declarations.gms
index d3efbe17da..41aef0e838 100644
--- a/modules/60_bioenergy/1st2ndgen_priced_feb24/declarations.gms
+++ b/modules/60_bioenergy/1st2ndgen_priced_feb24/declarations.gms
@@ -14,7 +14,7 @@ parameters
  i60_1stgen_bioenergy_subsidy_gj(t)               Global 1st generation bioenergy subsidy per GJ (USD17MER per GJ)
  i60_2ndgen_bioenergy_subsidy(t)                  Global 2nd generation bioenergy subsidy (USD17MER per GHJ)
  p60_region_BE_shr(t_all,i)                       Bioenergy demand share of the region (1)
- p60_country_dummy(iso)                           Dummy parameter indicating whether country is selected for selected bioenergy demand scenario (1)
+ p60_country_switch(iso)                           Switch indicating whether country is selected for selected bioenergy demand scenario (1)
 ;
 
 positive variables
diff --git a/modules/60_bioenergy/1st2ndgen_priced_feb24/preloop.gms b/modules/60_bioenergy/1st2ndgen_priced_feb24/preloop.gms
index edd93ec225..ea45f9af15 100644
--- a/modules/60_bioenergy/1st2ndgen_priced_feb24/preloop.gms
+++ b/modules/60_bioenergy/1st2ndgen_priced_feb24/preloop.gms
@@ -9,12 +9,12 @@
 * Country switch to determine countries for which scenario shall be applied.
 * In the default case, the selected scneario (c60_2ndgen_biodem) affects
 * all countries.
-p60_country_dummy(iso) = 0;
-p60_country_dummy(scen_countries60) = 1;
+p60_country_switch(iso) = 0;
+p60_country_switch(scen_countries60) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p60_region_BE_shr(t_all,i) = sum(i_to_iso(i,iso), p60_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p60_region_BE_shr(t_all,i) = sum(i_to_iso(i,iso), p60_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 $ifthen "%c60_2ndgen_biodem%" == "coupling"
   i60_bioenergy_dem(t,i) = f60_bioenergy_dem_coupling(t,i);
diff --git a/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms b/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms
index 9894f55c98..573b3a974c 100644
--- a/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms
+++ b/modules/60_bioenergy/1stgen_priced_dec18/declarations.gms
@@ -11,7 +11,7 @@ parameters
  i60_res_2ndgenBE_dem(t,i)                        Regional residue demand for 2nd generation bioenergy per year (mio. GJ per yr)
  i60_1stgen_bioenergy_dem(t,i,kall)               Regional 1st generation bioenergy demand (mio. GJ per yr)
  p60_region_BE_shr(t_all,i)                       Bioenergy demand share of the region (1)
- p60_country_dummy(iso)                           Dummy parameter indicating whether country is selected for selected bioenergy demand scenario (1)
+ p60_country_switch(iso)                           Switch indicating whether country is selected for selected bioenergy demand scenario (1)
 ;
 
 positive variables
diff --git a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms
index f92a9a2590..5ad503452c 100644
--- a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms
+++ b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms
@@ -9,12 +9,12 @@
 * Country switch to determine countries for which scenario shall be applied.
 * In the default case, the selected scneario (c60_2ndgen_biodem) affects
 * all countries.
-p60_country_dummy(iso) = 0;
-p60_country_dummy(scen_countries60) = 1;
+p60_country_switch(iso) = 0;
+p60_country_switch(scen_countries60) = 1;
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p60_region_BE_shr(t_all,i) = sum(i_to_iso(i,iso), p60_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p60_region_BE_shr(t_all,i) = sum(i_to_iso(i,iso), p60_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 $ifthen "%c60_2ndgen_biodem%" == "coupling"
   i60_bioenergy_dem(t,i) = f60_bioenergy_dem_coupling(t,i);
diff --git a/modules/70_livestock/fbask_jan16/declarations.gms b/modules/70_livestock/fbask_jan16/declarations.gms
index 0b1503dba5..eb9caad503 100644
--- a/modules/70_livestock/fbask_jan16/declarations.gms
+++ b/modules/70_livestock/fbask_jan16/declarations.gms
@@ -30,7 +30,7 @@ parameters
  pm_past_mngmnt_factor(t,i)                       Regional pasture management intensification factor (1)
  i70_cereal_scp_fadeout(t_all,i)                  Cereal feed fadeout (share 0-1) to be replaced by SCP (1)
  i70_foddr_scp_fadeout(t_all,i)                   Fodder fadeout (share 0-1) to be replaced by SCP (1)
- p70_country_dummy(iso)                           Dummy parameter indicating whether country is affected by feed scenarios (1)
+ p70_country_switch(iso)                           Switch indicating whether country is affected by feed scenarios (1)
  p70_feedscen_region_shr(t_all,i)                 Weighted share of region with regards to feed scenario of countries (1)
  i70_cost_regr(i,kap,cost_regr)                   Regression coefficients for livestock factor requirements (1)
  i70_fac_req_livst(t_all,i,kli)                   Factor requirements (USD17MER per tDM)
diff --git a/modules/70_livestock/fbask_jan16/preloop.gms b/modules/70_livestock/fbask_jan16/preloop.gms
index 4564602ff2..5a8c12632b 100644
--- a/modules/70_livestock/fbask_jan16/preloop.gms
+++ b/modules/70_livestock/fbask_jan16/preloop.gms
@@ -21,14 +21,14 @@ i70_livestock_productivity(t_all,i,sys)$(i70_livestock_productivity(t_all,i,sys)
 
 * Switch to determine countries for which feed substitution scenarios shall be applied.
 * In the default case, the food scenario affects all countries when activated.
-p70_country_dummy(iso) = 0;
-p70_country_dummy(scen_countries70) = 1;
+p70_country_switch(iso) = 0;
+p70_country_switch(scen_countries70) = 1;
 
 
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p70_feedscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p70_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p70_feedscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p70_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 
 if (s70_subst_functional_form = 1,
diff --git a/modules/70_livestock/fbask_jan16_sticky/declarations.gms b/modules/70_livestock/fbask_jan16_sticky/declarations.gms
index 4e00176562..3d342abd78 100644
--- a/modules/70_livestock/fbask_jan16_sticky/declarations.gms
+++ b/modules/70_livestock/fbask_jan16_sticky/declarations.gms
@@ -32,7 +32,7 @@ parameters
  pm_past_mngmnt_factor(t,i)                       Regional pasture management intensification factor (1)
  i70_cereal_scp_fadeout(t_all,i)                  Cereal feed fadeout (share 0-1) to be replaced by SCP (1)
  i70_foddr_scp_fadeout(t_all,i)                   Fodder fadeout (share 0-1) to be replaced by SCP (1)
- p70_country_dummy(iso)                           Dummy parameter indicating whether country is affected by feed scenarios (1)
+ p70_country_switch(iso)                           Switch indicating whether country is affected by feed scenarios (1)
  p70_feedscen_region_shr(t_all,i)                 Weighted share of region with regards to feed scenario of countries (1)
  i70_cost_regr(i,kap,cost_regr)                   Regression coefficients for livestock factor requirements (1)
  i70_fac_req_livst(t_all,i,kli)                   Factor requirements (USD17MER per tDM)
diff --git a/modules/70_livestock/fbask_jan16_sticky/preloop.gms b/modules/70_livestock/fbask_jan16_sticky/preloop.gms
index 1e223d4a72..7ef03f7794 100644
--- a/modules/70_livestock/fbask_jan16_sticky/preloop.gms
+++ b/modules/70_livestock/fbask_jan16_sticky/preloop.gms
@@ -21,14 +21,14 @@ i70_livestock_productivity(t_all,i,sys)$(i70_livestock_productivity(t_all,i,sys)
 
 * Switch to determine countries for which feed substitution scenarios shall be applied.
 * In the default case, the food scenario affects all countries when activated.
-p70_country_dummy(iso) = 0;
-p70_country_dummy(scen_countries70) = 1;
+p70_country_switch(iso) = 0;
+p70_country_switch(scen_countries70) = 1;
 
 
 * Because MAgPIE is not run at country-level, but at region level, a region
 * share is calculated that translates the countries' influence to regional level.
 * Countries are weighted by their population size.
-p70_feedscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p70_country_dummy(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
+p70_feedscen_region_shr(t_all,i) = sum(i_to_iso(i,iso), p70_country_switch(iso) * im_pop_iso(t_all,iso)) / sum(i_to_iso(i,iso), im_pop_iso(t_all,iso));
 
 
 if (s70_subst_functional_form = 1,