diff --git a/README.md b/README.md
index b680ed30a01572f9d5989ea0f32e82235e2dcf79..da6261c3e6af3651b237abc81b0a15df52ca1424 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,13 @@ The default HDF5 measurement file has the following structure,
   |- Measured pseudo-ranges (MPRs), of shape (N), in s
   |  - mprs
   |
-  |- TM beatnote frequency (total, offsets, fluctuations), of shape (N), in Hz
-  |  - tm_carrier_offsets
-  |  - tm_carrier_fluctuations
-  |  - tm_carriers
-  |  - tm_usb_offsets
-  |  - tm_usb_fluctuations
-  |  - tm_usbs
+  |- TMI beatnote frequency (total, offsets, fluctuations), of shape (N), in Hz
+  |  - tmi_carrier_offsets
+  |  - tmi_carrier_fluctuations
+  |  - tmi_carriers
+  |  - tmi_usb_offsets
+  |  - tmi_usb_fluctuations
+  |  - tmi_usbs
   |
   |- REF beatnote frequency (total, offsets, fluctuations), of shape (N), in Hz
   |  - ref_carrier_offsets
diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py
index c27a61588393e1c987bc1578871527aa46d2216a..1426bc7a4415604e61b2818ecb621942152fef2f 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 (isi_carrier, isi_usb, tm_carrier, tm_usb, ref_carrier, ref_usb)
+                ordered as (isi_carrier, isi_usb, tmi_carrier, tmi_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 (isi, tm, ref) of dictionaries for electronic delays [s]
+            electro_delays: tuple (isi, tmi, 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")
@@ -292,8 +292,8 @@ class Instrument:
         self.testmass_fknees = ForEachMOSA(testmass_fknees)
         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_tmi_carrier_asds = ForEachMOSA(oms_asds[2])
+        self.oms_tmi_usb_asds = ForEachMOSA(oms_asds[3])
         self.oms_ref_carrier_asds = ForEachMOSA(oms_asds[4])
         self.oms_ref_usb_asds = ForEachMOSA(oms_asds[5])
         self.oms_fknees = ForEachMOSA(oms_fknees)
@@ -366,7 +366,7 @@ class Instrument:
 
         # Electronic delays
         self.electro_delays_isis = ForEachMOSA(electro_delays[0])
-        self.electro_delays_tms = ForEachMOSA(electro_delays[1])
+        self.electro_delays_tmis = ForEachMOSA(electro_delays[1])
         self.electro_delays_refs = ForEachMOSA(electro_delays[2])
 
     def init_interpolation(self, interpolation):
@@ -666,8 +666,8 @@ class Instrument:
         self.testmass_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_tmi_carrier_asds = ForEachMOSA(0)
+        self.oms_tmi_usb_asds = ForEachMOSA(0)
         self.oms_ref_carrier_asds = ForEachMOSA(0)
         self.oms_ref_usb_asds = ForEachMOSA(0)
 
@@ -886,60 +886,60 @@ class Instrument:
         logger.info("Propagating local beams to test-mass interferometers")
 
         logger.debug("Propagating local carrier offsets to test-mass interferometer")
-        self.local_tm_carrier_offsets = self.local_carrier_offsets
+        self.local_tmi_carrier_offsets = self.local_carrier_offsets
 
         logger.debug("Propagating local carrier fluctuations to test-mass interferometer")
-        self.local_tm_carrier_fluctuations = \
+        self.local_tmi_carrier_fluctuations = \
             self.local_carrier_fluctuations \
             + 2 * (self.testmass_noises + self.glitch_tms) / c \
-            * (self.central_freq + self.local_tm_carrier_offsets)
+            * (self.central_freq + self.local_tmi_carrier_offsets)
 
         logger.debug("Propagating local upper sideband offsets to test-mass interferometer")
-        self.local_tm_usb_offsets = self.local_usb_offsets
+        self.local_tmi_usb_offsets = self.local_usb_offsets
 
         logger.debug("Propagating local upper sideband fluctuations to test-mass interferometer")
-        self.local_tm_usb_fluctuations = \
+        self.local_tmi_usb_fluctuations = \
             self.local_usb_fluctuations \
             + 2 * (self.testmass_noises + self.glitch_tms) / c \
-            * (self.central_freq + self.local_tm_usb_offsets)
+            * (self.central_freq + self.local_tmi_usb_offsets)
 
         ## Test-mass interferometer adjacent beams
 
         logger.info("Propagating adjacent beams to test-mass interferometers")
 
         logger.debug("Propagating adjacent carrier offsets to test-mass interferometer")
-        self.adjacent_tm_carrier_offsets = self.adjacent_carrier_offsets
+        self.adjacent_tmi_carrier_offsets = self.adjacent_carrier_offsets
 
         logger.debug("Propagating adjacent carrier fluctuations to test-mass interferometer")
-        self.adjacent_tm_carrier_fluctuations = self.adjacent_carrier_fluctuations
+        self.adjacent_tmi_carrier_fluctuations = self.adjacent_carrier_fluctuations
 
         logger.debug("Propagating adjacent upper sideband offsets to test-mass interferometer")
-        self.adjacent_tm_usb_offsets = self.adjacent_usb_offsets
+        self.adjacent_tmi_usb_offsets = self.adjacent_usb_offsets
 
         logger.debug("Propagating adjacent upper sideband fluctuations to test-mass interferometer")
-        self.adjacent_tm_usb_fluctuations = self.adjacent_usb_fluctuations
+        self.adjacent_tmi_usb_fluctuations = self.adjacent_usb_fluctuations
 
         ## Test-mass interferometer beatnotes on TPS (high-frequency)
 
         logger.info("Computing test-mass beatnotes on TPS")
 
         logger.debug("Computing test-mass carrier beatnote offsets on TPS")
-        self.tps_tm_carrier_offsets = \
-            self.adjacent_tm_carrier_offsets - self.local_tm_carrier_offsets
+        self.tps_tmi_carrier_offsets = \
+            self.adjacent_tmi_carrier_offsets - self.local_tmi_carrier_offsets
 
         logger.debug("Computing test-mass carrier beatnote fluctuations on TPS")
-        self.tps_tm_carrier_fluctuations = \
-            self.adjacent_tm_carrier_fluctuations - self.local_tm_carrier_fluctuations \
-            + self.central_freq * self.oms_tm_carrier_noises
+        self.tps_tmi_carrier_fluctuations = \
+            self.adjacent_tmi_carrier_fluctuations - self.local_tmi_carrier_fluctuations \
+            + self.central_freq * self.oms_tmi_carrier_noises
 
         logger.debug("Computing test-mass upper sideband beatnote offsets on TPS")
-        self.tps_tm_usb_offsets = \
-            self.adjacent_tm_usb_offsets - self.local_tm_usb_offsets
+        self.tps_tmi_usb_offsets = \
+            self.adjacent_tmi_usb_offsets - self.local_tmi_usb_offsets
 
         logger.debug("Computing test-mass upper sideband beatnote fluctuations on TPS")
-        self.tps_tm_usb_fluctuations = \
-            self.adjacent_tm_usb_fluctuations - self.local_tm_usb_fluctuations \
-            + self.central_freq * self.oms_tm_usb_noises
+        self.tps_tmi_usb_fluctuations = \
+            self.adjacent_tmi_usb_fluctuations - self.local_tmi_usb_fluctuations \
+            + self.central_freq * self.oms_tmi_usb_noises
 
         ## Reference interferometer local beams
 
@@ -1040,26 +1040,26 @@ class Instrument:
         logger.info("Sampling test-mass beatnotes to THE grid")
 
         logger.debug("Sampling test-mass carrier beatnote offsets to THE grid")
-        self.the_tm_carrier_offsets = (
-            self.tps_tm_carrier_offsets / (1 + self.clock_noise_offsets)
+        self.the_tmi_carrier_offsets = (
+            self.tps_tmi_carrier_offsets / (1 + self.clock_noise_offsets)
         ).transformed(self.timestamped)
 
         logger.debug("Sampling test-mass carrier beatnote fluctuations to THE grid")
-        self.the_tm_carrier_fluctuations = (
-            self.tps_tm_carrier_fluctuations / (1 + self.clock_noise_offsets)
-                - self.tps_tm_carrier_offsets * self.clock_noise_fluctuations
+        self.the_tmi_carrier_fluctuations = (
+            self.tps_tmi_carrier_fluctuations / (1 + self.clock_noise_offsets)
+                - self.tps_tmi_carrier_offsets * self.clock_noise_fluctuations
                 / (1 + self.clock_noise_offsets)**2
         ).transformed(self.timestamped)
 
         logger.debug("Sampling test-mass upper sideband beatnote offsets to THE grid")
-        self.the_tm_usb_offsets = (
-            self.tps_tm_usb_offsets / (1 + self.clock_noise_offsets)
+        self.the_tmi_usb_offsets = (
+            self.tps_tmi_usb_offsets / (1 + self.clock_noise_offsets)
         ).transformed(self.timestamped)
 
         logger.debug("Sampling test-mass upper sideband beatnote fluctuations to THE grid")
-        self.the_tm_usb_fluctuations = (
-            self.tps_tm_usb_fluctuations / (1 + self.clock_noise_offsets)
-                - self.tps_tm_usb_offsets * self.clock_noise_fluctuations
+        self.the_tmi_usb_fluctuations = (
+            self.tps_tmi_usb_fluctuations / (1 + self.clock_noise_offsets)
+                - self.tps_tmi_usb_offsets * self.clock_noise_fluctuations
                 / (1 + self.clock_noise_offsets)**2
         ).transformed(self.timestamped)
 
@@ -1093,7 +1093,7 @@ class Instrument:
 
         logger.info("Applying electronic delays")
         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_tmi = lambda mosa, x: self.interpolate(x, -self.electro_delays_tmis[mosa])
         self.electro_ref = lambda mosa, x: self.interpolate(x, -self.electro_delays_refs[mosa])
 
         logger.debug("Applying electronic delays to inter-spacecraft beatnotes")
@@ -1103,10 +1103,10 @@ class Instrument:
         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)
-        self.electro_tm_carrier_fluctuations = self.the_tm_carrier_fluctuations.transformed(self.electro_tm)
-        self.electro_tm_usb_offsets = self.the_tm_usb_offsets.transformed(self.electro_tm)
-        self.electro_tm_usb_fluctuations = self.the_tm_usb_fluctuations.transformed(self.electro_tm)
+        self.electro_tmi_carrier_offsets = self.the_tmi_carrier_offsets.transformed(self.electro_tmi)
+        self.electro_tmi_carrier_fluctuations = self.the_tmi_carrier_fluctuations.transformed(self.electro_tmi)
+        self.electro_tmi_usb_offsets = self.the_tmi_usb_offsets.transformed(self.electro_tmi)
+        self.electro_tmi_usb_fluctuations = self.the_tmi_usb_fluctuations.transformed(self.electro_tmi)
 
         logger.debug("Applying electronic delays to reference beatnotes")
         self.electro_ref_carrier_offsets = self.the_ref_carrier_offsets.transformed(self.electro_ref)
@@ -1132,10 +1132,10 @@ class Instrument:
         self.filtered_mprs = self.the_mprs.transformed(self.aafilter)
 
         logger.debug("Filtering test-mass beatnotes")
-        self.filtered_tm_carrier_offsets = self.electro_tm_carrier_offsets.transformed(self.aafilter)
-        self.filtered_tm_carrier_fluctuations = self.electro_tm_carrier_fluctuations.transformed(self.aafilter)
-        self.filtered_tm_usb_offsets = self.electro_tm_usb_offsets.transformed(self.aafilter)
-        self.filtered_tm_usb_fluctuations = self.electro_tm_usb_fluctuations.transformed(self.aafilter)
+        self.filtered_tmi_carrier_offsets = self.electro_tmi_carrier_offsets.transformed(self.aafilter)
+        self.filtered_tmi_carrier_fluctuations = self.electro_tmi_carrier_fluctuations.transformed(self.aafilter)
+        self.filtered_tmi_usb_offsets = self.electro_tmi_usb_offsets.transformed(self.aafilter)
+        self.filtered_tmi_usb_fluctuations = self.electro_tmi_usb_fluctuations.transformed(self.aafilter)
 
         logger.debug("Filtering reference beatnotes")
         self.filtered_ref_carrier_offsets = self.electro_ref_carrier_offsets.transformed(self.aafilter)
@@ -1161,10 +1161,10 @@ class Instrument:
         self.mprs = self.filtered_mprs.transformed(self.downsampled)
 
         logger.debug("Downsampling test-mass beatnotes")
-        self.tm_carrier_offsets = self.filtered_tm_carrier_offsets.transformed(self.downsampled)
-        self.tm_carrier_fluctuations = self.filtered_tm_carrier_fluctuations.transformed(self.downsampled)
-        self.tm_usb_offsets = self.filtered_tm_usb_offsets.transformed(self.downsampled)
-        self.tm_usb_fluctuations = self.filtered_tm_usb_fluctuations.transformed(self.downsampled)
+        self.tmi_carrier_offsets = self.filtered_tmi_carrier_offsets.transformed(self.downsampled)
+        self.tmi_carrier_fluctuations = self.filtered_tmi_carrier_fluctuations.transformed(self.downsampled)
+        self.tmi_usb_offsets = self.filtered_tmi_usb_offsets.transformed(self.downsampled)
+        self.tmi_usb_fluctuations = self.filtered_tmi_usb_fluctuations.transformed(self.downsampled)
 
         logger.debug("Downsampling reference beatnotes")
         self.ref_carrier_offsets = self.filtered_ref_carrier_offsets.transformed(self.downsampled)
@@ -1185,12 +1185,12 @@ class Instrument:
             self.isi_usb_offsets + self.isi_usb_fluctuations
 
         logger.debug("Computing total test-mass carrier beatnotes")
-        self.tm_carriers = \
-            self.tm_carrier_offsets + self.tm_carrier_fluctuations
+        self.tmi_carriers = \
+            self.tmi_carrier_offsets + self.tmi_carrier_fluctuations
 
         logger.debug("Computing total test-mass upper sideband beatnotes")
-        self.tm_usbs = \
-            self.tm_usb_offsets + self.tm_usb_fluctuations
+        self.tmi_usbs = \
+            self.tmi_usb_offsets + self.tmi_usb_fluctuations
 
         logger.debug("Computing total reference carrier beatnotes")
         self.ref_carriers = \
@@ -1278,14 +1278,14 @@ class Instrument:
                 self.oms_isi_usb_asds[mosa], self.oms_fknees[mosa])
         )
 
-        self.oms_tm_carrier_noises = ForEachMOSA(lambda mosa:
+        self.oms_tmi_carrier_noises = ForEachMOSA(lambda mosa:
             noises.oms(self.physics_fs, self.physics_size,
-                self.oms_tm_carrier_asds[mosa], self.oms_fknees[mosa])
+                self.oms_tmi_carrier_asds[mosa], self.oms_fknees[mosa])
         )
 
-        self.oms_tm_usb_noises = ForEachMOSA(lambda mosa:
+        self.oms_tmi_usb_noises = ForEachMOSA(lambda mosa:
             noises.oms(self.physics_fs, self.physics_size,
-                self.oms_tm_usb_asds[mosa], self.oms_fknees[mosa])
+                self.oms_tmi_usb_asds[mosa], self.oms_fknees[mosa])
         )
 
         self.oms_ref_carrier_noises = ForEachMOSA(lambda mosa:
@@ -1591,8 +1591,8 @@ class Instrument:
                 logger.debug("Writing OMS noise to '%s'", output)
                 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_tmi_carrier_noises.write(hdf5, 'oms_tmi_carrier_noises')
+                self.oms_tmi_usb_noises.write(hdf5, 'oms_tmi_usb_noises')
                 self.oms_ref_carrier_noises.write(hdf5, 'oms_ref_carrier_noises')
                 self.oms_ref_usb_noises.write(hdf5, 'oms_ref_usb_noises')
 
@@ -1665,22 +1665,22 @@ class Instrument:
                 self.tps_mprs.write(hdf5, 'tps_mprs')
 
                 logger.debug("Writing local beams at test-mass interferometer to '%s'", output)
-                self.local_tm_carrier_offsets.write(hdf5, 'local_tm_carrier_offsets')
-                self.local_tm_carrier_fluctuations.write(hdf5, 'local_tm_carrier_fluctuations')
-                self.local_tm_usb_offsets.write(hdf5, 'local_tm_usb_offsets')
-                self.local_tm_usb_fluctuations.write(hdf5, 'local_tm_usb_fluctuations')
+                self.local_tmi_carrier_offsets.write(hdf5, 'local_tmi_carrier_offsets')
+                self.local_tmi_carrier_fluctuations.write(hdf5, 'local_tmi_carrier_fluctuations')
+                self.local_tmi_usb_offsets.write(hdf5, 'local_tmi_usb_offsets')
+                self.local_tmi_usb_fluctuations.write(hdf5, 'local_tmi_usb_fluctuations')
 
                 logger.debug("Writing adjacent beams at test-mass interferometer to '%s'", output)
-                self.adjacent_tm_carrier_offsets.write(hdf5, 'adjacent_tm_carrier_offsets')
-                self.adjacent_tm_carrier_fluctuations.write(hdf5, 'adjacent_tm_carrier_fluctuations')
-                self.adjacent_tm_usb_offsets.write(hdf5, 'adjacent_tm_usb_offsets')
-                self.adjacent_tm_usb_fluctuations.write(hdf5, 'adjacent_tm_usb_fluctuations')
+                self.adjacent_tmi_carrier_offsets.write(hdf5, 'adjacent_tmi_carrier_offsets')
+                self.adjacent_tmi_carrier_fluctuations.write(hdf5, 'adjacent_tmi_carrier_fluctuations')
+                self.adjacent_tmi_usb_offsets.write(hdf5, 'adjacent_tmi_usb_offsets')
+                self.adjacent_tmi_usb_fluctuations.write(hdf5, 'adjacent_tmi_usb_fluctuations')
 
                 logger.debug("Writing test-mass beatnotes on TPS to '%s'", output)
-                self.tps_tm_carrier_offsets.write(hdf5, 'tps_tm_carrier_offsets')
-                self.tps_tm_carrier_fluctuations.write(hdf5, 'tps_tm_carrier_fluctuations')
-                self.tps_tm_usb_offsets.write(hdf5, 'tps_tm_usb_offsets')
-                self.tps_tm_usb_fluctuations.write(hdf5, 'tps_tm_usb_fluctuations')
+                self.tps_tmi_carrier_offsets.write(hdf5, 'tps_tmi_carrier_offsets')
+                self.tps_tmi_carrier_fluctuations.write(hdf5, 'tps_tmi_carrier_fluctuations')
+                self.tps_tmi_usb_offsets.write(hdf5, 'tps_tmi_usb_offsets')
+                self.tps_tmi_usb_fluctuations.write(hdf5, 'tps_tmi_usb_fluctuations')
 
                 logger.debug("Writing local beams at reference interferometer to '%s'", output)
                 self.local_ref_carrier_offsets.write(hdf5, 'local_ref_carrier_offsets')
@@ -1717,10 +1717,10 @@ class Instrument:
                 self.the_mprs.write(hdf5, 'the_mprs')
 
                 logger.debug("Writing test-mass beatnotes sampled to THE grid to '%s'", output)
-                self.the_tm_carrier_offsets.write(hdf5, 'the_tm_carrier_offsets')
-                self.the_tm_carrier_fluctuations.write(hdf5, 'the_tm_carrier_fluctuations')
-                self.the_tm_usb_offsets.write(hdf5, 'the_tm_usb_offsets')
-                self.the_tm_usb_fluctuations.write(hdf5, 'the_tm_usb_fluctuations')
+                self.the_tmi_carrier_offsets.write(hdf5, 'the_tmi_carrier_offsets')
+                self.the_tmi_carrier_fluctuations.write(hdf5, 'the_tmi_carrier_fluctuations')
+                self.the_tmi_usb_offsets.write(hdf5, 'the_tmi_usb_offsets')
+                self.the_tmi_usb_fluctuations.write(hdf5, 'the_tmi_usb_fluctuations')
 
                 logger.debug("Writing reference beatnotes sampled to THE grid to '%s'", output)
                 self.the_ref_carrier_offsets.write(hdf5, 'the_ref_carrier_offsets')
@@ -1735,10 +1735,10 @@ class Instrument:
                 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')
-                self.electro_tm_carrier_fluctuations.write(hdf5, 'electro_tm_carrier_fluctuations')
-                self.electro_tm_usb_offsets.write(hdf5, 'electro_tm_usb_offsets')
-                self.electro_tm_usb_fluctuations.write(hdf5, 'electro_tm_usb_fluctuations')
+                self.electro_tmi_carrier_offsets.write(hdf5, 'electro_tmi_carrier_offsets')
+                self.electro_tmi_carrier_fluctuations.write(hdf5, 'electro_tmi_carrier_fluctuations')
+                self.electro_tmi_usb_offsets.write(hdf5, 'electro_tmi_usb_offsets')
+                self.electro_tmi_usb_fluctuations.write(hdf5, 'electro_tmi_usb_fluctuations')
 
                 logger.debug("Writing reference beatnotes with electronic delays to '%s'", output)
                 self.electro_ref_carrier_offsets.write(hdf5, 'electro_ref_carrier_offsets')
@@ -1760,10 +1760,10 @@ class Instrument:
                 self.filtered_mprs.write(hdf5, 'filtered_mprs')
 
                 logger.debug("Writing filtered test-mass beatnotes to '%s'", output)
-                self.filtered_tm_carrier_offsets.write(hdf5, 'filtered_tm_carrier_offsets')
-                self.filtered_tm_carrier_fluctuations.write(hdf5, 'filtered_tm_carrier_fluctuations')
-                self.filtered_tm_usb_offsets.write(hdf5, 'filtered_tm_usb_offsets')
-                self.filtered_tm_usb_fluctuations.write(hdf5, 'filtered_tm_usb_fluctuations')
+                self.filtered_tmi_carrier_offsets.write(hdf5, 'filtered_tmi_carrier_offsets')
+                self.filtered_tmi_carrier_fluctuations.write(hdf5, 'filtered_tmi_carrier_fluctuations')
+                self.filtered_tmi_usb_offsets.write(hdf5, 'filtered_tmi_usb_offsets')
+                self.filtered_tmi_usb_fluctuations.write(hdf5, 'filtered_tmi_usb_fluctuations')
 
                 logger.debug("Writing filtered reference beatnotes to '%s'", output)
                 self.filtered_ref_carrier_offsets.write(hdf5, 'filtered_ref_carrier_offsets')
@@ -1785,10 +1785,10 @@ class Instrument:
             self.mprs.write(hdf5, 'mprs')
 
             logger.debug("Writing downsampled test-mass beatnotes to '%s'", output)
-            self.tm_carrier_offsets.write(hdf5, 'tm_carrier_offsets')
-            self.tm_carrier_fluctuations.write(hdf5, 'tm_carrier_fluctuations')
-            self.tm_usb_offsets.write(hdf5, 'tm_usb_offsets')
-            self.tm_usb_fluctuations.write(hdf5, 'tm_usb_fluctuations')
+            self.tmi_carrier_offsets.write(hdf5, 'tmi_carrier_offsets')
+            self.tmi_carrier_fluctuations.write(hdf5, 'tmi_carrier_fluctuations')
+            self.tmi_usb_offsets.write(hdf5, 'tmi_usb_offsets')
+            self.tmi_usb_fluctuations.write(hdf5, 'tmi_usb_fluctuations')
 
             logger.debug("Writing downsampled reference beatnotes to '%s'", output)
             self.ref_carrier_offsets.write(hdf5, 'ref_carrier_offsets')
@@ -1799,8 +1799,8 @@ class Instrument:
             logger.debug("Writing total beatnote frequencies to '%s'", output)
             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.tmi_carriers.write(hdf5, 'tmi_carriers')
+            self.tmi_usbs.write(hdf5, 'tmi_usbs')
             self.ref_carriers.write(hdf5, 'ref_carriers')
             self.ref_usbs.write(hdf5, 'ref_usbs')
 
@@ -1825,7 +1825,7 @@ class Instrument:
         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.isi_carrier_fluctuations[mosa], mosa)
-            plot(axes[1], self.tm_carrier_fluctuations[mosa], mosa)
+            plot(axes[1], self.tmi_carrier_fluctuations[mosa], mosa)
             plot(axes[2], self.ref_carrier_fluctuations[mosa], mosa)
         # Format plot
         axes[0].set_title("Beatnote frequency fluctuations")
@@ -1859,7 +1859,7 @@ class Instrument:
         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.isi_carrier_offsets[mosa], mosa)
-            plot(axes[1], self.tm_carrier_offsets[mosa], mosa)
+            plot(axes[1], self.tmi_carrier_offsets[mosa], mosa)
             plot(axes[2], self.ref_carrier_offsets[mosa], mosa)
         # Format plot
         axes[0].set_title("Beatnote frequency offsets")
@@ -1893,7 +1893,7 @@ class Instrument:
         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.isi_carriers[mosa], mosa)
-            plot(axes[1], self.tm_carriers[mosa], mosa)
+            plot(axes[1], self.tmi_carriers[mosa], mosa)
             plot(axes[2], self.ref_carriers[mosa], mosa)
         # Format plot
         axes[0].set_title("Beatnote total frequencies")