diff --git a/README.md b/README.md
index 701e93ce9bfb352d0a0e74d72ff21ceed570907d..b680ed30a01572f9d5989ea0f32e82235e2dcf79 100644
--- a/README.md
+++ b/README.md
@@ -5,17 +5,17 @@ Python package package simulating instrumental noises, the propagation of laser
 The default HDF5 measurement file has the following structure,
 
 ```text
-  |- ISC beatnote frequency (total, offsets, fluctuations), of shape (N), in Hz
-  |  - isc_carrier_offsets
-  |  - isc_carrier_fluctuations
-  |  - isc_carriers
-  |  - isc_usb_offsets
-  |  - isc_usb_fluctuations
-  |  - isc_usbs
+  |- ISI beatnote frequency (total, offsets, fluctuations), of shape (N), in Hz
+  |  - isi_carrier_offsets
+  |  - isi_carrier_fluctuations
+  |  - isi_carriers
+  |  - isi_usb_offsets
+  |  - isi_usb_fluctuations
+  |  - isi_usbs
   |
-  |- ISC DWS measurements (in yaw and pitch), of shape (N), in rad
-  |  - isc_dws_phis
-  |  - isc_dws_etas
+  |- ISI DWS measurements (in yaw and pitch), of shape (N), in rad
+  |  - isi_dws_phis
+  |  - isi_dws_etas
   |
   |- Measured pseudo-ranges (MPRs), of shape (N), in s
   |  - mprs
@@ -114,14 +114,14 @@ instrument.plot_fluctuations(output='my-fluctuations.pdf', skip=500)
 To plot quantities for all spacecraft or MOSAs, use the `plot()` method,
 
 ```python
-instrument.isc_carrier_fluctuations.plot(output='my-figure.png', title='ISC Carrier Fluctuations')
+instrument.isi_carrier_fluctuations.plot(output='my-figure.png', title='ISI Carrier Fluctuations')
 ```
 
 or use the usual Matplotlib functions with a single timeseries,
 
 ```python
 import matplotlib.pyplot as plt
