Regenerate code (Kranc commit 01478e8bf1bc509f67a3f8fa2c18021dc9b975f3)

Reordering of entries in param.ccl due to internal cleanup in Kranc.

7 files changed, 410 insertions, 410 deletions

diff --git a/ML_ADM/param.ccl b/ML_ADM/param.ccl
index 84f41e6..6c1dcaf 100644
--- a/ML_ADM/param.ccl
+++ b/ML_ADM/param.ccl
@@ -24,6 +24,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT fdOrder "fdOrder"
 {
   *:* :: ""
@@ -68,12 +74,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT ML_ADM_Minkowski_calc_every "ML_ADM_Minkowski_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -158,7 +158,7 @@ CCTK_INT ML_ADM_constraints_boundary_calc_offset "ML_ADM_constraints_boundary_ca
 } 0
 
 private:
-KEYWORD K11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -170,7 +170,7 @@ KEYWORD K11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD K12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -182,7 +182,7 @@ KEYWORD K12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD K13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -194,7 +194,7 @@ KEYWORD K13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD K22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -206,7 +206,7 @@ KEYWORD K22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD K23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -218,7 +218,7 @@ KEYWORD K23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD K33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD g33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -230,7 +230,7 @@ KEYWORD K33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -242,7 +242,7 @@ KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -254,7 +254,7 @@ KEYWORD g11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -266,7 +266,7 @@ KEYWORD g12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -278,7 +278,7 @@ KEYWORD g13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -290,7 +290,7 @@ KEYWORD g22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD K33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -302,7 +302,7 @@ KEYWORD g23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD g33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -350,7 +350,7 @@ KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -362,7 +362,7 @@ KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -374,7 +374,7 @@ KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -398,79 +398,79 @@ KEYWORD ML_shift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-CCTK_REAL K11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL K12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL K13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL K22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL K23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL K33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL g33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL K33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL g33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
@@ -494,19 +494,19 @@ CCTK_REAL beta3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 } 1.
 
 private:
-CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
@@ -518,79 +518,79 @@ CCTK_REAL ML_shift_bound_speed "characteristic speed at boundary" STEERABLE=ALWA
 } 1.
 
 private:
