diff --git a/submissions/EBeam_heaters_snewman_RMA1.yaml b/submissions/EBeam_heaters_snewman_RMA1.yaml
index 6dd6ecc..ed2786e 100644
--- a/submissions/EBeam_heaters_snewman_RMA1.yaml
+++ b/submissions/EBeam_heaters_snewman_RMA1.yaml
@@ -1,228 +1,47 @@
-Devices:
-  BraggGratingwithHeater,comment,comment:
-    DeviceID: snewman_RMA1
-    Electrical Coordinates: []
-    Optical Coordinates:
-    - 50.0
-    - 304.0
-    Polarization: TE
-    RoutineCheck: true
-    Routines:
-    - Set Wavelength Voltage Sweep:VoltageSweep_1480,1500,1530,1550
-    - Set Wavelength Current Sweep:CurrentSweep_1480,1500,1550
-    - Set Voltage Wavelength Sweep:WavelengthSweep_0.1,0.2,0.3
-    Type: device
-    Wavelength: '1550'
-Routines:
-  Current Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Set Voltage Wavelength Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: 1, 2, 3
-      Wavelengths: ''
-      setvflag: true
-      setwflag: false
-    WavelengthSweep_0.1,0.2,0.3:
-      Channel A: true
-      Channel B: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: 0.1, 0.2, 0.3
-      Wavelengths: ''
-  Set Wavelength Current Sweep:
-    CurrentSweep_1480,1500,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: '20'
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: '0.1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-      setvflag: false
-      setwflag: true
-  Set Wavelength Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: true
-    VoltageSweep_1480,1500,1530,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480,1500,1530,1550
-  Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '100'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Wavelength Sweep:
-    Default:
-      Channel A: false
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: true
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-Routines:
-    []
\ No newline at end of file
+Devices:
+  snewmanRMA1:
+    device_id: snewmanRMA1
+    device_type: device
+    electricalCoordinates:
+    - G
+    - 393.0
+    - 422.0
+    opticalCoordinates:
+    - 50.0
+    - 304.0
+    polarization: TE
+    sequences:
+    - wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida)
+    wavelength: '1550'
+Sequences:
+  wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida):
+    Runtime: 150.0
+    results_info:
+      csv: 'True'
+      foldername: ''
+      legend: 'True'
+      mat: 'True'
+      num_plots: '1'
+      pdf: 'True'
+      pkl: 'False'
+      plottitle: Set Voltage Wavelength Sweep
+      save_location: ''
+      saveplot: 'True'
+      visual: 'True'
+      xscale: '1'
+      xtitle: Wavelength (nm)
+      yscale: '1'
+      ytitle: Power (dBm)
+    variables:
+      Channel A: 'True'
+      Channel B: 'False'
+      Initialrange: '-20'
+      Laser Output: High Power
+      Numscans: '3'
+      Power: '1'
+      RangeDec: '20'
+      Start: '1480'
+      Step: '0.1'
+      Stop: '1580'
+      Sweep Speed: auto
+      Voltages: 0, 1, 2, 3, 4, 5
diff --git a/submissions/EBeam_heaters_snewman_RMA2.yaml b/submissions/EBeam_heaters_snewman_RMA2.yaml
index 6dd6ecc..ffbe81e 100644
--- a/submissions/EBeam_heaters_snewman_RMA2.yaml
+++ b/submissions/EBeam_heaters_snewman_RMA2.yaml
@@ -1,228 +1,47 @@
-Devices:
-  BraggGratingwithHeater,comment,comment:
-    DeviceID: snewman_RMA1
-    Electrical Coordinates: []
-    Optical Coordinates:
-    - 50.0
-    - 304.0
-    Polarization: TE
-    RoutineCheck: true
-    Routines:
-    - Set Wavelength Voltage Sweep:VoltageSweep_1480,1500,1530,1550
-    - Set Wavelength Current Sweep:CurrentSweep_1480,1500,1550
-    - Set Voltage Wavelength Sweep:WavelengthSweep_0.1,0.2,0.3
-    Type: device
-    Wavelength: '1550'
-Routines:
-  Current Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Set Voltage Wavelength Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: 1, 2, 3
-      Wavelengths: ''
-      setvflag: true
-      setwflag: false
-    WavelengthSweep_0.1,0.2,0.3:
-      Channel A: true
-      Channel B: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: 0.1, 0.2, 0.3
-      Wavelengths: ''
-  Set Wavelength Current Sweep:
-    CurrentSweep_1480,1500,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: '20'
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: '0.1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-      setvflag: false
-      setwflag: true
-  Set Wavelength Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: true
-    VoltageSweep_1480,1500,1530,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480,1500,1530,1550
-  Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '100'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Wavelength Sweep:
-    Default:
-      Channel A: false
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: true
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-Routines:
-    []
\ No newline at end of file
+Devices:
+  snewmanRMA2:
+    device_id: snewmanRMA2
+    device_type: device
+    electricalCoordinates:
+    - G
+    - 393.0
+    - 422.0
+    opticalCoordinates:
+    - 50.0
+    - 304.0
+    polarization: TE
+    sequences:
+    - wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida)
+    wavelength: '1550'
+Sequences:
+  wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida):
+    Runtime: 150.0
+    results_info:
+      csv: 'True'
+      foldername: ''
+      legend: 'True'
+      mat: 'True'
+      num_plots: '1'
+      pdf: 'True'
+      pkl: 'False'
+      plottitle: Set Voltage Wavelength Sweep
+      save_location: ''
+      saveplot: 'True'
+      visual: 'True'
+      xscale: '1'
+      xtitle: Wavelength (nm)
+      yscale: '1'
+      ytitle: Power (dBm)
+    variables:
+      Channel A: 'True'
+      Channel B: 'False'
+      Initialrange: '-20'
+      Laser Output: High Power
+      Numscans: '3'
+      Power: '1'
+      RangeDec: '20'
+      Start: '1480'
+      Step: '0.1'
+      Stop: '1580'
+      Sweep Speed: auto
+      Voltages: 0, 1, 2, 3, 4, 5
diff --git a/submissions/EBeam_heaters_snewman_RMA3.yaml b/submissions/EBeam_heaters_snewman_RMA3.yaml
index 6dd6ecc..ddc1ebc 100644
--- a/submissions/EBeam_heaters_snewman_RMA3.yaml
+++ b/submissions/EBeam_heaters_snewman_RMA3.yaml
@@ -1,228 +1,47 @@
-Devices:
-  BraggGratingwithHeater,comment,comment:
-    DeviceID: snewman_RMA1
-    Electrical Coordinates: []
-    Optical Coordinates:
-    - 50.0
-    - 304.0
-    Polarization: TE
-    RoutineCheck: true
-    Routines:
-    - Set Wavelength Voltage Sweep:VoltageSweep_1480,1500,1530,1550
-    - Set Wavelength Current Sweep:CurrentSweep_1480,1500,1550
-    - Set Voltage Wavelength Sweep:WavelengthSweep_0.1,0.2,0.3
-    Type: device
-    Wavelength: '1550'
-Routines:
-  Current Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Set Voltage Wavelength Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: 1, 2, 3
-      Wavelengths: ''
-      setvflag: true
-      setwflag: false
-    WavelengthSweep_0.1,0.2,0.3:
-      Channel A: true
-      Channel B: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: 0.1, 0.2, 0.3
-      Wavelengths: ''
-  Set Wavelength Current Sweep:
-    CurrentSweep_1480,1500,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: '20'
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: '5'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: '0.1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480, 1500, 1550
-      setvflag: false
-      setwflag: true
-  Set Wavelength Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '1'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: true
-    VoltageSweep_1480,1500,1530,1550:
-      Channel A: true
-      Channel B: false
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '0.01'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: 1480,1500,1530,1550
-  Voltage Sweep:
-    Default:
-      Channel A: true
-      Channel B: false
-      ELECflag: true
-      IV: true
-      Initialrange: ''
-      Laseroutput: High power
-      Max: '1'
-      Min: '0'
-      Numscans: '1'
-      OPTICflag: false
-      PV: true
-      RV: true
-      RangeDec: ''
-      Res: '100'
-      Start: ''
-      Stepsize: ''
-      Stop: ''
-      Sweeppower: ''
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-  Wavelength Sweep:
-    Default:
-      Channel A: false
-      Channel B: false
-      ELECflag: false
-      IV: false
-      Initialrange: '-20'
-      Laseroutput: High power
-      Max: ''
-      Min: ''
-      Numscans: '1'
-      OPTICflag: true
-      PV: false
-      RV: false
-      RangeDec: '20'
-      Res: ''
-      Start: '1480'
-      Stepsize: '1'
-      Stop: '1580'
-      Sweeppower: '0'
-      Sweepspeed: auto
-      Voltages: ''
-      Wavelengths: ''
-      setvflag: false
-      setwflag: false
-Routines:
-    []
\ No newline at end of file
+Devices:
+  snewmanRMA3:
+    device_id: snewmanRMA3
+    device_type: device
+    electricalCoordinates:
+    - G
+    - 393.0
+    - 422.0
+    opticalCoordinates:
+    - 50.0
+    - 304.0
+    polarization: TE
+    sequences:
+    - wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida)
+    wavelength: '1550'
+Sequences:
+  wavelengthSweep_biased_3scans(set_voltage_wavelength_sweep_ida):
+    Runtime: 150.0
+    results_info:
+      csv: 'True'
+      foldername: ''
+      legend: 'True'
+      mat: 'True'
+      num_plots: '1'
+      pdf: 'True'
+      pkl: 'False'
+      plottitle: Set Voltage Wavelength Sweep
+      save_location: ''
+      saveplot: 'True'
+      visual: 'True'
+      xscale: '1'
+      xtitle: Wavelength (nm)
+      yscale: '1'
+      ytitle: Power (dBm)
+    variables:
+      Channel A: 'True'
+      Channel B: 'False'
+      Initialrange: '-20'
+      Laser Output: High Power
+      Numscans: '3'
+      Power: '1'
+      RangeDec: '20'
+      Start: '1480'
+      Step: '0.1'
+      Stop: '1580'
+      Sweep Speed: auto
+      Voltages: 0, 1, 2, 3, 4, 5
diff --git a/submissions/EBeam_heaters_snewman_SQWG.yaml b/submissions/EBeam_heaters_snewman_SQWG.yaml
index 6434863..385b7ca 100644
--- a/submissions/EBeam_heaters_snewman_SQWG.yaml
+++ b/submissions/EBeam_heaters_snewman_SQWG.yaml
@@ -8,7 +8,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L2_344p1_um:
     device_id: snewmanSQWG_TE_L2_344p1_um
