diff --git a/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao b/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao
index 8219a124c3..e72c52caa4 100755
--- a/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao
+++ b/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao
@@ -36,16 +36,16 @@ set dat *@extra_orbit.y[*]|meas=0
 use dat *@orbit
 use dat *@extra_orbit
 
-use var fa.correctors.x
-use var fa.correctors.y
-use var za.correctors.x
-use var za.correctors.y
+use var fa_correctors_x
+use var fa_correctors_y
+use var za_correctors_x
+use var za_correctors_y
 
-!use var fa.correctors.x[1:-2:2]
-!use var za.correctors.x[1:-2:2]
-!use var fa.correctors.y[2:-1:2]
+!use var fa_correctors_x[1:-2:2]
+!use var za_correctors_x[1:-2:2]
+!use var fa_correctors_y[2:-1:2]
 
-!use var quad.correctors.x
+!use var quad_correctors_x
 
 set global derivative_recalc = F 
 set global derivative_uses_design = T
diff --git a/bmad-doc/tao_examples/cbeta_ffag/tao.init b/bmad-doc/tao_examples/cbeta_ffag/tao.init
index 6d7675a3a6..1609e841ce 100755
--- a/bmad-doc/tao_examples/cbeta_ffag/tao.init
+++ b/bmad-doc/tao_examples/cbeta_ffag/tao.init
@@ -170,7 +170,7 @@
 
 !--- Correctors
 &tao_var
-    v1_var%name = "fa.correctors.x"
+    v1_var%name = "fa_correctors_x"
   default_universe = 'gang'
   default_attribute = "BL_HKICK"
   default_weight = 1e9
@@ -181,7 +181,7 @@
   search_for_lat_eles = "KICKER::FA*"
 /
 &tao_var
-    v1_var%name = "fa.correctors.y"
+    v1_var%name = "fa_correctors_y"
   default_universe = 'gang'
   default_attribute = "BL_VKICK"
   default_weight = 1e9
@@ -192,7 +192,7 @@
   search_for_lat_eles = "KICKER::FA*"
 /
 &tao_var
-    v1_var%name = "za.correctors.x"
+    v1_var%name = "za_correctors_x"
   default_universe = 'gang'
   default_attribute = "BL_HKICK"
   default_weight = 1e9
@@ -203,7 +203,7 @@
   search_for_lat_eles = "KICKER::ZA*"
 /
 &tao_var
-    v1_var%name = "za.correctors.y"
+    v1_var%name = "za_correctors_y"
   default_universe = 'gang'
   default_attribute = "BL_VKICK"
   default_weight = 1e9
@@ -215,7 +215,7 @@
 /
 
 &tao_var
-    v1_var%name = "quad.correctors.x"
+    v1_var%name = "quad_correctors_x"
   default_universe = 'gang'
   default_attribute = "BL_HKICK"
   default_weight = 1e9
@@ -226,7 +226,7 @@
   search_for_lat_eles = "QUAD::*"
 /
 &tao_var
-    v1_var%name = "quad.correctors.y"
+    v1_var%name = "quad_correctors_y"
   default_universe = 'gang'
   default_attribute = "BL_VKICK"
   default_weight = 1e9
diff --git a/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init b/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init
index 07f0f7a2c0..6a7b518eb9 100755
--- a/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init
+++ b/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init
@@ -2895,34 +2895,34 @@ curve(2)%legend_text = 'Y'
   graph%y%major_div = 4
 
   curve(1)%data_source = 'var_array'
-  curve(1)%data_type = 'fa.correctors.x'
+  curve(1)%data_type = 'fa_correctors_x'
   curve(1)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(1)%draw_symbols = T
 
   curve(2)%data_source = 'var_array'
-  curve(2)%data_type = 'fa.correctors.y'
+  curve(2)%data_type = 'fa_correctors_y'
   curve(2)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(2)%draw_symbols = T
   curve(2)%line%color = "red"
   
   curve(3)%data_source = 'var_array'
-  curve(3)%data_type = 'za.correctors.x'
+  curve(3)%data_type = 'za_correctors_x'
   curve(3)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(3)%draw_symbols = T
 
   curve(4)%data_source = 'var_array'
-  curve(4)%data_type = 'za.correctors.y'
+  curve(4)%data_type = 'za_correctors_y'
   curve(4)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(4)%draw_symbols = T
   curve(4)%line%color = "red"
   
   curve(5)%data_source = 'var_array'
-  curve(5)%data_type = 'quad.correctors.x'
+  curve(5)%data_type = 'quad_correctors_x'
   curve(5)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(5)%draw_symbols = T
 
   curve(6)%data_source = 'var_array'
-  curve(6)%data_type = 'quad.correctors.y'
+  curve(6)%data_type = 'quad_correctors_y'
   curve(6)%y_axis_scale_factor = 1e6  ! Gauss*cm
   curve(6)%draw_symbols = T
   curve(6)%line%color = "red"
diff --git a/bmad-doc/tao_examples/space_charge/lat2.bmad b/bmad-doc/tao_examples/space_charge/lat2.bmad
new file mode 100644
index 0000000000..ea8f5aaabd
--- /dev/null
+++ b/bmad-doc/tao_examples/space_charge/lat2.bmad
@@ -0,0 +1,20 @@
+
+parameter[lattice] = "Space Charge example"
+
+beginning[beta_a] = 1000
+beginning[beta_B] = 1000
+parameter[e_tot] = 10e6
+parameter[particle] = electron    
+
+parameter[geometry] = open
+
+
+p1: pipe, L = 1
+
+!, ds_step = .1
+
+q1: quad, superimpose, ref=p1, L = 0.99
+
+lat: line = (p1)
+
+use, lat