-CCTK_REAL K11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL K12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL K13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL K22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL K23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL K33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL g33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL K33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL g33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
@@ -614,19 +614,19 @@ CCTK_REAL beta3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
@@ -638,79 +638,79 @@ CCTK_REAL ML_shift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL K11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL K12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL K13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL K22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL K23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL K33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL g33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL K33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL g33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
@@ -734,19 +734,19 @@ CCTK_REAL beta3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
diff --git a/ML_ADMConstraints/param.ccl b/ML_ADMConstraints/param.ccl
index 56d401e..0f476ea 100644
--- a/ML_ADMConstraints/param.ccl
+++ b/ML_ADMConstraints/param.ccl
@@ -24,6 +24,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT ML_ADMConstraints_MaxNumEvolvedVars "Number of evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars STEERABLE=RECOVER
 {
   0:0 :: "Number of evolved variables used by this thorn"
@@ -48,12 +54,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT ML_ADMConstraints_calc_every "ML_ADMConstraints_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_ADMQuantities/param.ccl b/ML_ADMQuantities/param.ccl
index 0609b67..9352e5d 100644
--- a/ML_ADMQuantities/param.ccl
+++ b/ML_ADMQuantities/param.ccl
@@ -24,6 +24,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_INT conformalMethod "Treatment of conformal factor"
 {
   *:* :: ""
@@ -54,12 +60,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT ML_ADMQuantities_calc_every "ML_ADMQuantities_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN/param.ccl b/ML_BSSN/param.ccl
index d9b36e4..d9d73be 100644
--- a/ML_BSSN/param.ccl
+++ b/ML_BSSN/param.ccl
@@ -58,6 +58,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_REAL LapseACoeff "Whether to evolve A in time"
 {
   "*:*" :: ""
@@ -241,12 +247,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT ML_BSSN_Minkowski_calc_every "ML_BSSN_Minkowski_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -463,7 +463,7 @@ CCTK_INT ML_BSSN_constraints2_calc_offset "ML_BSSN_constraints2_calc_offset" STE
 } 0
 
 private:
-KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -475,7 +475,7 @@ KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -487,7 +487,7 @@ KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -499,7 +499,7 @@ KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -511,7 +511,7 @@ KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -523,7 +523,7 @@ KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -535,7 +535,7 @@ KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -547,7 +547,7 @@ KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -559,7 +559,7 @@ KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -571,7 +571,7 @@ KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -583,7 +583,7 @@ KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -595,7 +595,7 @@ KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -607,7 +607,7 @@ KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -619,7 +619,7 @@ KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -631,7 +631,7 @@ KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -643,7 +643,7 @@ KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -655,7 +655,7 @@ KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -667,7 +667,7 @@ KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -679,7 +679,7 @@ KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -691,7 +691,7 @@ KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -703,7 +703,7 @@ KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -715,7 +715,7 @@ KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -727,7 +727,7 @@ KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -739,7 +739,7 @@ KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -751,7 +751,7 @@ KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -763,7 +763,7 @@ KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -775,7 +775,7 @@ KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -787,7 +787,7 @@ KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -799,7 +799,7 @@ KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -811,7 +811,7 @@ KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -823,7 +823,7 @@ KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -835,7 +835,7 @@ KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -859,7 +859,7 @@ KEYWORD ML_shift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -871,193 +871,193 @@ KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-CCTK_REAL At11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL A_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL phi_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL A_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL trK_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_dtlapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_dtshift_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_Gamma_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_log_confac_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
@@ -1069,199 +1069,199 @@ CCTK_REAL ML_shift_bound_speed "characteristic speed at boundary" STEERABLE=ALWA
 } 1.
 
 private:
-CCTK_REAL ML_trace_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL A_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL phi_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL A_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL trK_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtlapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtshift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_Gamma_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_log_confac_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
@@ -1273,199 +1273,199 @@ CCTK_REAL ML_shift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_trace_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL A_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL phi_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL A_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL trK_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtlapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtshift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_Gamma_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_log_confac_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
@@ -1477,7 +1477,7 @@ CCTK_REAL ML_shift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_trace_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
diff --git a/ML_CCZ4/param.ccl b/ML_CCZ4/param.ccl
index 07c918c..d6f55e8 100644
--- a/ML_CCZ4/param.ccl
+++ b/ML_CCZ4/param.ccl
@@ -58,6 +58,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:3 :: ""
+} 1
+
+restricted:
 CCTK_REAL GammaShift "Covariant shift term in Gamma"
 {
   "*:*" :: ""
@@ -259,12 +265,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:3 :: ""
-} 1
-
-restricted:
 CCTK_INT ML_CCZ4_Minkowski_calc_every "ML_CCZ4_Minkowski_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -481,7 +481,7 @@ CCTK_INT ML_CCZ4_constraints2_calc_offset "ML_CCZ4_constraints2_calc_offset" STE
 } 0
 
 private:
-KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -493,7 +493,7 @@ KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -505,7 +505,7 @@ KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -517,7 +517,7 @@ KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -529,7 +529,7 @@ KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -541,7 +541,7 @@ KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -553,7 +553,7 @@ KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -565,7 +565,7 @@ KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -577,7 +577,7 @@ KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -589,7 +589,7 @@ KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -601,7 +601,7 @@ KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -613,7 +613,7 @@ KEYWORD Xt1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -625,7 +625,7 @@ KEYWORD Xt2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -637,7 +637,7 @@ KEYWORD Xt3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -649,7 +649,7 @@ KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -661,7 +661,7 @@ KEYWORD phi_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -673,7 +673,7 @@ KEYWORD gt11_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD At33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -685,7 +685,7 @@ KEYWORD gt12_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD alpha_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -697,7 +697,7 @@ KEYWORD gt13_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD A_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -709,7 +709,7 @@ KEYWORD gt22_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -721,7 +721,7 @@ KEYWORD gt23_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -733,7 +733,7 @@ KEYWORD gt33_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -745,7 +745,7 @@ KEYWORD beta1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B1_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -757,7 +757,7 @@ KEYWORD beta2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B2_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -769,7 +769,7 @@ KEYWORD beta3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD B3_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -781,7 +781,7 @@ KEYWORD Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -793,7 +793,7 @@ KEYWORD trK_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -805,7 +805,7 @@ KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -817,7 +817,7 @@ KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -829,7 +829,7 @@ KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -841,7 +841,7 @@ KEYWORD ML_Gamma_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -853,7 +853,7 @@ KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_lapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -865,7 +865,7 @@ KEYWORD ML_log_confac_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_metric_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_dtlapse_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -889,7 +889,7 @@ KEYWORD ML_shift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_dtshift_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -901,7 +901,7 @@ KEYWORD ML_Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD ML_Theta_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -913,199 +913,199 @@ KEYWORD ML_trace_curv_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-CCTK_REAL At11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL A_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL B3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Xt3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL phi_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt11_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt12_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt13_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt22_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL A_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt23_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL gt33_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL beta3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL Theta_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL trK_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL Theta_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_dtlapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_dtshift_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_Gamma_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_log_confac_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_metric_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
@@ -1117,211 +1117,211 @@ CCTK_REAL ML_shift_bound_speed "characteristic speed at boundary" STEERABLE=ALWA
 } 1.
 
 private:
