diff --git a/tangostationcontrol/docs/source/devices/antennafield.rst b/tangostationcontrol/docs/source/devices/antennafield.rst
index 438b794a88e0dee4ce2557213e078d9197772aba..bcf93f62e9d40aa4d48e24c68eb357433216542d 100644
--- a/tangostationcontrol/docs/source/devices/antennafield.rst
+++ b/tangostationcontrol/docs/source/devices/antennafield.rst
@@ -46,12 +46,12 @@ The antennas represented by the antenna field are selected by the following prop
 
   :type: ``str[]``
 
-:Power_to_RECV_mapping: Pairs of numbers ``(recv_idx, ant_idx)`` describing the inputs on which the HBAT *power* is connected. The ``recv_idx`` is the index in ``RECV_devices``, starting at 1. The ``ant_idx`` is the absolute index of the antenna in the ``RECV`` device. A value of ``-1`` means the antenna is not connected at all.
+:Power_to_RECV_mapping: Pairs of numbers ``(recv_idx, ant_idx)`` describing the inputs on which the Antenna *power* is connected. The ``recv_idx`` is the index in ``RECV_devices``, starting at 1. The ``ant_idx`` is the absolute index of the antenna in the ``RECV`` device. A value of ``-1`` means the antenna is not connected at all.
 
   :type: ``int32[]``
   :shape: ``int32[][2]``
 
-:Control_to_RECV_mapping: Pairs of numbers ``(recv_idx, ant_idx)`` describing the inputs on which the HBAT *control* is connected. The ``recv_idx`` is the index in ``RECV_devices``, starting at 1. The ``ant_idx`` is the absolute index of the antenna in the ``RECV`` device. A value of ``-1`` means the antenna is not connected at all.
+:Control_to_RECV_mapping: Pairs of numbers ``(recv_idx, ant_idx)`` describing the inputs on which the Antenna *control* is connected. The ``recv_idx`` is the index in ``RECV_devices``, starting at 1. The ``ant_idx`` is the absolute index of the antenna in the ``RECV`` device. A value of ``-1`` means the antenna is not connected at all.
 
 Positions
 """"""""""""""""""""
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
index 79c9876ec35110d9a3ebf41bb41b5cf1dd7eb354..2e4b798e52545e6e0e66b176a27da6c90314f4df 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py
@@ -19,12 +19,12 @@ from tangostationcontrol.test.devices import device_base
 
 class TestAntennaToRecvMapper(base.TestCase):
 
-    # A mapping where HBATs are all not mapped to power RCUs
+    # A mapping where Antennas are all not mapped to power RCUs
     POWER_NOT_CONNECTED = [[-1, -1]] * 48
-    # A mapping where HBATs are all not mapped to control RCUs
+    # A mapping where Antennas are all not mapped to control RCUs
     CONTROL_NOT_CONNECTED = [[-1, -1]] * 48
-    # A mapping where first two HBATs are mapped on the first Receiver.
-    # The first HBAT control line on RCU 1 and the second HBAT control line on RCU 0.
+    # A mapping where first two Antennas are mapped on the first Receiver.
+    # The first Antenna control line on RCU 1 and the second Antenna control line on RCU 0.
     CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1 = [[1, 1], [1, 0]] + [[-1, -1]] * 46
     
     def test_ant_read_mask_r_no_mapping(self):
@@ -340,12 +340,12 @@ class TestAntennafieldDevice(device_base.DeviceTestCase):
     AT_PROPERTIES = {'OPC_Server_Name': 'example.com', 'OPC_Server_Port': 4840, 'OPC_Time_Out': 5.0, 
     'Antenna_Field_Reference_ITRF' : [3.0, 3.0, 3.0], 'Antenna_Field_Reference_ETRS' : [7.0, 7.0, 7.0]}
 
-    # A mapping where HBATs are all not mapped to power RCUs
+    # A mapping where Antennas are all not mapped to power RCUs
     POWER_NOT_CONNECTED = [[-1, -1]] * 48
-    # A mapping where HBATs are all not mapped to control RCUs
+    # A mapping where Antennas are all not mapped to control RCUs
     CONTROL_NOT_CONNECTED = [[-1, -1]] * 48
-    # A mapping where first two HBATs are mapped on the first Receiver.
-    # The first HBAT control line on RCU 1 and the second HBAT control line on RCU 0.
+    # A mapping where first two Antennas are mapped on the first Receiver.
+    # The first Antenna control line on RCU 1 and the second Antenna control line on RCU 0.
     CONTROL_HBA_0_AND_1_ON_RCU_1_AND_0_OF_RECV_1 = [[1, 1], [1, 0]] + [[-1, -1]] * 46
 
     def setUp(self):