@@ -19,7 +19,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L3_546p4_um:
     device_id: snewmanSQWG_TE_L3_546p4_um
@@ -30,7 +30,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L4_779p4_um:
     device_id: snewmanSQWG_TE_L4_779p4_um
@@ -41,7 +41,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L5_1043p0_um:
     device_id: snewmanSQWG_TE_L5_1043p0_um
@@ -52,7 +52,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L6_1337p3_um:
     device_id: snewmanSQWG_TE_L6_1337p3_um
@@ -63,7 +63,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TE_L7_1662p3_um:
     device_id: snewmanSQWG_TE_L7_1662p3_um
@@ -74,7 +74,7 @@ Devices:
     - 304.0
     polarization: TE
     sequences:
-    - devicesTE_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L1_172p4_um:
     device_id: snewmanSQWG_TM_L1_172p4_um
@@ -85,7 +85,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L2_344p1_um:
     device_id: snewmanSQWG_TM_L2_344p1_um
@@ -96,7 +96,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L3_546p4_um:
     device_id: snewmanSQWG_TM_L3_546p4_um
@@ -107,7 +107,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L4_779p4_um:
     device_id: snewmanSQWG_TM_L4_779p4_um
@@ -118,7 +118,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L5_1043p0_um:
     device_id: snewmanSQWG_TM_L5_1043p0_um