-CCTK_REAL ML_Theta_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL ML_trace_curv_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL ML_Theta_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL At11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL A_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL B3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL phi_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt11_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt12_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt13_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt22_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL A_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt23_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt33_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL Theta_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL trK_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL Theta_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtlapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtshift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_Gamma_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_log_confac_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
@@ -1333,211 +1333,211 @@ CCTK_REAL ML_shift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_Theta_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_trace_curv_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL ML_Theta_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL At11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL phi_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL At33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL A_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL gt33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL B3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Xt3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL trK_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Xt3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL phi_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt11_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt12_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL At33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt13_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL alpha_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt22_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL A_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt23_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL gt33_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL beta3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B1_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL beta3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B2_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL Theta_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL B3_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL trK_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL Theta_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_log_confac_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtlapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_dtshift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_Gamma_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_Gamma_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_trace_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_log_confac_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_lapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_metric_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_dtlapse_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
@@ -1549,13 +1549,13 @@ CCTK_REAL ML_shift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 } 0.
 
 private:
-CCTK_REAL ML_Theta_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_dtshift_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL ML_trace_curv_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL ML_Theta_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
diff --git a/ML_WaveToy/param.ccl b/ML_WaveToy/param.ccl
index 566093e..b537de3 100644
--- a/ML_WaveToy/param.ccl
+++ b/ML_WaveToy/param.ccl
@@ -18,6 +18,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:2 :: ""
+} 1
+
+restricted:
 CCTK_REAL amplitude "Amplitude of initial Gaussian"
 {
   "*:*" :: ""
@@ -61,12 +67,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:2 :: ""
-} 1
-
-restricted:
 CCTK_INT WT_Gaussian_calc_every "WT_Gaussian_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -139,7 +139,7 @@ CCTK_INT WT_EnergyBoundary_calc_offset "WT_EnergyBoundary_calc_offset" STEERABLE
 } 0
 
 private:
-KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -151,7 +151,7 @@ KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -163,7 +163,7 @@ KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -175,7 +175,7 @@ KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -187,73 +187,73 @@ KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-CCTK_REAL rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL WT_rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL WT_u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
diff --git a/ML_WaveToy_CL/param.ccl b/ML_WaveToy_CL/param.ccl
index 616b192..9ced6ad 100644
--- a/ML_WaveToy_CL/param.ccl
+++ b/ML_WaveToy_CL/param.ccl
@@ -18,6 +18,12 @@ CCTK_INT verbose "verbose" STEERABLE=ALWAYS
 } 0
 
 restricted:
+CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
+{
+  0:2 :: ""
+} 1
+
+restricted:
 CCTK_REAL amplitude "Amplitude of initial Gaussian"
 {
   "*:*" :: ""
@@ -61,12 +67,6 @@ CCTK_INT rhs_timelevels "Number of active RHS timelevels" STEERABLE=RECOVER
 } 1
 
 restricted:
-CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid functions" STEERABLE=RECOVER
-{
-  0:2 :: ""
-} 1
-
-restricted:
 CCTK_INT WT_CL_Gaussian_calc_every "WT_CL_Gaussian_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -139,7 +139,7 @@ CCTK_INT WT_CL_EnergyBoundary_calc_offset "WT_CL_EnergyBoundary_calc_offset" STE
 } 0
 
 private:
-KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -151,7 +151,7 @@ KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -163,7 +163,7 @@ KEYWORD u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "skip"
 
 private:
-KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -175,7 +175,7 @@ KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
+KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
 {
   "flat" :: "Flat boundary condition"
   "none" :: "No boundary condition"
@@ -187,73 +187,73 @@ KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
 } "none"
 
 private:
-CCTK_REAL rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL WT_rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL WT_u_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
 {
   "0:*" :: "outgoing characteristic speed > 0"
 } 1.
 
 private:
-CCTK_REAL rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_u_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_limit "limit value for r -> infinity" STEERABLE=ALWAYS
 {
   "*:*" :: "value of limit value is unrestricted"
 } 0.
 
 private:
-CCTK_REAL rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL WT_u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.
 
 private:
-CCTK_REAL WT_u_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
+CCTK_REAL WT_rho_bound_scalar "Dirichlet boundary value" STEERABLE=ALWAYS
 {
   "*:*" :: "unrestricted"
 } 0.