-plt.plot(instrument.t, instrument.isc_carrier_fluctuations['12'])
+plt.plot(instrument.t, instrument.isi_carrier_fluctuations['12'])
 plt.show()
 ```
 
diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py
index e8f0db31ca585c799badfb96e35c2a827a8f7f42..c27a61588393e1c987bc1578871527aa46d2216a 100644
--- a/lisainstrument/instrument.py
+++ b/lisainstrument/instrument.py
@@ -147,7 +147,7 @@ class Instrument:
             testmass_asds: dictionary of amplitude spectral densities for test-mass noise [ms^(-2)/sqrt(Hz)]
             testmass_fknees: dictionary of cutoff frequencies for test-mass noise [Hz]
             oms_asds: tuple of dictionaries of amplitude spectral densities for OMS noise [m/sqrt(Hz)],
-                ordered as (isc_carrier, isc_usb, tm_carrier, tm_usb, ref_carrier, ref_usb)
+                ordered as (isi_carrier, isi_usb, tm_carrier, tm_usb, ref_carrier, ref_usb)
             sync_asds: dictionary of amplitude spectral densities for TCB synchronization noise [s/sqrt(Hz)]
             oms_fknees: dictionary of cutoff frequencies for OMS noise
             ttl_coeffs: tuple (local_phi, distant_phi, local_eta, distant_eta) of dictionaries of
@@ -161,7 +161,7 @@ class Instrument:
             dws_asds: dictionary of amplitude spectral densities for DWS measurement noise [rad/s/sqrt(Hz)]
             ranging_biases: dictionary of ranging noise bias [s]
             ranging_asds: dictionary of ranging noise amplitude spectral densities [s/sqrt(Hz)]
-            electro_delays: tuple (isc, tm, ref) of dictionaries for electronic delays [s]
+            electro_delays: tuple (isi, tm, ref) of dictionaries for electronic delays [s]
         """
         # pylint: disable=too-many-arguments,too-many-statements,too-many-locals,too-many-branches
         logger.info("Initializing instrumental simulation")
@@ -290,8 +290,8 @@ class Instrument:
         self.backlink_fknees = ForEachMOSA(backlink_fknees)
         self.testmass_asds = ForEachMOSA(testmass_asds)
         self.testmass_fknees = ForEachMOSA(testmass_fknees)
-        self.oms_isc_carrier_asds = ForEachMOSA(oms_asds[0])
-        self.oms_isc_usb_asds = ForEachMOSA(oms_asds[1])
+        self.oms_isi_carrier_asds = ForEachMOSA(oms_asds[0])
+        self.oms_isi_usb_asds = ForEachMOSA(oms_asds[1])
         self.oms_tm_carrier_asds = ForEachMOSA(oms_asds[2])
         self.oms_tm_usb_asds = ForEachMOSA(oms_asds[3])
         self.oms_ref_carrier_asds = ForEachMOSA(oms_asds[4])
@@ -365,7 +365,7 @@ class Instrument:
         self.init_aafilter(aafilter)
 
         # Electronic delays
-        self.electro_delays_iscs = ForEachMOSA(electro_delays[0])
+        self.electro_delays_isis = ForEachMOSA(electro_delays[0])
         self.electro_delays_tms = ForEachMOSA(electro_delays[1])
         self.electro_delays_refs = ForEachMOSA(electro_delays[2])
 
@@ -664,8 +664,8 @@ class Instrument:
         """Turn off all optical pathlength noises."""
         self.backlink_asds = ForEachMOSA(0)
         self.testmass_asds = ForEachMOSA(0)
-        self.oms_isc_carrier_asds = ForEachMOSA(0)
-        self.oms_isc_usb_asds = ForEachMOSA(0)
+        self.oms_isi_carrier_asds = ForEachMOSA(0)
+        self.oms_isi_usb_asds = ForEachMOSA(0)
         self.oms_tm_carrier_asds = ForEachMOSA(0)
         self.oms_tm_usb_asds = ForEachMOSA(0)
         self.oms_ref_carrier_asds = ForEachMOSA(0)
@@ -819,60 +819,60 @@ class Instrument:
         logger.info("Propagating local beams to inter-spacecraft interferometers")
 
         logger.debug("Propagating local carrier offsets to inter-spacecraft interferometer")
-        self.local_isc_carrier_offsets = self.local_carrier_offsets
+        self.local_isi_carrier_offsets = self.local_carrier_offsets
 
         logger.debug("Propagating local carrier fluctuations to inter-spacecraft interferometer")
-        self.local_isc_carrier_fluctuations = self.local_carrier_fluctuations
+        self.local_isi_carrier_fluctuations = self.local_carrier_fluctuations
 
         logger.debug("Propagating local upper sideband offsets to inter-spacecraft interferometer")
-        self.local_isc_usb_offsets = self.local_usb_offsets
+        self.local_isi_usb_offsets = self.local_usb_offsets
 
         logger.debug("Propagating local upper sideband fluctuations to inter-spacecraft interferometer")
-        self.local_isc_usb_fluctuations = self.local_usb_fluctuations
+        self.local_isi_usb_fluctuations = self.local_usb_fluctuations
 
         ## Inter-spacecraft interferometer distant beams
 
         logger.info("Propagating distant beams to inter-spacecraft interferometers")
 
         logger.debug("Propagating distant carrier offsets to inter-spacecraft interferometer")
-        self.distant_isc_carrier_offsets = self.distant_carrier_offsets
+        self.distant_isi_carrier_offsets = self.distant_carrier_offsets
 
         logger.debug("Propagating distant carrier fluctuations to inter-spacecraft interferometer")
-        self.distant_isc_carrier_fluctuations = self.distant_carrier_fluctuations
+        self.distant_isi_carrier_fluctuations = self.distant_carrier_fluctuations
 
         logger.debug("Propagating distant upper sideband offsets to inter-spacecraft interferometer")
-        self.distant_isc_usb_offsets = self.distant_usb_offsets
+        self.distant_isi_usb_offsets = self.distant_usb_offsets
 
         logger.debug("Propagating distant upper sideband fluctuations to inter-spacecraft interferometer")
-        self.distant_isc_usb_fluctuations = self.distant_usb_fluctuations
+        self.distant_isi_usb_fluctuations = self.distant_usb_fluctuations
 
         ## Inter-spacecraft interferometer beatnotes on TPS (high-frequency)
 
         logger.info("Computing inter-spacecraft beatnotes on TPS")
 
         logger.debug("Computing inter-spacecraft carrier beatnote offsets on TPS")
-        self.tps_isc_carrier_offsets = \
-            self.distant_isc_carrier_offsets - self.local_isc_carrier_offsets
+        self.tps_isi_carrier_offsets = \
+            self.distant_isi_carrier_offsets - self.local_isi_carrier_offsets
 
         logger.debug("Computing inter-spacecraft carrier beatnote fluctuations on TPS")
-        self.tps_isc_carrier_fluctuations = \
-            self.distant_isc_carrier_fluctuations - self.local_isc_carrier_fluctuations \
-            + self.central_freq * self.oms_isc_carrier_noises
+        self.tps_isi_carrier_fluctuations = \
+            self.distant_isi_carrier_fluctuations - self.local_isi_carrier_fluctuations \
+            + self.central_freq * self.oms_isi_carrier_noises
 
         logger.debug("Computing inter-spacecraft upper sideband beatnote offsets on TPS")
-        self.tps_isc_usb_offsets = \
-            self.distant_isc_usb_offsets - self.local_isc_usb_offsets
+        self.tps_isi_usb_offsets = \
+            self.distant_isi_usb_offsets - self.local_isi_usb_offsets
 
         logger.debug("Computing inter-spacecraft upper sideband beatnote fluctuations on TPS")
-        self.tps_isc_usb_fluctuations = \
-            self.distant_isc_usb_fluctuations - self.local_isc_usb_fluctuations \
-            + self.central_freq * self.oms_isc_usb_noises
+        self.tps_isi_usb_fluctuations = \
+            self.distant_isi_usb_fluctuations - self.local_isi_usb_fluctuations \
+            + self.central_freq * self.oms_isi_usb_noises
 
         ## Inter-spacecraft DWS measurements on TPS (high-frequency)
 
         logger.info("Computing inter-spacecraft DWS measurements on TPS")
-        self.tps_isc_dws_phis = self.mosa_total_jitter_phis + self.dws_phi_noises
-        self.tps_isc_dws_etas = self.mosa_total_jitter_etas + self.dws_eta_noises
+        self.tps_isi_dws_phis = self.mosa_total_jitter_phis + self.dws_phi_noises
+        self.tps_isi_dws_etas = self.mosa_total_jitter_etas + self.dws_eta_noises
 
         ## Measured pseudo-ranging on TPS grid (high-frequency)
 
@@ -1007,32 +1007,32 @@ class Instrument:
         logger.info("Sampling inter-spacecraft beatnotes to THE grid")
 
         logger.debug("Sampling inter-spacecraft carrier beatnote fluctuations to THE grid")
-        self.the_isc_carrier_offsets = (
-            self.tps_isc_carrier_offsets / (1 + self.clock_noise_offsets)
+        self.the_isi_carrier_offsets = (
+            self.tps_isi_carrier_offsets / (1 + self.clock_noise_offsets)
         ).transformed(self.timestamped)
 
         logger.debug("Sampling inter-spacecraft carrier beatnote fluctuations to THE grid")
-        self.the_isc_carrier_fluctuations = (
-            self.tps_isc_carrier_fluctuations / (1 + self.clock_noise_offsets)
-                - self.tps_isc_carrier_offsets * self.clock_noise_fluctuations
+        self.the_isi_carrier_fluctuations = (
+            self.tps_isi_carrier_fluctuations / (1 + self.clock_noise_offsets)
+                - self.tps_isi_carrier_offsets * self.clock_noise_fluctuations
                 / (1 + self.clock_noise_offsets)**2
         ).transformed(self.timestamped)
 
         logger.debug("Sampling inter-spacecraft upper sideband beatnote offsets to THE grid")
-        self.the_isc_usb_offsets = (
-            self.tps_isc_usb_offsets / (1 + self.clock_noise_offsets)
+        self.the_isi_usb_offsets = (
+            self.tps_isi_usb_offsets / (1 + self.clock_noise_offsets)
         ).transformed(self.timestamped)
 
         logger.debug("Sampling inter-spacecraft upper sideband beatnote fluctuations to THE grid")
-        self.the_isc_usb_fluctuations = (
-            self.tps_isc_usb_fluctuations / (1 + self.clock_noise_offsets)
-                - self.tps_isc_usb_offsets * self.clock_noise_fluctuations
+        self.the_isi_usb_fluctuations = (
+            self.tps_isi_usb_fluctuations / (1 + self.clock_noise_offsets)
+                - self.tps_isi_usb_offsets * self.clock_noise_fluctuations
                 / (1 + self.clock_noise_offsets)**2
         ).transformed(self.timestamped)
 
         logger.debug("Sampling inter-spacecraft DWS measurements to THE grid")
-        self.the_isc_dws_phis = self.tps_isc_dws_phis.transformed(self.timestamped)
-        self.the_isc_dws_etas = self.tps_isc_dws_etas.transformed(self.timestamped)
+        self.the_isi_dws_phis = self.tps_isi_dws_phis.transformed(self.timestamped)
+        self.the_isi_dws_etas = self.tps_isi_dws_etas.transformed(self.timestamped)
 
         logger.info("Sampling measured pseudo-ranges to THE grid")
         self.the_mprs = self.tps_mprs.transformed(self.timestamped)
@@ -1092,15 +1092,15 @@ class Instrument:
         # Electronic delays
 
         logger.info("Applying electronic delays")
-        self.electro_isc = lambda mosa, x: self.interpolate(x, -self.electro_delays_iscs[mosa])
+        self.electro_isi = lambda mosa, x: self.interpolate(x, -self.electro_delays_isis[mosa])
         self.electro_tm = lambda mosa, x: self.interpolate(x, -self.electro_delays_tms[mosa])
         self.electro_ref = lambda mosa, x: self.interpolate(x, -self.electro_delays_refs[mosa])
 
         logger.debug("Applying electronic delays to inter-spacecraft beatnotes")
-        self.electro_isc_carrier_offsets = self.the_isc_carrier_offsets.transformed(self.electro_isc)
-        self.electro_isc_carrier_fluctuations = self.the_isc_carrier_fluctuations.transformed(self.electro_isc)
-        self.electro_isc_usb_offsets = self.the_isc_usb_offsets.transformed(self.electro_isc)
-        self.electro_isc_usb_fluctuations = self.the_isc_usb_fluctuations.transformed(self.electro_isc)
+        self.electro_isi_carrier_offsets = self.the_isi_carrier_offsets.transformed(self.electro_isi)
+        self.electro_isi_carrier_fluctuations = self.the_isi_carrier_fluctuations.transformed(self.electro_isi)
+        self.electro_isi_usb_offsets = self.the_isi_usb_offsets.transformed(self.electro_isi)
+        self.electro_isi_usb_fluctuations = self.the_isi_usb_fluctuations.transformed(self.electro_isi)
 
         logger.debug("Applying electronic delays to test-mass beatnotes")
         self.electro_tm_carrier_offsets = self.the_tm_carrier_offsets.transformed(self.electro_tm)
@@ -1119,14 +1119,14 @@ class Instrument:
         logger.info("Filtering beatnotes")
 
         logger.debug("Filtering inter-spacecraft beatnotes")
-        self.filtered_isc_carrier_offsets = self.electro_isc_carrier_offsets.transformed(self.aafilter)
-        self.filtered_isc_carrier_fluctuations = self.electro_isc_carrier_fluctuations.transformed(self.aafilter)
-        self.filtered_isc_usb_offsets = self.electro_isc_usb_offsets.transformed(self.aafilter)
-        self.filtered_isc_usb_fluctuations = self.electro_isc_usb_fluctuations.transformed(self.aafilter)
+        self.filtered_isi_carrier_offsets = self.electro_isi_carrier_offsets.transformed(self.aafilter)
+        self.filtered_isi_carrier_fluctuations = self.electro_isi_carrier_fluctuations.transformed(self.aafilter)
+        self.filtered_isi_usb_offsets = self.electro_isi_usb_offsets.transformed(self.aafilter)
+        self.filtered_isi_usb_fluctuations = self.electro_isi_usb_fluctuations.transformed(self.aafilter)
 
         logger.debug("Filtering inter-spacecraft DWS measurements")
-        self.filtered_isc_dws_phis = self.the_isc_dws_phis.transformed(self.aafilter)
-        self.filtered_isc_dws_etas = self.the_isc_dws_etas.transformed(self.aafilter)
+        self.filtered_isi_dws_phis = self.the_isi_dws_phis.transformed(self.aafilter)
+        self.filtered_isi_dws_etas = self.the_isi_dws_etas.transformed(self.aafilter)
 
         logger.debug("Filtering measured pseudo-ranges")
         self.filtered_mprs = self.the_mprs.transformed(self.aafilter)
@@ -1148,14 +1148,14 @@ class Instrument:
         logger.info("Downsampling beatnotes")
 
         logger.debug("Downsampling inter-spacecraft beatnotes")
-        self.isc_carrier_offsets = self.filtered_isc_carrier_offsets.transformed(self.downsampled)
-        self.isc_carrier_fluctuations = self.filtered_isc_carrier_fluctuations.transformed(self.downsampled)
-        self.isc_usb_offsets = self.filtered_isc_usb_offsets.transformed(self.downsampled)
-        self.isc_usb_fluctuations = self.filtered_isc_usb_fluctuations.transformed(self.downsampled)
+        self.isi_carrier_offsets = self.filtered_isi_carrier_offsets.transformed(self.downsampled)
+        self.isi_carrier_fluctuations = self.filtered_isi_carrier_fluctuations.transformed(self.downsampled)
+        self.isi_usb_offsets = self.filtered_isi_usb_offsets.transformed(self.downsampled)
+        self.isi_usb_fluctuations = self.filtered_isi_usb_fluctuations.transformed(self.downsampled)
 
         logger.debug("Downsampling inter-spacecraft DWS measurements")
-        self.isc_dws_phis = self.filtered_isc_dws_phis.transformed(self.downsampled)
-        self.isc_dws_etas = self.filtered_isc_dws_etas.transformed(self.downsampled)
+        self.isi_dws_phis = self.filtered_isi_dws_phis.transformed(self.downsampled)
+        self.isi_dws_etas = self.filtered_isi_dws_etas.transformed(self.downsampled)
 
         logger.debug("Downsampling measured pseudo-ranges")
         self.mprs = self.filtered_mprs.transformed(self.downsampled)
@@ -1177,12 +1177,12 @@ class Instrument:
         logger.info("Computing total beatnote frequencies")
 
         logger.debug("Computing total inter-spacecraft carrier beatnotes")
-        self.isc_carriers = \
-            self.isc_carrier_offsets + self.isc_carrier_fluctuations
+        self.isi_carriers = \
+            self.isi_carrier_offsets + self.isi_carrier_fluctuations
 
         logger.debug("Computing total inter-spacecraft upper sideband beatnotes")
-        self.isc_usbs = \
-            self.isc_usb_offsets + self.isc_usb_fluctuations
+        self.isi_usbs = \
+            self.isi_usb_offsets + self.isi_usb_fluctuations
 
         logger.debug("Computing total test-mass carrier beatnotes")
         self.tm_carriers = \
@@ -1268,14 +1268,14 @@ class Instrument:
 
         logger.info("Generating OMS noise")
 
-        self.oms_isc_carrier_noises = ForEachMOSA(lambda mosa:
+        self.oms_isi_carrier_noises = ForEachMOSA(lambda mosa:
             noises.oms(self.physics_fs, self.physics_size,
-                self.oms_isc_carrier_asds[mosa], self.oms_fknees[mosa])
+                self.oms_isi_carrier_asds[mosa], self.oms_fknees[mosa])
         )
 
-        self.oms_isc_usb_noises = ForEachMOSA(lambda mosa:
+        self.oms_isi_usb_noises = ForEachMOSA(lambda mosa:
             noises.oms(self.physics_fs, self.physics_size,
-                self.oms_isc_usb_asds[mosa], self.oms_fknees[mosa])
+                self.oms_isi_usb_asds[mosa], self.oms_fknees[mosa])
         )
 
         self.oms_tm_carrier_noises = ForEachMOSA(lambda mosa:
@@ -1433,7 +1433,7 @@ class Instrument:
             - (self.central_freq + self.local_carrier_offsets[mosa]) * self.local_ttls[mosa] / c
         self.local_carrier_fluctuations[mosa] = distant_carrier_fluctuations \
             + self.offsets_freqs[mosa] * self.clock_noise_fluctuations[sc(mosa)] \
-            + self.central_freq * self.oms_isc_carrier_noises[mosa] \
+            + self.central_freq * self.oms_isi_carrier_noises[mosa] \
             + self.tdir_tones[mosa]
 
 
@@ -1589,8 +1589,8 @@ class Instrument:
                 self.ranging_noises.write(hdf5, 'ranging_noises')
 
                 logger.debug("Writing OMS noise to '%s'", output)
-                self.oms_isc_carrier_noises.write(hdf5, 'oms_isc_carrier_noises')
-                self.oms_isc_usb_noises.write(hdf5, 'oms_isc_usb_noises')
+                self.oms_isi_carrier_noises.write(hdf5, 'oms_isi_carrier_noises')
+                self.oms_isi_usb_noises.write(hdf5, 'oms_isi_usb_noises')
                 self.oms_tm_carrier_noises.write(hdf5, 'oms_tm_carrier_noises')
                 self.oms_tm_usb_noises.write(hdf5, 'oms_tm_usb_noises')
                 self.oms_ref_carrier_noises.write(hdf5, 'oms_ref_carrier_noises')
@@ -1640,26 +1640,26 @@ class Instrument:
                 self.adjacent_usb_fluctuations.write(hdf5, 'adjacent_usb_fluctuations')
 
                 logger.debug("Writing local beams at inter-spacecraft interferometer to '%s'", output)
-                self.local_isc_carrier_offsets.write(hdf5, 'local_isc_carrier_offsets')
-                self.local_isc_carrier_fluctuations.write(hdf5, 'local_isc_carrier_fluctuations')
-                self.local_isc_usb_offsets.write(hdf5, 'local_isc_usb_offsets')
-                self.local_isc_usb_fluctuations.write(hdf5, 'local_isc_usb_fluctuations')
+                self.local_isi_carrier_offsets.write(hdf5, 'local_isi_carrier_offsets')
+                self.local_isi_carrier_fluctuations.write(hdf5, 'local_isi_carrier_fluctuations')
+                self.local_isi_usb_offsets.write(hdf5, 'local_isi_usb_offsets')
+                self.local_isi_usb_fluctuations.write(hdf5, 'local_isi_usb_fluctuations')
 
                 logger.debug("Writing distant beams at inter-spacecraft interferometer to '%s'", output)
-                self.distant_isc_carrier_offsets.write(hdf5, 'distant_isc_carrier_offsets')
-                self.distant_isc_carrier_fluctuations.write(hdf5, 'distant_isc_carrier_fluctuations')
-                self.distant_isc_usb_offsets.write(hdf5, 'distant_isc_usb_offsets')
-                self.distant_isc_usb_fluctuations.write(hdf5, 'distant_isc_usb_fluctuations')
+                self.distant_isi_carrier_offsets.write(hdf5, 'distant_isi_carrier_offsets')
+                self.distant_isi_carrier_fluctuations.write(hdf5, 'distant_isi_carrier_fluctuations')
+                self.distant_isi_usb_offsets.write(hdf5, 'distant_isi_usb_offsets')
+                self.distant_isi_usb_fluctuations.write(hdf5, 'distant_isi_usb_fluctuations')
 
                 logger.debug("Writing inter-spacecraft beatnotes on TPS to '%s'", output)
-                self.tps_isc_carrier_offsets.write(hdf5, 'tps_isc_carrier_offsets')
-                self.tps_isc_carrier_fluctuations.write(hdf5, 'tps_isc_carrier_fluctuations')
-                self.tps_isc_usb_offsets.write(hdf5, 'tps_isc_usb_offsets')
-                self.tps_isc_usb_fluctuations.write(hdf5, 'tps_isc_usb_fluctuations')
+                self.tps_isi_carrier_offsets.write(hdf5, 'tps_isi_carrier_offsets')
+                self.tps_isi_carrier_fluctuations.write(hdf5, 'tps_isi_carrier_fluctuations')
+                self.tps_isi_usb_offsets.write(hdf5, 'tps_isi_usb_offsets')
+                self.tps_isi_usb_fluctuations.write(hdf5, 'tps_isi_usb_fluctuations')
 
                 logger.debug("Writing inter-spacecraft DWS measurements on TPS to '%s'", output)
-                self.tps_isc_dws_phis.write(hdf5, 'tps_isc_dws_phis')
-                self.tps_isc_dws_etas.write(hdf5, 'tps_isc_dws_etas')
+                self.tps_isi_dws_phis.write(hdf5, 'tps_isi_dws_phis')
+                self.tps_isi_dws_etas.write(hdf5, 'tps_isi_dws_etas')
 
                 logger.debug("Writing measured pseudo-ranges on TPS to '%s'", output)
                 self.tps_mprs.write(hdf5, 'tps_mprs')
@@ -1704,14 +1704,14 @@ class Instrument:
                 self.inverse_timer_deviations.write(hdf5, 'inverse_timer_deviations')
 
                 logger.debug("Writing inter-spacecraft beatnotes sampled to THE grid to '%s'", output)
-                self.the_isc_carrier_offsets.write(hdf5, 'the_isc_carrier_offsets')
-                self.the_isc_carrier_fluctuations.write(hdf5, 'the_isc_carrier_fluctuations')
-                self.the_isc_usb_offsets.write(hdf5, 'the_isc_usb_offsets')
-                self.the_isc_usb_fluctuations.write(hdf5, 'the_isc_usb_fluctuations')
+                self.the_isi_carrier_offsets.write(hdf5, 'the_isi_carrier_offsets')
+                self.the_isi_carrier_fluctuations.write(hdf5, 'the_isi_carrier_fluctuations')
+                self.the_isi_usb_offsets.write(hdf5, 'the_isi_usb_offsets')
+                self.the_isi_usb_fluctuations.write(hdf5, 'the_isi_usb_fluctuations')
 
                 logger.debug("Writing inter-spacecraft DWS measurements sampled to THE grid to '%s'", output)
-                self.the_isc_dws_phis.write(hdf5, 'the_isc_dws_phis')
-                self.the_isc_dws_etas.write(hdf5, 'the_isc_dws_etas')
+                self.the_isi_dws_phis.write(hdf5, 'the_isi_dws_phis')
+                self.the_isi_dws_etas.write(hdf5, 'the_isi_dws_etas')
 
                 logger.debug("Writing measured pseudo-ranges sampled to THE grid to '%s'", output)
                 self.the_mprs.write(hdf5, 'the_mprs')
@@ -1729,10 +1729,10 @@ class Instrument:
                 self.the_ref_usb_fluctuations.write(hdf5, 'the_ref_usb_fluctuations')
 
                 logger.debug("Writing inter-spacecraft beatnotes with electronic delay to '%s'", output)
-                self.electro_isc_carrier_offsets.write(hdf5, 'electro_isc_carrier_offsets')
-                self.electro_isc_carrier_fluctuations.write(hdf5, 'electro_isc_carrier_fluctuations')
-                self.electro_isc_usb_offsets.write(hdf5, 'electro_isc_usb_offsets')
-                self.electro_isc_usb_fluctuations.write(hdf5, 'electro_isc_usb_fluctuations')
+                self.electro_isi_carrier_offsets.write(hdf5, 'electro_isi_carrier_offsets')
+                self.electro_isi_carrier_fluctuations.write(hdf5, 'electro_isi_carrier_fluctuations')
+                self.electro_isi_usb_offsets.write(hdf5, 'electro_isi_usb_offsets')
+                self.electro_isi_usb_fluctuations.write(hdf5, 'electro_isi_usb_fluctuations')
 
                 logger.debug("Writing test-mass beatnotes with electronic delays to '%s'", output)
                 self.electro_tm_carrier_offsets.write(hdf5, 'electro_tm_carrier_offsets')
@@ -1747,14 +1747,14 @@ class Instrument:
                 self.electro_ref_usb_fluctuations.write(hdf5, 'electro_ref_usb_fluctuations')
 
                 logger.debug("Writing filtered inter-spacecraft beatnotes to '%s'", output)
-                self.filtered_isc_carrier_offsets.write(hdf5, 'filtered_isc_carrier_offsets')
-                self.filtered_isc_carrier_fluctuations.write(hdf5, 'filtered_isc_carrier_fluctuations')
-                self.filtered_isc_usb_offsets.write(hdf5, 'filtered_isc_usb_offsets')
-                self.filtered_isc_usb_fluctuations.write(hdf5, 'filtered_isc_usb_fluctuations')
+                self.filtered_isi_carrier_offsets.write(hdf5, 'filtered_isi_carrier_offsets')
+                self.filtered_isi_carrier_fluctuations.write(hdf5, 'filtered_isi_carrier_fluctuations')
+                self.filtered_isi_usb_offsets.write(hdf5, 'filtered_isi_usb_offsets')
+                self.filtered_isi_usb_fluctuations.write(hdf5, 'filtered_isi_usb_fluctuations')
 
                 logger.debug("Writing filtered inter-spacecraft DWS measurements to '%s'", output)
-                self.filtered_isc_dws_phis.write(hdf5, 'filtered_isc_dws_phis')
-                self.filtered_isc_dws_etas.write(hdf5, 'filtered_isc_dws_etas')
+                self.filtered_isi_dws_phis.write(hdf5, 'filtered_isi_dws_phis')
+                self.filtered_isi_dws_etas.write(hdf5, 'filtered_isi_dws_etas')
 
                 logger.debug("Writing filtered measured pseudo-ranges to '%s'", output)
                 self.filtered_mprs.write(hdf5, 'filtered_mprs')
@@ -1772,14 +1772,14 @@ class Instrument:
                 self.filtered_ref_usb_fluctuations.write(hdf5, 'filtered_ref_usb_fluctuations')
 
             logger.debug("Writing downsampled inter-spacecraft beatnotes to '%s'", output)
-            self.isc_carrier_offsets.write(hdf5, 'isc_carrier_offsets')
-            self.isc_carrier_fluctuations.write(hdf5, 'isc_carrier_fluctuations')
-            self.isc_usb_offsets.write(hdf5, 'isc_usb_offsets')
-            self.isc_usb_fluctuations.write(hdf5, 'isc_usb_fluctuations')
+            self.isi_carrier_offsets.write(hdf5, 'isi_carrier_offsets')
+            self.isi_carrier_fluctuations.write(hdf5, 'isi_carrier_fluctuations')
+            self.isi_usb_offsets.write(hdf5, 'isi_usb_offsets')
+            self.isi_usb_fluctuations.write(hdf5, 'isi_usb_fluctuations')
 
             logger.debug("Writing downsampled inter-spacecraft DWS measurements to '%s'", output)
-            self.isc_dws_phis.write(hdf5, 'isc_dws_phis')
-            self.isc_dws_etas.write(hdf5, 'isc_dws_etas')
+            self.isi_dws_phis.write(hdf5, 'isi_dws_phis')
+            self.isi_dws_etas.write(hdf5, 'isi_dws_etas')
 
             logger.debug("Writing downsampled measured pseudo-ranges to '%s'", output)
             self.mprs.write(hdf5, 'mprs')
@@ -1797,8 +1797,8 @@ class Instrument:
             self.ref_usb_fluctuations.write(hdf5, 'ref_usb_fluctuations')
 
             logger.debug("Writing total beatnote frequencies to '%s'", output)
-            self.isc_carriers.write(hdf5, 'isc_carriers')
-            self.isc_usbs.write(hdf5, 'isc_usbs')
+            self.isi_carriers.write(hdf5, 'isi_carriers')
+            self.isi_usbs.write(hdf5, 'isi_usbs')
             self.tm_carriers.write(hdf5, 'tm_carriers')
             self.tm_usbs.write(hdf5, 'tm_usbs')
             self.ref_carriers.write(hdf5, 'ref_carriers')
@@ -1824,7 +1824,7 @@ class Instrument:
         _, axes = plt.subplots(3, 1, figsize=(16, 18))
         plot = lambda axis, x, label: axis.plot(self.t[skip:], np.broadcast_to(x, self.size)[skip:], label=label)
         for mosa in self.MOSAS:
-            plot(axes[0], self.isc_carrier_fluctuations[mosa], mosa)
+            plot(axes[0], self.isi_carrier_fluctuations[mosa], mosa)
             plot(axes[1], self.tm_carrier_fluctuations[mosa], mosa)
             plot(axes[2], self.ref_carrier_fluctuations[mosa], mosa)
         # Format plot
@@ -1858,7 +1858,7 @@ class Instrument:
         _, axes = plt.subplots(3, 1, figsize=(16, 18))
         plot = lambda axis, x, label: axis.plot(self.t[skip:], np.broadcast_to(x, self.size)[skip:], label=label)
         for mosa in self.MOSAS:
-            plot(axes[0], self.isc_carrier_offsets[mosa], mosa)
+            plot(axes[0], self.isi_carrier_offsets[mosa], mosa)
             plot(axes[1], self.tm_carrier_offsets[mosa], mosa)
             plot(axes[2], self.ref_carrier_offsets[mosa], mosa)
         # Format plot
@@ -1892,7 +1892,7 @@ class Instrument:
         _, axes = plt.subplots(3, 1, figsize=(16, 18))
         plot = lambda axis, x, label: axis.plot(self.t[skip:], np.broadcast_to(x, self.size)[skip:], label=label)
         for mosa in self.MOSAS:
-            plot(axes[0], self.isc_carriers[mosa], mosa)
+            plot(axes[0], self.isi_carriers[mosa], mosa)
             plot(axes[1], self.tm_carriers[mosa], mosa)
             plot(axes[2], self.ref_carriers[mosa], mosa)
         # Format plot
@@ -1958,13 +1958,13 @@ class Instrument:
         _, axes = plt.subplots(2, 1, figsize=(16, 12))
         plot = lambda axis, x, label: axis.plot(self.t[skip:], np.broadcast_to(x, self.size)[skip:], label=label)
         for mosa in self.MOSAS:
-            plot(axes[0], self.isc_dws_phis[mosa], mosa)
-            plot(axes[1], self.isc_dws_etas[mosa], mosa)
+            plot(axes[0], self.isi_dws_phis[mosa], mosa)
+            plot(axes[1], self.isi_dws_etas[mosa], mosa)
         # Format plot
         axes[0].set_title("DWS measurements")
         axes[1].set_xlabel("Time [s]")
-        axes[0].set_ylabel("ISC Yaw (phi) [rad/s]")
-        axes[1].set_ylabel("ISC Pitch (eta) [rad/s]")
+        axes[0].set_ylabel("ISI Yaw (phi) [rad/s]")
+        axes[1].set_ylabel("ISI Pitch (eta) [rad/s]")
         for axis in axes:
             axis.grid()
             axis.legend()