diff --git a/pom.xml b/pom.xml
index f6ac7553..f68a2585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
-  <version>2.02.04d</version>
+  <version>2.02.04f</version>
   <name>Pamguard Java12+</name>
   <description>Pamguard for Java 12+, using Maven to control dependcies</description>
 	<url>www.pamguard.org</url>
diff --git a/src/clickTrainDetector/layout/CTSwingGUI.java b/src/clickTrainDetector/layout/CTSwingGUI.java
index 47d0cd13..73fac248 100644
--- a/src/clickTrainDetector/layout/CTSwingGUI.java
+++ b/src/clickTrainDetector/layout/CTSwingGUI.java
@@ -94,7 +94,7 @@ public class CTSwingGUI extends PamControlledGUISwing {
 
 	@Override
 	public JMenuItem createDetectionMenu(Frame parentFrame) {
-		JMenu submenu = new JMenu("Click Train Detector");
+		JMenu submenu = new JMenu(clickTrainControl.getUnitName());
 
 		JMenuItem menuItem = new JMenuItem("Detection Settings ..."); 
 
diff --git a/src/clickTrainDetector/layout/ClickTrainAlgorithmPaneFX.java b/src/clickTrainDetector/layout/ClickTrainAlgorithmPaneFX.java
index 17d0054a..fffe6516 100644
--- a/src/clickTrainDetector/layout/ClickTrainAlgorithmPaneFX.java
+++ b/src/clickTrainDetector/layout/ClickTrainAlgorithmPaneFX.java
@@ -511,7 +511,7 @@ public class ClickTrainAlgorithmPaneFX extends SettingsPane<ClickTrainParams> {
 
 		// and fill in the data source list (may have changed - or might in later versions)
 		ArrayList<PamDataBlock> rd = PamController.getInstance().getDataBlocks(ClickDetection.class, true); 
-		PamDataBlock  datablock = PamController.getInstance().getRawDataBlock(clickTrainParams.dataSourceName);
+		PamDataBlock  datablock = PamController.getInstance().getDataBlockByLongName(clickTrainParams.dataSourceName);
 		
 		//use the data selector. 
 		dataSelectorCheckBox.setSelected(clickTrainParams.useDataSelector);