diff --git a/README.md b/README.md
index 63ede20281ff619478c43215bcf354f4897f9975..3e3259f2e456b9088d1c71848a8270dc999a3a61 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,7 @@ tox -e debug tests.requests.test_prometheus
 ```
 
 ## Releasenotes
+- 0.16.3 - Fix AntennaField in filename
 - 0.16.2 - Fixed MultiStationObservation.all_connected
          - Renamed SDPPacket.upcast to downcast
 - 0.16.1 - Added iterator to Receiver classes
diff --git a/VERSION b/VERSION
index 201a22c8fa5ccf5eee42a9f27552ad13e0a38619..7eb3095a3295f649df230c168c0e4fa1ae63456c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.16.2
+0.16.3
diff --git a/lofar_station_client/statistics/collector.py b/lofar_station_client/statistics/collector.py
index e8a25d4b9fad688faa688ef33466aa2c3aad1a17..9de6825018162c5758ea87a8057ce8a954f89143 100644
--- a/lofar_station_client/statistics/collector.py
+++ b/lofar_station_client/statistics/collector.py
@@ -352,7 +352,8 @@ class XSTCollector(StatisticsCollector):
         # check whether set of baselines in this packet are not out of bounds
         for antenna in (0, 1):
             if not (
-                fields.first_baseline[antenna]
+                0
+                <= fields.first_baseline[antenna]
                 + fields.nof_signal_inputs
                 - self.first_signal_input_index
                 <= self.nr_signal_inputs
diff --git a/lofar_station_client/statistics/constants.py b/lofar_station_client/statistics/constants.py
new file mode 100644
index 0000000000000000000000000000000000000000..9509a3d7abe1ba080ec517083bfafeaabfa7c16d
--- /dev/null
+++ b/lofar_station_client/statistics/constants.py
@@ -0,0 +1,15 @@
+#  Copyright (C) 2023 ASTRON (Netherlands Institute for Radio Astronomy)
+#  SPDX-License-Identifier: Apache-2.0
+
+"""Statistics constants."""
+
+from typing import Dict
+
+# Which TCP port each statistic is exposed on,
+# as DEFAULT_STATISTICS_PORTS[antennafield][mode].
+DEFAULT_STATISTICS_PORTS: Dict[str, Dict[str, int]] = {
+    "LBA": {"SST": 5101, "XST": 5102, "BST": 5103},
+    "HBA": {"SST": 5111, "XST": 5112, "BST": 5113},
+    "HBA0": {"SST": 5111, "XST": 5112, "BST": 5113},
+    "HBA1": {"SST": 5121, "XST": 5122, "BST": 5123},
+}
diff --git a/lofar_station_client/statistics/writer/entry.py b/lofar_station_client/statistics/writer/entry.py
index 4ce1b2ea34ede2b2aaa62644d3c345a9e4725c3c..4e6130de58291b25ec71dec218249b57dbd5ce5c 100644
--- a/lofar_station_client/statistics/writer/entry.py
+++ b/lofar_station_client/statistics/writer/entry.py
@@ -16,6 +16,7 @@ from pathlib import Path
 
 from tango import DeviceProxy
 
+from lofar_station_client.statistics.constants import DEFAULT_STATISTICS_PORTS
 from lofar_station_client.statistics.receiver import FileReceiver
 from lofar_station_client.statistics.receiver import TCPReceiver
 from lofar_station_client.statistics.writer.hdf5 import BstHdf5Writer
@@ -296,13 +297,7 @@ def main():
         )
 
     if port == 0:
-        default_ports = {
-            "LBA": {"SST": 5101, "XST": 5102, "BST": 5103},
-            "HBA": {"SST": 5111, "XST": 5112, "BST": 5113},
-            "HBA0": {"SST": 5111, "XST": 5112, "BST": 5113},
-            "HBA1": {"SST": 5121, "XST": 5122, "BST": 5123},
-        }
-        port = default_ports[args.antennafield][mode]
+        port = DEFAULT_STATISTICS_PORTS[args.antennafield][mode]
 
     if debug:
         logger.setLevel(logging.DEBUG)
diff --git a/lofar_station_client/statistics/writer/hdf5.py b/lofar_station_client/statistics/writer/hdf5.py
index fe645e3bf4784b109d9b22a3e60aa395c1081b54..aa11a5dd94abb897513ad63096729a3eba4d2fb2 100644
--- a/lofar_station_client/statistics/writer/hdf5.py
+++ b/lofar_station_client/statistics/writer/hdf5.py
@@ -181,7 +181,7 @@ class HDF5Writer(ABC):
 
         # Distill antennafield name, if any
         self.antennafield = (
-            self.antennafield_device.dev_name().split("/")[2]
+            self.antennafield_device.name().split("/")[2]
             if self.antennafield_device
             else "unknown"
         )
diff --git a/tests/test_devices.py b/tests/test_devices.py
index ef422440f9cdf6dfd194e2cea200b010105276f1..24a79b49d47ee49f1372dddedd00b696b3a1734e 100644
--- a/tests/test_devices.py
+++ b/tests/test_devices.py
@@ -306,7 +306,7 @@ class FakeAntennaFieldDeviceProxy:
         return self._name
 
     def dev_name(self):
-        return self._name
+        return self._name.lower()
 
 
 class FakeOffAntennaFieldDeviceProxy:
@@ -319,7 +319,7 @@ class FakeOffAntennaFieldDeviceProxy:
         return self._name
 
     def dev_name(self):
-        return self._name
+        return self._name.lower()
 
     def __getattr__(self, attrname):
         raise DevFailed("Device is off")