diff --git a/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h b/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
index d800830e3580b2dd4048d025ce536d333931d1e9..2c991c24ef46cdc71c99bd8b2ef3476c725333c4 100644
--- a/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
+++ b/LCS/MSLofar/include/MSLofar/MSLofarObsColumns.h
@@ -72,8 +72,8 @@ namespace LOFAR {
       { return observationFrequencyCenter_p; }
     const casa::ROScalarColumn<casa::Int>& subArrayPointing() const
       { return subArrayPointing_p; }
-    const casa::ROScalarColumn<casa::Int>& nofBits() const
-      { return nofBits_p; }
+    const casa::ROScalarColumn<casa::Int>& nofBitsPerSample() const
+      { return nofBitsPerSample_p; }
     const casa::ROScalarColumn<casa::String>& antennaSet() const
       { return antennaSet_p; }
     const casa::ROScalarColumn<casa::String>& filterSelection() const
@@ -150,7 +150,7 @@ namespace LOFAR {
     casa::ROScalarColumn<casa::Double> observationFrequencyMin_p;
     casa::ROScalarColumn<casa::Double> observationFrequencyCenter_p;
     casa::ROScalarColumn<casa::Int>    subArrayPointing_p;
-    casa::ROScalarColumn<casa::Int>    nofBits_p;
+    casa::ROScalarColumn<casa::Int>    nofBitsPerSample_p;
     casa::ROScalarColumn<casa::String> antennaSet_p;
     casa::ROScalarColumn<casa::String> filterSelection_p;
     casa::ROScalarColumn<casa::Double> clockFrequency_p;
@@ -217,8 +217,8 @@ namespace LOFAR {
       { return roObservationFrequencyCenter_p; }
     const casa::ROScalarColumn<casa::Int>& subArrayPointing() const
       { return roSubArrayPointing_p; }
-    const casa::ROScalarColumn<casa::Int>& nofBits() const
-      { return roNofBits_p; }
+    const casa::ROScalarColumn<casa::Int>& nofBitsPerSample() const
+      { return roNofBitsPerSample_p; }
     const casa::ROScalarColumn<casa::String>& antennaSet() const
       { return roAntennaSet_p; }
     const casa::ROScalarColumn<casa::String>& filterSelection() const
@@ -293,8 +293,8 @@ namespace LOFAR {
       { return rwObservationFrequencyCenter_p; }
     casa::ScalarColumn<casa::Int>& subArrayPointing()
       { return rwSubArrayPointing_p; }
-    casa::ScalarColumn<casa::Int>& nofBits()
-      { return rwNofBits_p; }
+    casa::ScalarColumn<casa::Int>& nofBitsPerSample()
+      { return rwNofBitsPerSample_p; }
     casa::ScalarColumn<casa::String>& antennaSet()
       { return rwAntennaSet_p; }
     casa::ScalarColumn<casa::String>& filterSelection()
@@ -371,7 +371,7 @@ namespace LOFAR {
     casa::ROScalarColumn<casa::Double> roObservationFrequencyMin_p;
     casa::ROScalarColumn<casa::Double> roObservationFrequencyCenter_p;
     casa::ROScalarColumn<casa::Int>    roSubArrayPointing_p;
-    casa::ROScalarColumn<casa::Int>    roNofBits_p;
+    casa::ROScalarColumn<casa::Int>    roNofBitsPerSample_p;
     casa::ROScalarColumn<casa::String> roAntennaSet_p;
     casa::ROScalarColumn<casa::String> roFilterSelection_p;
     casa::ROScalarColumn<casa::Double> roClockFrequency_p;
@@ -406,7 +406,7 @@ namespace LOFAR {
     casa::ScalarColumn<casa::Double> rwObservationFrequencyMin_p;
     casa::ScalarColumn<casa::Double> rwObservationFrequencyCenter_p;
     casa::ScalarColumn<casa::Int>    rwSubArrayPointing_p;
-    casa::ScalarColumn<casa::Int>    rwNofBits_p;
+    casa::ScalarColumn<casa::Int>    rwNofBitsPerSample_p;
     casa::ScalarColumn<casa::String> rwAntennaSet_p;
     casa::ScalarColumn<casa::String> rwFilterSelection_p;
     casa::ScalarColumn<casa::Double> rwClockFrequency_p;
diff --git a/LCS/MSLofar/src/MSLofarObsColumns.cc b/LCS/MSLofar/src/MSLofarObsColumns.cc
index 35f79bb55e2f67a9e99dea24b28e8992012ede8c..c859c54437eb527198ca6c04464ea6f71402e033 100644
--- a/LCS/MSLofar/src/MSLofarObsColumns.cc
+++ b/LCS/MSLofar/src/MSLofarObsColumns.cc
@@ -56,7 +56,7 @@ namespace LOFAR {
     observationFrequencyMin_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_MIN");
     observationFrequencyCenter_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_CENTER");
     subArrayPointing_p.attach (msLofarObservation, "LOFAR_SUB_ARRAY_POINTING");
-    nofBits_p.attach (msLofarObservation, "LOFAR_NOF_BITS");
+    nofBitsPerSample_p.attach (msLofarObservation, "LOFAR_NOF_BITS_PER_SAMPLE");
     antennaSet_p.attach (msLofarObservation, "LOFAR_ANTENNA_SET");
     filterSelection_p.attach (msLofarObservation, "LOFAR_FILTER_SELECTION");
     clockFrequency_p.attach (msLofarObservation, "LOFAR_CLOCK_FREQUENCY");
@@ -108,7 +108,7 @@ namespace LOFAR {
     roObservationFrequencyMin_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_MIN");
     roObservationFrequencyCenter_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_CENTER");
     roSubArrayPointing_p.attach (msLofarObservation, "LOFAR_SUB_ARRAY_POINTING");
-    roNofBits_p.attach (msLofarObservation, "LOFAR_NOF_BITS");
+    roNofBitsPerSample_p.attach (msLofarObservation, "LOFAR_NOF_BITS_PER_SAMPLE");
     roAntennaSet_p.attach (msLofarObservation, "LOFAR_ANTENNA_SET");
     roFilterSelection_p.attach (msLofarObservation, "LOFAR_FILTER_SELECTION");
     roClockFrequency_p.attach (msLofarObservation, "LOFAR_CLOCK_FREQUENCY");
@@ -141,7 +141,7 @@ namespace LOFAR {
     rwObservationFrequencyMin_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_MIN");
     rwObservationFrequencyCenter_p.attach (msLofarObservation, "LOFAR_OBSERVATION_FREQUENCY_CENTER");
     rwSubArrayPointing_p.attach (msLofarObservation, "LOFAR_SUB_ARRAY_POINTING");
-    rwNofBits_p.attach (msLofarObservation, "LOFAR_NOF_BITS");
+    rwNofBitsPerSample_p.attach (msLofarObservation, "LOFAR_NOF_BITS_PER_SAMPLE");
     rwAntennaSet_p.attach (msLofarObservation, "LOFAR_ANTENNA_SET");
     rwFilterSelection_p.attach (msLofarObservation, "LOFAR_FILTER_SELECTION");
     rwClockFrequency_p.attach (msLofarObservation, "LOFAR_CLOCK_FREQUENCY");
diff --git a/LCS/MSLofar/src/MSLofarObservation.cc b/LCS/MSLofar/src/MSLofarObservation.cc
index 4de0e02df07ec0c33699ae71df0a5db4c19ce47c..42fb1d2de419b52f65254400d38d976196b18704 100644
--- a/LCS/MSLofar/src/MSLofarObservation.cc
+++ b/LCS/MSLofar/src/MSLofarObservation.cc
@@ -89,7 +89,7 @@ namespace LOFAR {
                              "MHz");
     MSLofarTable::addColumn (td, "LOFAR_SUB_ARRAY_POINTING", TpInt,
                              "Subarray pointing id");
-    MSLofarTable::addColumn (td, "LOFAR_NOF_BITS", TpInt,
+    MSLofarTable::addColumn (td, "LOFAR_NOF_BITS_PER_SAMPLE", TpInt,
                              "Number of bits per sample");
     MSLofarTable::addColumn (td, "LOFAR_ANTENNA_SET", TpString,
                              "SAS Antenna set name");
diff --git a/LCS/MSLofar/test/tMSLofar.cc b/LCS/MSLofar/test/tMSLofar.cc
index aa262f0965bc6ab20b72b58080cc310599afaace..ced34df284a5d23d955d9e3950b1917a74eac160 100644
--- a/LCS/MSLofar/test/tMSLofar.cc
+++ b/LCS/MSLofar/test/tMSLofar.cc
@@ -99,7 +99,7 @@ void fillMS()
   obs.observationFrequencyMin().put (0, 20);
   obs.observationFrequencyCenter().put (0, 40);
   obs.subArrayPointing().put (0, 3);
-  obs.nofBits().put (0, 16);
+  obs.nofBitsPerSample().put (0, 16);
   obs.antennaSet().put (0, "HBA_DUAL");
   obs.filterSelection().put (0, "sel");
   obs.clockFrequency().put (0, 160);
@@ -161,7 +161,7 @@ void checkMS (const MSLofar& ms)
   ASSERT (obs.observationFrequencyMin()(0) == 20);
   ASSERT (obs.observationFrequencyCenter()(0) == 40);
   ASSERT (obs.subArrayPointing()(0) == 3);
-  ASSERT (obs.nofBits()(0) == 16);
+  ASSERT (obs.nofBitsPerSample()(0) == 16);
   ASSERT (obs.antennaSet()(0) == "HBA_DUAL");
   ASSERT (obs.filterSelection()(0) == "sel");
   ASSERT (obs.clockFrequency()(0) == 160);
diff --git a/RTCP/Storage/src/MeasurementSetFormat.cc b/RTCP/Storage/src/MeasurementSetFormat.cc
index 9d26eaadf177120b05638920b0ba2ba78d971bb1..7edee8ca9cb35fc32e65b35e30a4a807a466fddd 100644
--- a/RTCP/Storage/src/MeasurementSetFormat.cc
+++ b/RTCP/Storage/src/MeasurementSetFormat.cc
@@ -389,7 +389,7 @@ void MeasurementSetFormat::fillObs(unsigned subarray) {
   msobsCol.observationFrequencyMinQuant().put(0, Quantity(minFreq, "Hz"));
   msobsCol.observationFrequencyCenterQuant().put(0, Quantity(0.5*(minFreq+maxFreq), "Hz"));
   msobsCol.subArrayPointing().put(0, subarray);
-  msobsCol.nofBits().put (0, itsPS->nrBitsPerSample());
+  msobsCol.nofBitsPerSample().put (0, itsPS->nrBitsPerSample());
   msobsCol.antennaSet().put(0, itsPS->antennaSet());
   msobsCol.filterSelection().put(0, itsPS->bandFilter());
   msobsCol.clockFrequencyQuant().put(0, Quantity(itsPS->clockSpeed(), "Hz"));