diff --git a/RTCP/Cobalt/CoInterface/src/Parset.cc b/RTCP/Cobalt/CoInterface/src/Parset.cc
index c5d6b8e674a319a4f9265efe062605056cd55c47..8405dc3c7d9ded3138f9d808f3c68da5cb856baf 100644
--- a/RTCP/Cobalt/CoInterface/src/Parset.cc
+++ b/RTCP/Cobalt/CoInterface/src/Parset.cc
@@ -963,7 +963,9 @@ namespace LOFAR
             ObservationSettings::RSPRaw::File file;
             file.antennaFieldNameIdx = i;
             file.streamNr = s;
-            locations[locationIdx].filename = str(format("L%u_%s_%u_rsp.raw") % settings.observationID % afName.fullName().c_str() % s);
+            if (locationsAutoDetected) {
+              locations[locationIdx].filename = str(format("L%u_%s_%u_rsp.raw") % settings.observationID % afName.fullName().c_str() % s);
+            }
             file.location = locations[locationIdx];
             settings.rspRaw.files.push_back(file);
 
diff --git a/RTCP/Cobalt/CoInterface/src/Parset.h b/RTCP/Cobalt/CoInterface/src/Parset.h
index 7c1de20d1ba310c5ae520759b28c274a19253254..ce32ab3d700ae9d6fff62f58d7890da48525b8fb 100644
--- a/RTCP/Cobalt/CoInterface/src/Parset.h
+++ b/RTCP/Cobalt/CoInterface/src/Parset.h
@@ -444,7 +444,7 @@ namespace LOFAR
           if (!cluster.empty()) {
             s = cluster + ':';
           }
-          return s + host + ':' + directory + filename;
+          return s + host + ':' + directory + '/' + filename;
         }
       };
 
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/rspraw-enable.parset.OBSID b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/rspraw-enable.parset.OBSID
index 7a8d9f646b1f21eaec35560a3b937c00951a2aa3..2695c85aac8b8dfea503da9050e54cd3c817fcdf 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/rspraw-enable.parset.OBSID
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/rspraw-enable.parset.OBSID
@@ -47,11 +47,11 @@ Observation.DataProducts.Output_RSPRaw.enabled=true
 # Override filenames and locations where RSP raw data is written to.
 # Note that the hostnames must be on the COBALT/CEP4 infiniband network (10G may also work; you may need to also override the network interface bound to...).
 # Prefer fully qualified domain names (FQDN), or CEP4:/path (per file) and the system will assign CEP4 nodes.
-# Note that you must provide (at least) enough filenames and locations! Typically, 4x the number of antenna fields for RSP raw output.
-# WARNING: Auto-detection fills in the observation ID, but if you override you cannot:
-#          another observation with the same customized override file will overwrite previously dumped data!
-# Default: Hostnames in locations: round robin over the set of correlated + beamformed hostnames.
-#          Filenames format: Lxxx_yyy_zzz_rsp.raw where xxx=OBS_ID, yyy=ANT_FIELD_NAME, zzz=BOARD_NR (+ Lxxx_yyy_zzz_rsp.raw.parset files).
+# Note that you must provide (at least) enough filenames *and* locations (not either)! Typically, 4x the number of antenna fields for RSP raw output.
+# WARNING: Auto-detection fills in the observation ID, but if you override you cannot,
+#          as another observation with the same customized override file will overwrite previously dumped data!
+# Default: Hostnames in locations: round robin over the set of correlated + coherent + incoherent hostnames.
+#          Default filename format: Lxxx_yyy_zzz_rsp.raw where xxx=OBS_ID, yyy=ANT_FIELD_NAME, zzz=BOARD_NR (+ Lxxx_yyy_zzz_rsp.raw.parset files).
 #Observation.DataProducts.Output_RSPRaw.filenames=[L123456_CS002HBA0_0_rsp.raw, L123456_CS002HBA0_1_rsp.raw, L123456_CS002HBA0_2_rsp.raw, L123456_CS002HBA0_3_rsp.raw, L123456_CS002HBA1_0_rsp.raw, L123456_CS002HBA1_1_rsp.raw, L123456_CS002HBA1_2_rsp.raw, L123456_CS002HBA1_3_rsp.raw, L123456_CS003HBA0_0_rsp.raw, L123456_CS003HBA0_1_rsp.raw, L123456_CS003HBA0_2_rsp.raw, L123456_CS003HBA0_3_rsp.raw, L123456_CS003HBA1_0_rsp.raw, L123456_CS003HBA1_1_rsp.raw, L123456_CS003HBA1_2_rsp.raw, L123456_CS003HBA1_3_rsp.raw]
 #Observation.DataProducts.Output_RSPRaw.locations=[CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs,CEP4:/data/projects/2017LOFAROBS/L123456/cs]
 #Observation.DataProducts.Output_RSPRaw.storageClusterName=CEP4