@@ -129,7 +129,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L6_1337p3_um:
     device_id: snewmanSQWG_TM_L6_1337p3_um
@@ -140,7 +140,7 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
   snewmanSQWG_TM_L7_1662p3_um:
     device_id: snewmanSQWG_TM_L7_1662p3_um
@@ -151,10 +151,10 @@ Devices:
     - 50.0
     polarization: TM
     sequences:
-    - devicesTM_1550nm_WLSweep(wavelength_sweep_ida)
+    - wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida)
     wavelength: '1550'
 Sequences:
-  devicesTE_1550nm_WLSweep(wavelength_sweep_ida):
+  wavelengthSweep_TE_1550nm_devices(wavelength_sweep_ida):
     Runtime: 25.0
     results_info:
       csv: 'True'
@@ -175,14 +175,14 @@ Sequences:
     variables:
       Initialrange: '-20'
       Laser Output: High Power
-      Numscans: '1'
+      Numscans: '3'
       Power: '1'
       RangeDec: '20'
       Start: '1480'
-      Step: '1'
+      Step: '0.1'
       Stop: '1580'
       Sweep Speed: auto
-  devicesTM_1550nm_WLSweep(wavelength_sweep_ida):
+  wavelengthSweep_TM_1550nm_devices(wavelength_sweep_ida):
     Runtime: 25.0
     results_info:
       csv: 'True'
@@ -203,10 +203,10 @@ Sequences:
     variables:
       Initialrange: '-20'
       Laser Output: High Power
-      Numscans: '1'
+      Numscans: '3'
       Power: '1'
       RangeDec: '20'
       Start: '1480'
-      Step: '1'
+      Step: '0.1'
       Stop: '1580'
       Sweep Speed: auto