diff --git a/CEP/BB/BBS/src/BBSKernel.cc b/CEP/BB/BBS/src/BBSKernel.cc
index 635f36f5c216b0bb75e231c2e1581d0ae3ef66f6..38d0b130f6056013ea9c925b38bdd732f2f174ce 100644
--- a/CEP/BB/BBS/src/BBSKernel.cc
+++ b/CEP/BB/BBS/src/BBSKernel.cc
@@ -27,12 +27,12 @@
 #include <PLC/ACCmain.h>
 #include <BBS/BBSKernelProcessControl.h>
 
-using namespace LOFAR;
+using namespace LOFAR::BBS;
 
 int main(int argc, char **argv)
 {
   INIT_LOGGER(basename(argv[0]));
 
   BBSKernelProcessControl process;
-  return ACC::PLC::ACCmain(argc, argv, &process);
+  return LOFAR::ACC::PLC::ACCmain(argc, argv, &process);
 }
diff --git a/CEP/BB/BBS/src/BBSKernelProcessControl.cc b/CEP/BB/BBS/src/BBSKernelProcessControl.cc
index 9cfaf0d3337735a99539c31a5e5c1c5a1f94434d..4f26d049f1cdd90609a6a4e4c056ca88cc492672 100644
--- a/CEP/BB/BBS/src/BBSKernelProcessControl.cc
+++ b/CEP/BB/BBS/src/BBSKernelProcessControl.cc
@@ -30,6 +30,9 @@
 
 namespace LOFAR 
 {
+namespace BBS 
+{
+    
     BBSKernelProcessControl::BBSKernelProcessControl()
     : ProcessControl()
     {
@@ -128,4 +131,5 @@ namespace LOFAR
         return std::string("");
     }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/BBSKernelProcessControl.h b/CEP/BB/BBS/src/BBSKernelProcessControl.h
index 20aa181537955b1f020aa55719ed72d44dcc0c3a..ef606db1da8f08b793fdaa0b3e6bc42c856ecef7 100644
--- a/CEP/BB/BBS/src/BBSKernelProcessControl.h
+++ b/CEP/BB/BBS/src/BBSKernelProcessControl.h
@@ -31,7 +31,14 @@
 #include <PLC/ProcessControl.h>
 #include <APS/ParameterSet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+
+// \addtogroup BBS
+// @{
+
 //# Description of class.
 // The ProcessControl class defines the command interface that can be used
 // to control the processes of an application.<br>
@@ -107,6 +114,7 @@ public:
     std::string askInfo(const string& keylist);
 }; // class BBSKernelProcessControl
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/BBSTestLogger.cc b/CEP/BB/BBS/src/BBSTestLogger.cc
index ae4b77016ab95a36a638d8b66e24fbee1c3029b1..adadde26de0c595e23b0daa5537fefc73d593497 100644
--- a/CEP/BB/BBS/src/BBSTestLogger.cc
+++ b/CEP/BB/BBS/src/BBSTestLogger.cc
@@ -30,7 +30,10 @@
 #include <BBS/ParmData.h>
 #include <sstream>
 
-namespace LOFAR{
+namespace LOFAR
+{
+namespace BBS
+{
 
   namespace BBSTest {
 
@@ -98,4 +101,6 @@ namespace LOFAR{
       }
     }
   }
+  
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/BBSTestLogger.h b/CEP/BB/BBS/src/BBSTestLogger.h
index 534ac86999ff30027d82633124b1a0790be0b412..2b6df2ed7d9e3bcc72cb0ba27da7e2d7681fa315 100644
--- a/CEP/BB/BBS/src/BBSTestLogger.h
+++ b/CEP/BB/BBS/src/BBSTestLogger.h
@@ -40,6 +40,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ namespace LOFAR
     };
   }
 
+} // end namespace BBS
 } // end namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/BBSrun.cc b/CEP/BB/BBS/src/BBSrun.cc
index c73f1f9d760cc8a005bd7963818710a1012d941b..7af34e91a99af7afe0fac535b5a5e7ce3153a440 100644
--- a/CEP/BB/BBS/src/BBSrun.cc
+++ b/CEP/BB/BBS/src/BBSrun.cc
@@ -42,6 +42,7 @@
 using namespace std;
 using namespace casa;
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace LOFAR::ParmDB;
 using namespace LOFAR::ACC::APS;
 
diff --git a/CEP/BB/BBS/src/Fitter.cc b/CEP/BB/BBS/src/Fitter.cc
index b00d2bc5f195a8a330b64082491bb870766b438b..34d4a84264723f31e13728a7849d30114730313a 100644
--- a/CEP/BB/BBS/src/Fitter.cc
+++ b/CEP/BB/BBS/src/Fitter.cc
@@ -33,7 +33,10 @@
 using namespace std;
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS 
+{
 
   void Fitter::set (int nfitter, int nunknown)
   {
@@ -97,4 +100,5 @@ namespace LOFAR {
     aio.getend();
   }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/Fitter.h b/CEP/BB/BBS/src/Fitter.h
index 1eb036f82a67895f502edbbbcd5db76596a9932a..c2efaf08b6d87e1d71faace0afcbd485476a5a2e 100644
--- a/CEP/BB/BBS/src/Fitter.h
+++ b/CEP/BB/BBS/src/Fitter.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -61,6 +63,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/FlagsMap.cc b/CEP/BB/BBS/src/FlagsMap.cc
index 4e8c2d9822072acdff1da7fe802c9b7c8c365b7b..94d51ac11ab422bd3f13c2d2a36f92797994594d 100644
--- a/CEP/BB/BBS/src/FlagsMap.cc
+++ b/CEP/BB/BBS/src/FlagsMap.cc
@@ -24,6 +24,8 @@
 #include <BBS/FlagsMap.h>
 
 namespace LOFAR
+{
+namespace BBS 
 {
 
   FlagsMap::FlagsMap (const string& fileName, MMap::protection prot)
@@ -64,4 +66,5 @@ namespace LOFAR
   }
 
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/FlagsMap.h b/CEP/BB/BBS/src/FlagsMap.h
index 5cf7ad4d2aafc7642e9bf75ed76c58ff13408255..c21124403359e7c3805d4fccf8e11bd3983afe65 100644
--- a/CEP/BB/BBS/src/FlagsMap.h
+++ b/CEP/BB/BBS/src/FlagsMap.h
@@ -28,7 +28,8 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
   // This class implements a mmap operation for the data flags which are bits.
 
   class FlagsMap
@@ -94,6 +95,7 @@ namespace LOFAR
     return ((itsFlags[index] & (uchar(1) << (realpos%8)))  ==  0);
   }
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MMap.cc b/CEP/BB/BBS/src/MMap.cc
index fc3e13280b43be20a7bb45860e376cd728f437c8..db791375c0d048d7e5c49d5a7afff83c5b012191 100644
--- a/CEP/BB/BBS/src/MMap.cc
+++ b/CEP/BB/BBS/src/MMap.cc
@@ -32,6 +32,8 @@
 
 namespace LOFAR
 {
+namespace BBS 
+{
   
 MMap::MMap (const string& fileName, protection prot)
   : itsFileName  (fileName),
@@ -141,4 +143,5 @@ void MMap::flush()
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MMap.h b/CEP/BB/BBS/src/MMap.h
index 0795fdca01771e139332980de5e678513798f498..8c8e14f3d274bbbead6d94266915e5f7b5ac0ef7 100644
--- a/CEP/BB/BBS/src/MMap.h
+++ b/CEP/BB/BBS/src/MMap.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \ addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ inline bool MMap::isWritable() const
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MMapMSInfo.cc b/CEP/BB/BBS/src/MMapMSInfo.cc
index e7fd98ec4b8d090b0349470d12a9912d57b0a18f..44ef2b06de0e20f8e552edf0cd1e3ba135a4a0ca 100644
--- a/CEP/BB/BBS/src/MMapMSInfo.cc
+++ b/CEP/BB/BBS/src/MMapMSInfo.cc
@@ -24,6 +24,8 @@
 #include <MS/MSDesc.h>
 
 namespace LOFAR
+{
+namespace BBS 
 {
 
   MMapMSInfo::MMapMSInfo (const MSDesc& msdesc, uint ddid,
@@ -48,4 +50,5 @@ namespace LOFAR
     }
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MMapMSInfo.h b/CEP/BB/BBS/src/MMapMSInfo.h
index dc521f28f0d447d5b9b4f9d7921b8f2cd832c5c1..9ed6885dccc270841982311a3e62881173acd08b 100644
--- a/CEP/BB/BBS/src/MMapMSInfo.h
+++ b/CEP/BB/BBS/src/MMapMSInfo.h
@@ -34,6 +34,9 @@ namespace LOFAR
   // Forward Declarations.
   class MSDesc;
 
+namespace BBS
+{
+
 // \ addtogroup BBS
 // @{
 // 
@@ -102,6 +105,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.cc b/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.cc
index 111c9a3a921a54a9adc0287bfa28baae4260465c..298ead81bdbc9214a6aa8b65823f99dde03f65a7 100644
--- a/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.cc
+++ b/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.cc
@@ -28,7 +28,12 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::dcomplex;
+using LOFAR::conj;
 
 MeqBaseDFTPS::MeqBaseDFTPS (const MeqExpr& left, const MeqExpr& right,
                 const MeqExpr& lmn)
@@ -173,4 +178,5 @@ std::string MeqBaseDFTPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.h b/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.h
index 8db406906e6260705b1909d4364e838e1e0f001d..122abfe5bc669cf4fe214f043a5762589948d8af 100644
--- a/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.h
+++ b/CEP/BB/BBS/src/MNS/MeqBaseDFTPS.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqBaseLinPS.cc b/CEP/BB/BBS/src/MNS/MeqBaseLinPS.cc
index e23f6083c7d492effc14496afba5255a4803e5dc..19d40ba51aef1891f5260763dcd1a51254e90bf7 100644
--- a/CEP/BB/BBS/src/MNS/MeqBaseLinPS.cc
+++ b/CEP/BB/BBS/src/MNS/MeqBaseLinPS.cc
@@ -29,7 +29,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqBaseLinPS::MeqBaseLinPS (const MeqExpr& dft, MeqPointSource* source)
 : itsDFT    (dft),
@@ -130,4 +133,5 @@ std::string MeqBaseLinPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqBaseLinPS.h b/CEP/BB/BBS/src/MNS/MeqBaseLinPS.h
index 4978e1f287cab7518e94e1717e6d91bf2541732d..562dbecd6ec66cb7925620de07bf301270faeec0 100644
--- a/CEP/BB/BBS/src/MNS/MeqBaseLinPS.h
+++ b/CEP/BB/BBS/src/MNS/MeqBaseLinPS.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqPointSource.h>
 #include <BBS/MNS/MeqDFTPS.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,6 @@ private:
 
 // @}
 
-}
-
+} // namespace BBS
+} // namespace LOFAR
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqDFTPS.cc b/CEP/BB/BBS/src/MNS/MeqDFTPS.cc
index e99b93b68f26a19d2cde19f983cc7cd293906367..8f1914c457298cdde2eb94a06fdd3c9bfbffa7a9 100644
--- a/CEP/BB/BBS/src/MNS/MeqDFTPS.cc
+++ b/CEP/BB/BBS/src/MNS/MeqDFTPS.cc
@@ -32,8 +32,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDFTPS::MeqDFTPS (const MeqExpr& lmn, MeqStatUVW* uvw)
 : itsLMN (lmn),
@@ -130,4 +132,5 @@ std::string MeqDFTPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqDFTPS.h b/CEP/BB/BBS/src/MNS/MeqDFTPS.h
index 057fafbf2f2c77b68f0604b1fe1d0f84d5b4905e..4cb817e02cd57386ea480ba960df572f051583f0 100644
--- a/CEP/BB/BBS/src/MNS/MeqDFTPS.h
+++ b/CEP/BB/BBS/src/MNS/MeqDFTPS.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqDiag.cc b/CEP/BB/BBS/src/MNS/MeqDiag.cc
index 14e2efa8e3ef84f8283155b35d5525d802d7ebdb..92de9acc84c15cabd6d29a6a17a59baae80f8488 100644
--- a/CEP/BB/BBS/src/MNS/MeqDiag.cc
+++ b/CEP/BB/BBS/src/MNS/MeqDiag.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqDiag.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDiag::MeqDiag(const MeqExpr& xx, const MeqExpr& yy)
 : itsXX(xx),
@@ -53,4 +56,5 @@ MeqJonesResult MeqDiag::getJResult(const MeqRequest& request)
   return res;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqDiag.h b/CEP/BB/BBS/src/MNS/MeqDiag.h
index 61228b57629111d10ddcf978e12c7a3e8d4df376..744c75c6f2b5a1fe065e40ac54dd1bba7667d526 100644
--- a/CEP/BB/BBS/src/MNS/MeqDiag.h
+++ b/CEP/BB/BBS/src/MNS/MeqDiag.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqDomain.cc b/CEP/BB/BBS/src/MNS/MeqDomain.cc
index e32087abd1e3b820fbce1e971d3f7be5f665f351..5191166540c6d779261db12b3494a8ccbadf81a0 100644
--- a/CEP/BB/BBS/src/MNS/MeqDomain.cc
+++ b/CEP/BB/BBS/src/MNS/MeqDomain.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqDomain.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDomain::MeqDomain()
 : itsStartX (0),
@@ -68,4 +71,5 @@ std::ostream& operator<< (std::ostream& os, const MeqDomain& domain)
   return os;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqDomain.h b/CEP/BB/BBS/src/MNS/MeqDomain.h
index 8ba9521ccd3199f867cc87cc4b68f72908b6c414..7d04381ff4a1bd46033642d25910c6860f78c57d 100644
--- a/CEP/BB/BBS/src/MNS/MeqDomain.h
+++ b/CEP/BB/BBS/src/MNS/MeqDomain.h
@@ -29,7 +29,10 @@
 #include <iosfwd>
 #include <ParmDB/ParmDomain.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -85,6 +88,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.cc b/CEP/BB/BBS/src/MNS/MeqExpr.cc
index d3e4a879c9640e5545fc84c2d1276ed1c197e075..428b62eac3737d57be504fce953be67a813e47f3 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.cc
@@ -31,7 +31,10 @@
 #include <iomanip>
 #include <algorithm>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqExprRep::MeqExprRep()
   : itsCount    (0),
@@ -373,4 +376,5 @@ std::string MeqExprAPToComplex::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.h b/CEP/BB/BBS/src/MNS/MeqExpr.h
index ba266cfbd8f3ef01854d16ba0d54ba0d38bfcb4b..7cbe0f89470248de94c4b114048380be65878b74 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.h
@@ -38,7 +38,11 @@
     #include <iostream>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+
 //# Forward Declarations.
 class MeqExpr;
 
@@ -276,6 +280,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqFunklet.cc b/CEP/BB/BBS/src/MNS/MeqFunklet.cc
index 8c23e31cb34fd51a4053df2e057469d27ec160df..839db3623878b905391dd31bb44bc7578cd7f137 100644
--- a/CEP/BB/BBS/src/MNS/MeqFunklet.cc
+++ b/CEP/BB/BBS/src/MNS/MeqFunklet.cc
@@ -32,8 +32,11 @@
 
 using namespace casa;
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::operator<<;
 
 MeqFunklet::MeqFunklet()
 : itsNrScid (0)
@@ -188,4 +191,5 @@ void MeqFunklet::update (const vector<double>& values)
   }
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqFunklet.h b/CEP/BB/BBS/src/MNS/MeqFunklet.h
index d798f6708fffcae69df0396ee3520cbcd50d96c3..11b7b8666eb19161845fe1a92bd35a3ccc49dc05 100644
--- a/CEP/BB/BBS/src/MNS/MeqFunklet.h
+++ b/CEP/BB/BBS/src/MNS/MeqFunklet.h
@@ -32,7 +32,10 @@
 #include <ParmDB/ParmValue.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -158,6 +161,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqGaussSource.cc b/CEP/BB/BBS/src/MNS/MeqGaussSource.cc
index 4b506524626d49f9e2eded2e9cf0591ab3901f39..3e360e4c545c863fc17d842381153a35d75380c4 100644
--- a/CEP/BB/BBS/src/MNS/MeqGaussSource.cc
+++ b/CEP/BB/BBS/src/MNS/MeqGaussSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqGaussSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqGaussSource::MeqGaussSource (const string& name,
 				const string& groupName,
@@ -46,4 +49,5 @@ MeqGaussSource::MeqGaussSource (const string& name,
 MeqGaussSource::~MeqGaussSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqGaussSource.h b/CEP/BB/BBS/src/MNS/MeqGaussSource.h
index 024f1c9cb9010e2bcf654e52e4b882be8ab0122f..5577212c35dfac17cd5165d07c74371df7e44dc9 100644
--- a/CEP/BB/BBS/src/MNS/MeqGaussSource.h
+++ b/CEP/BB/BBS/src/MNS/MeqGaussSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesCMul2.cc b/CEP/BB/BBS/src/MNS/MeqJonesCMul2.cc
index e858014df1f4b6a5c527fab6e0c5baaeddc69338..b75c337d590bf264f410b4806c865079ec2a9554 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesCMul2.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesCMul2.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesCMul2::MeqJonesCMul2 (const MeqJonesExpr& left,
 			      const MeqJonesExpr& right)
@@ -151,4 +154,5 @@ MeqJonesResult MeqJonesCMul2::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesCMul2.h b/CEP/BB/BBS/src/MNS/MeqJonesCMul2.h
index 82e6ecf60a3f8ecee3727d494d7735687e771fa8..f063edd0f5bff37c5d05856f356d21f4930eb1e7 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesCMul2.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesCMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesCMul3.cc b/CEP/BB/BBS/src/MNS/MeqJonesCMul3.cc
index 2b11de23aa19db7cc953fd088c39cf1cd7fe9d73..fa5079133f593402371842e91f91491b602840ed 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesCMul3.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesCMul3.cc
@@ -35,10 +35,12 @@
 #include <xmmintrin.h>
 #endif
 
-
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesCMul3::MeqJonesCMul3 (const MeqJonesExpr& left,
                   const MeqJonesExpr& mid,
@@ -617,4 +619,5 @@ std::string MeqJonesCMul3::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesCMul3.h b/CEP/BB/BBS/src/MNS/MeqJonesCMul3.h
index 3641556e8d3b72b65e52f4decae2508027445e3f..557768318c81dc1c24f4a68e8f951ba8bca6fa8c 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesCMul3.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesCMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,8 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesExpr.cc b/CEP/BB/BBS/src/MNS/MeqJonesExpr.cc
index 0ede1819975f26f4517550a2d3d47b261dd3768a..d906012aeaae6550c1b6378bdd029e10af2dbc8b 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesExpr.cc
@@ -26,7 +26,10 @@
 #include <Common/LofarLogger.h>
 //#include <Common/Timer.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesExprRep::~MeqJonesExprRep()
 {
@@ -42,4 +45,5 @@ void MeqJonesExprRep::precalculate (const MeqRequest& request)
   itsReqId = request.getId();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesExpr.h b/CEP/BB/BBS/src/MNS/MeqJonesExpr.h
index bd061e66871dab655823b7a8b66adbf601ee1864..ee9717907d1bd0f7704a295995de9554b57fea51 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesExpr.h
@@ -33,7 +33,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -127,6 +130,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesInvert.cc b/CEP/BB/BBS/src/MNS/MeqJonesInvert.cc
index db330b20d262543d16cd2180d1a5483951c49160..f40ce8ef535e85be2ad3cb5b73c96fd562690eb6 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesInvert.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesInvert.cc
@@ -40,7 +40,10 @@
 //
 // Also note that conj(AB) = conj(B)conj(A)
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesInvert::~MeqJonesInvert()
 {}
@@ -102,4 +105,5 @@ MeqJonesResult MeqJonesInvert::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesInvert.h b/CEP/BB/BBS/src/MNS/MeqJonesInvert.h
index d83615e1481e97e9d5e14dd48207bdb65cf550ed..b086acc9584d4c8a5469b5226f5b3881497d04fb 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesInvert.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesInvert.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMMap.cc b/CEP/BB/BBS/src/MNS/MeqJonesMMap.cc
index 5d03a476713a48e55c79612c60afaac66ad289b3..455a86a9e74e6550c4941ca1fcb6a8345b30aea9 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMMap.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMMap.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqJonesMMap.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqJonesMMap::MeqJonesMMap (const MMapMSInfo& info, int blnr)
     : itsInfo     (&info),
@@ -137,4 +140,6 @@ namespace LOFAR {
       }
     }
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMMap.h b/CEP/BB/BBS/src/MNS/MeqJonesMMap.h
index eca44a5791d445942e9fdf594690deeef1d65118..f6ad6d725210d0330bccbe501c8c54e64ebfdbe5 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMMap.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMMap.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MMapMSInfo.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -59,6 +62,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMul2.cc b/CEP/BB/BBS/src/MNS/MeqJonesMul2.cc
index d95e24d81f437f3364709a91da3218884c163a98..bdfde50002920e895898c4a55502718003704fbd 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMul2.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMul2.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesMul2::MeqJonesMul2 (const MeqJonesExpr& left,
 			    const MeqJonesExpr& right)
@@ -151,4 +154,5 @@ MeqJonesResult MeqJonesMul2::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMul2.h b/CEP/BB/BBS/src/MNS/MeqJonesMul2.h
index 0e47f081304fb7e3a7cb27157488f7bef8412637..cecdb0bae2dd4d1b51ae4c816734019b07e35856 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMul2.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMul3.cc b/CEP/BB/BBS/src/MNS/MeqJonesMul3.cc
index b6b0fd457478c840ec79b684d970fcc05043b728..b002479b40886ca65adae48a535a544b736875b0 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMul3.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMul3.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesMul3::MeqJonesMul3 (const MeqJonesExpr& left,
 			    const MeqJonesExpr& mid,
@@ -196,4 +199,5 @@ MeqJonesResult MeqJonesMul3::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesMul3.h b/CEP/BB/BBS/src/MNS/MeqJonesMul3.h
index 16589806c03b39c1d553c745576f9144ccea4ea2..5f51d6c1d03029f96b64379ece2ab0cfaa412c6a 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesMul3.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesNode.cc b/CEP/BB/BBS/src/MNS/MeqJonesNode.cc
index 54f36b4fb0a96de3b29b18ce6da61d2a1d3fcb9d..9a14dc5abb2a5e3f1c18ee6ef97c15facf56865c 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesNode.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesNode.cc
@@ -25,7 +25,10 @@
 #include <BBS/MNS/MeqJonesNode.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesNode::MeqJonesNode (const MeqExpr& elem11, const MeqExpr& elem12,
                 const MeqExpr& elem21, const MeqExpr& elem22)
@@ -62,4 +65,5 @@ std::string MeqJonesNode::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesNode.h b/CEP/BB/BBS/src/MNS/MeqJonesNode.h
index 502af4476763f78887e693cd6a8a94ec43edb96e..85739fef4d5fa3fe74aec8d1856bf4742c3165dd 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesNode.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesNode.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesResult.h b/CEP/BB/BBS/src/MNS/MeqJonesResult.h
index c12eb0989ea8f44de09314961884f890bb5bc162..8aadacee203450fc08b481891c662526a1cc2bfa 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesResult.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesResult.h
@@ -32,7 +32,10 @@
 // This class represents the result in a Jones matrix of a domain for
 // which the expressions have been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesSum.cc b/CEP/BB/BBS/src/MNS/MeqJonesSum.cc
index 86d6a3e93a84039d72f01743d85bdade35f1d683..dee25c651cb49281226f2ec9c6c741413d139a5c 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesSum.cc
+++ b/CEP/BB/BBS/src/MNS/MeqJonesSum.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqJonesResult.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqJonesSum::MeqJonesSum (const std::vector<MeqJonesExpr>& expr)
     : itsExpr (expr)
@@ -113,4 +116,6 @@ std::string MeqJonesSum::getLabel()
     return std::string("MeqJonesSum\\nSum of Jones matrices");
 }
 #endif
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqJonesSum.h b/CEP/BB/BBS/src/MNS/MeqJonesSum.h
index fc414d04de14559b70dc4c8cc607cab333506038..c96509ca2c2c59bb75fcb265baf9ae9bfc74448d 100644
--- a/CEP/BB/BBS/src/MNS/MeqJonesSum.h
+++ b/CEP/BB/BBS/src/MNS/MeqJonesSum.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <vector>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqLMN.cc b/CEP/BB/BBS/src/MNS/MeqLMN.cc
index d686616ef12def0359d93dc8e56cb8bd9bdead41..4fa3eb2e55c71eb02b005149168f0d9af72cf3cc 100644
--- a/CEP/BB/BBS/src/MNS/MeqLMN.cc
+++ b/CEP/BB/BBS/src/MNS/MeqLMN.cc
@@ -30,7 +30,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqLMN::MeqLMN (MeqSource* source)
 : itsSource    (source)
@@ -209,4 +212,5 @@ std::string MeqLMN::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqLMN.h b/CEP/BB/BBS/src/MNS/MeqLMN.h
index b2ba596ab341e1228602e7434b15b9ac6e35f1a9..119ff89392eb58c84ae911649129ff4dedc7d663 100644
--- a/CEP/BB/BBS/src/MNS/MeqLMN.h
+++ b/CEP/BB/BBS/src/MNS/MeqLMN.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -72,6 +75,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqLMNAn.cc b/CEP/BB/BBS/src/MNS/MeqLMNAn.cc
index 2e21d3ae288a93dc63a8e2f490db83e8f16dcb56..e8750d6836e901dfd189573c6f1d42f7355bd606 100644
--- a/CEP/BB/BBS/src/MNS/MeqLMNAn.cc
+++ b/CEP/BB/BBS/src/MNS/MeqLMNAn.cc
@@ -31,7 +31,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqLMN::MeqLMN (MeqPointSource* source)
 : itsSource    (source)
@@ -140,4 +143,5 @@ MeqResultVec MeqLMN::getResultVec (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrix.cc b/CEP/BB/BBS/src/MNS/MeqMatrix.cc
index fb56173ce91f89f90bd04e37a0cfbc999840af5e..bc49be8f88fcd7236e247940e042282d53ed76d3 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrix.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrix.cc
@@ -35,7 +35,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrix::MeqMatrix (double value)
 {
@@ -445,8 +448,8 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& bs, MeqMatrix& vec)
   return bs;
 }
 
-}
-
+} // namespace BBS
+} // namespace LOFAR
 
 //# Instantiate the AIPS++ templates needed for Matrix<dcomplex>
 //# This is needed because dcomplex is usually not the same as casa::DComplex.
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrix.h b/CEP/BB/BBS/src/MNS/MeqMatrix.h
index ee0d40de636b9cf43fb04df16837271f166b42e8..f57291e271a5077c5ae2cfe63eb11b6424e3ee93 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrix.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrix.h
@@ -30,17 +30,26 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 
 //# Forward Declarations
-namespace casa {
-template<class T> class Matrix;
+namespace casa
+{
+    template<class T> class Matrix;
 }
 
-namespace LOFAR {
-class BlobOStream;
-class BlobIStream;
-class MeqMatrixTmp;
+namespace LOFAR
+{
+    class BlobOStream;
+    class BlobIStream;
+    
+    namespace BBS
+    {
+        class MeqMatrixTmp;
+    }
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -224,6 +233,8 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& os, MeqMatrix& vec);
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.cc b/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.cc
index de516f6e026590d42550ea0c49641cf846f30766..4739b80aadffeda466e0aeef5a58f8e9be01800b 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.cc
@@ -41,7 +41,10 @@
 #include <xmmintrin.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // Allocation will be done from the pool containing matrices of poolNElements
 // or less elements.
@@ -1015,4 +1018,5 @@ void MeqMatrixComplexArr::fillRowWithProducts(dcomplex v0, dcomplex factor,
 #endif
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.h b/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.h
index a65e835eaebd7c251b736931bb9d480f7088af14..c6ab7d93ec39718c1058a41ab893b7a3f19c5934 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixComplexArr.h
@@ -31,7 +31,10 @@
 #include <Common/lofar_complex.h>
 #include <Common/lofar_stack.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -132,6 +135,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.cc b/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.cc
index f97e7856297c7a8409049725bc66681f8b385758..77e7c797181ee79293eae2d894a419a1b1d25bed 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.cc
@@ -33,7 +33,10 @@
 #include <Common/Timer.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixComplexSca::~MeqMatrixComplexSca()
 {}
@@ -305,4 +308,5 @@ MeqMatrixRep* MeqMatrixComplexSca::sum()
   return this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.h b/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.h
index 501e6a3d2784db52e3687676f333a89b30fb6098..e6ba3187119c503b7db1decbe83073be1f4c2692 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixComplexSca.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 #include <Common/lofar_complex.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -101,6 +104,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.cc b/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.cc
index 664130cc2962f999df3ad43f1b0867c578099c3e..5c373faece82bbdcc7945222b530e3d5d9d88c29 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.cc
@@ -43,7 +43,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // Allocation will be done from the pool containing matrices of poolNElements
 // or less elements.
@@ -887,4 +890,5 @@ MeqMatrixRep* MeqMatrixRealArr::sum()
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.h b/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.h
index 6e114a4c9b77eec3e235cc097e47e81faff38de7..62673f65dc2b03e1d43c5f61257539222400e1a3 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRealArr.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -129,6 +132,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.cc b/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.cc
index ea1ac6018d97130d0c693eb6baa27d2dcda947f6..0b5791c94c72368afb4e400a00efa85ad553ba52 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixRealSca::~MeqMatrixRealSca()
 {}
@@ -257,4 +260,5 @@ MeqMatrixRep* MeqMatrixRealSca::sum()
   return this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.h b/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.h
index 3c1a8dfa65b0bc2f6b049c11dcc6ff73d418d8f1..7a4f7c09e2d22b7e4f19792239636bed86fb7ff0 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRealSca.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -109,6 +112,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRep.cc b/CEP/BB/BBS/src/MNS/MeqMatrixRep.cc
index 8a2e05b111269d81276e0b01593012b2057d90fd..10bf4274d045bb886b6fa66c0b7804cc960293d2 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRep.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRep.cc
@@ -26,7 +26,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqMatrixRep::~MeqMatrixRep()
@@ -73,4 +76,5 @@ void MeqMatrixRep::fillRowWithProducts(dcomplex, dcomplex, int)
   throw (AipsError ("MeqMatrixRep::fillRowWithProducts not implemented"));
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixRep.h b/CEP/BB/BBS/src/MNS/MeqMatrixRep.h
index f5a6eec2ceecf782252bdf4eb335a5a280fea439..a970b04c9662dbf76e2208e1506c44734dc3dd39 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixRep.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixRep.h
@@ -28,14 +28,19 @@
 
 //# Includes
 #include <Common/lofar_complex.h>
-#include <Common/lofar_iostream.h>
+//#include <Common/lofar_iostream.h>
+#include <iostream>
 #include <casa/iosfwd.h>
 
 #if defined _OPENMP
 #include <omp.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::dcomplex;
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -88,7 +93,7 @@ public:
   int nelements() const
     { return itsLength; }
 
-  virtual void show (ostream& os) const = 0;
+  virtual void show (std::ostream& os) const = 0;
 
   bool isComplex() const
     { return (type & 2) != 0; }
@@ -172,6 +177,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixTmp.cc b/CEP/BB/BBS/src/MNS/MeqMatrixTmp.cc
index 3008190724f5c95fbd46becff2217f595fb45b8f..ace3100a3de660290c13a7c33b2924fea23530e9 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixTmp.cc
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixTmp.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqMatrixComplexArr.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixTmp::MeqMatrixTmp (double value, int nx, int ny, bool init)
 {
@@ -121,4 +124,5 @@ MeqMatrixTmp sum (const MeqMatrixTmp& arg)
   return arg.itsRep->sum();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqMatrixTmp.h b/CEP/BB/BBS/src/MNS/MeqMatrixTmp.h
index 4285899b481c9e1e38c8688bdac1cc48d19610af..88ebadaa0a9df6f9ea1cd31b23a560caedf52f42 100644
--- a/CEP/BB/BBS/src/MNS/MeqMatrixTmp.h
+++ b/CEP/BB/BBS/src/MNS/MeqMatrixTmp.h
@@ -33,7 +33,10 @@
 #include <BBS/MNS/MeqMatrixComplexSca.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -176,6 +179,7 @@ inline ostream& operator<< (ostream& os, const MeqMatrixTmp& vec)
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqParm.cc b/CEP/BB/BBS/src/MNS/MeqParm.cc
index 4ff851c5d2211e768d18acf2e7382f5368cf3de9..aa171beaf91b7dd8f0b77670a1974d00a987f0b5 100644
--- a/CEP/BB/BBS/src/MNS/MeqParm.cc
+++ b/CEP/BB/BBS/src/MNS/MeqParm.cc
@@ -25,7 +25,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqParm::MeqParm (const string& name)
@@ -105,4 +108,5 @@ void MeqParmGroup::clear()
   itsParms.clear();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqParm.h b/CEP/BB/BBS/src/MNS/MeqParm.h
index 16c16d41d73c8aa7e937da31a4ab9fc2307788b6..6b32358fc1da1c5aec2ea914e2ef903088d020ec 100644
--- a/CEP/BB/BBS/src/MNS/MeqParm.h
+++ b/CEP/BB/BBS/src/MNS/MeqParm.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_string.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -211,6 +214,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqParmExpr.cc b/CEP/BB/BBS/src/MNS/MeqParmExpr.cc
index 45f6b20581b12451a39d30d8aa4d6a560a7a2af2..b9fefc508dde124b96115baff533083cc7198d0a 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqParmExpr.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqParmFunklet.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqParmExpr::MeqParmExpr (const string& expr, MeqParmGroup& group,
 			    ParmDB::ParmDB* table)
@@ -69,4 +72,5 @@ namespace LOFAR {
     return *v[0] * *v[1];
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqParmExpr.h b/CEP/BB/BBS/src/MNS/MeqParmExpr.h
index f0c59738cbf3dcb13319292ed67c80f9e4e6ee84..42cd4882360ae758c62d7e4e4c68bd3ee9f2fe90 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqParmExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <ParmDB/ParmDB.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqParmFunklet.cc b/CEP/BB/BBS/src/MNS/MeqParmFunklet.cc
index c34d3594d55a51fe878ba99d46c807449efea795..e325ead049aa653596f306d70c85991dce58395b 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmFunklet.cc
+++ b/CEP/BB/BBS/src/MNS/MeqParmFunklet.cc
@@ -35,7 +35,7 @@ using namespace std;
 
 // Make sorting vector<MPFHolder> possible (on domain).
 // So define operator< for it.
-bool less_mp (LOFAR::MeqFunklet* x, LOFAR::MeqFunklet* y)
+bool less_mp (LOFAR::BBS::MeqFunklet* x, LOFAR::BBS::MeqFunklet* y)
 {
   return (x->domain().startY() < y->domain().startY()  ||
 	  (x->domain().startY() == y->domain().startY()  &&
@@ -43,7 +43,10 @@ bool less_mp (LOFAR::MeqFunklet* x, LOFAR::MeqFunklet* y)
 }
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqParmFunklet::MeqParmFunklet (const string& name, ParmDB::ParmDB* table)
 : MeqParm    (name),
@@ -398,4 +401,5 @@ void MeqParmFunklet::save()
   }
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqParmFunklet.h b/CEP/BB/BBS/src/MNS/MeqParmFunklet.h
index 5bcf0e0cf4b07454f83a449b125a3fd60afa3f6c..9acfc1badf0a87f2d9c67675287848c0634459bf 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBS/src/MNS/MeqParmFunklet.h
@@ -37,7 +37,10 @@ namespace LOFAR {
   class ParmData;
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -131,6 +134,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqParmSingle.cc b/CEP/BB/BBS/src/MNS/MeqParmSingle.cc
index 8c15221574c7981bf10c2b386c2e5658d711bd53..e44f88d72c25e166ae13c35dd00076a733f6a6db 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmSingle.cc
+++ b/CEP/BB/BBS/src/MNS/MeqParmSingle.cc
@@ -27,7 +27,10 @@
 #include <Common/LofarLogger.h>
 #include <cmath>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqParmSingle::MeqParmSingle (const string& name, double value)
 : MeqParm  (name),
@@ -44,4 +47,5 @@ MeqResult MeqParmSingle::getResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqParmSingle.h b/CEP/BB/BBS/src/MNS/MeqParmSingle.h
index 3d63111917e220bf0f51daf1afab4a4469e31002..4dd865d50621469e9e344de362abfdf9ddfd96af 100644
--- a/CEP/BB/BBS/src/MNS/MeqParmSingle.h
+++ b/CEP/BB/BBS/src/MNS/MeqParmSingle.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqParm.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -57,6 +60,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqPhaseRef.cc b/CEP/BB/BBS/src/MNS/MeqPhaseRef.cc
index e01b05e751d6534c81d11163cf3dacdf39ef5159..6ca89c61fb7cf9d029a06ee9106a31c7d58b4e9b 100644
--- a/CEP/BB/BBS/src/MNS/MeqPhaseRef.cc
+++ b/CEP/BB/BBS/src/MNS/MeqPhaseRef.cc
@@ -36,7 +36,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPhaseRef::MeqPhaseRef (const MDirection& phaseRef, double startTime)
 : itsStartTime (startTime)
@@ -94,4 +97,5 @@ MeqPhaseRef::MeqPhaseRef (const MDirection& phaseRef, double startTime)
 //  cout << "ep3 " << ep3 << endl;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqPhaseRef.h b/CEP/BB/BBS/src/MNS/MeqPhaseRef.h
index 785a14f14a34c19a91446f34ff89c6fb7046fda6..f4dd7e3f095afff6a549198cdb0c2598b2cf023f 100644
--- a/CEP/BB/BBS/src/MNS/MeqPhaseRef.h
+++ b/CEP/BB/BBS/src/MNS/MeqPhaseRef.h
@@ -30,7 +30,10 @@
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MPosition.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqPointSource.cc b/CEP/BB/BBS/src/MNS/MeqPointSource.cc
index da9387912622773ddd7053b28eb671882f9e3ee9..10c13727d0c6d8e88e0649886753c96ccdfc1a43 100644
--- a/CEP/BB/BBS/src/MNS/MeqPointSource.cc
+++ b/CEP/BB/BBS/src/MNS/MeqPointSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqPointSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPointSource::MeqPointSource (const string& name,
                 const string& groupName,
@@ -41,4 +44,5 @@ MeqPointSource::MeqPointSource (const string& name,
 MeqPointSource::~MeqPointSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqPointSource.h b/CEP/BB/BBS/src/MNS/MeqPointSource.h
index 2786e324429886913513e3c75908b7b9d837afed..95420d39a5930dc4ecaf43d101600697e9724ab5 100644
--- a/CEP/BB/BBS/src/MNS/MeqPointSource.h
+++ b/CEP/BB/BBS/src/MNS/MeqPointSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqPolc.cc b/CEP/BB/BBS/src/MNS/MeqPolc.cc
index 9ee18fbc660be9c056ffcdfd25749daa57cac416..9af88a7c2c99449f98dc8e3938a80b805b4b4ec5 100644
--- a/CEP/BB/BBS/src/MNS/MeqPolc.cc
+++ b/CEP/BB/BBS/src/MNS/MeqPolc.cc
@@ -30,7 +30,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqPolc::MeqPolc (const ParmDB::ParmValue& pvalue)
@@ -311,4 +314,5 @@ MeqResult MeqPolc::getAnResult (const MeqRequest& request,
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqPolc.h b/CEP/BB/BBS/src/MNS/MeqPolc.h
index 7b3c8d65ad9ae7967fbaa142b44e27346afd757b..e98179bb1b0b972f6907e0870ed21e487e020884 100644
--- a/CEP/BB/BBS/src/MNS/MeqPolc.h
+++ b/CEP/BB/BBS/src/MNS/MeqPolc.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ public:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqPolcAn.cc b/CEP/BB/BBS/src/MNS/MeqPolcAn.cc
index d38e5f50dbb5fc8f743cf7f22705f69f4286e871..0efa72090e32e7d92c73b1639a0a5af49cdf77c4 100644
--- a/CEP/BB/BBS/src/MNS/MeqPolcAn.cc
+++ b/CEP/BB/BBS/src/MNS/MeqPolcAn.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqPolc::~MeqPolc()
@@ -178,4 +181,5 @@ MeqResult MeqPolc::getResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqPolcLog.cc b/CEP/BB/BBS/src/MNS/MeqPolcLog.cc
index 07bb81c7d3b930e8400e12334f2c949041d8579d..5f094fb4d435705f68d8360a568db55640e4209e 100644
--- a/CEP/BB/BBS/src/MNS/MeqPolcLog.cc
+++ b/CEP/BB/BBS/src/MNS/MeqPolcLog.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPolcLog::MeqPolcLog(const ParmDB::ParmValue& pvalue)
   : MeqFunklet(pvalue)
@@ -332,4 +335,5 @@ MeqResult MeqPolcLog::getAnResult(const MeqRequest& request, int nrpert, int per
   return getResult(request, nrpert, pertInx);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqPolcLog.h b/CEP/BB/BBS/src/MNS/MeqPolcLog.h
index 4c43d914004d9a3e0e79e488cafce1e3a4c5a2b5..d32029ce32d5b07c0e207e0786c7bb1915c8db9d 100644
--- a/CEP/BB/BBS/src/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBS/src/MNS/MeqPolcLog.h
@@ -57,7 +57,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -103,6 +106,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqRequest.cc b/CEP/BB/BBS/src/MNS/MeqRequest.cc
index 08b64a8dff78ae80edb12b2420d386d0e8340284..fc61d45e5f8396fb4342ad2d0de8e2f12defb597 100644
--- a/CEP/BB/BBS/src/MNS/MeqRequest.cc
+++ b/CEP/BB/BBS/src/MNS/MeqRequest.cc
@@ -25,7 +25,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqRequestId MeqRequest::theirRequestId = 0;
 
@@ -134,4 +137,5 @@ void MeqRequest::setDomain (const MeqDomain& domain, int nx,
   itsYP = &itsY[0];
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqRequest.h b/CEP/BB/BBS/src/MNS/MeqRequest.h
index a3328afa8124b3c3e7907d75749d75904105d873..ca2204b594d0ef678dca4e21e34e3dc2f6b695d1 100644
--- a/CEP/BB/BBS/src/MNS/MeqRequest.h
+++ b/CEP/BB/BBS/src/MNS/MeqRequest.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqMatrix.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -134,6 +137,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqRequestId.h b/CEP/BB/BBS/src/MNS/MeqRequestId.h
index b134628e3af22b203ac8b309ff714d28a267571f..9dc30d3688e33e395876ca2921a9dc2e31cbe2da 100644
--- a/CEP/BB/BBS/src/MNS/MeqRequestId.h
+++ b/CEP/BB/BBS/src/MNS/MeqRequestId.h
@@ -26,7 +26,10 @@
 // \file
 // Class holding an interferometer
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -37,6 +40,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqResult.cc b/CEP/BB/BBS/src/MNS/MeqResult.cc
index d468c1f10c36db98202d71f23be543f522d01b8c..577bdb55fc9e79d04fdb6afc76d73c997701aa5f 100644
--- a/CEP/BB/BBS/src/MNS/MeqResult.cc
+++ b/CEP/BB/BBS/src/MNS/MeqResult.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/Pool.h>
 #include <BBS/MNS/MeqParmFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 Pool<MeqResultRep> MeqResultRep::theirPool;
 #pragma omp threadprivate(MeqResultRep::theirPool)
@@ -126,4 +129,5 @@ MeqResult& MeqResult::operator= (const MeqResult& that)
   return *this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqResult.h b/CEP/BB/BBS/src/MNS/MeqResult.h
index 2257609d0735c4bea11cc501fa286c7ac70edd6d..a7e40feabdcacd9c864134c39d87b7348d1549db 100644
--- a/CEP/BB/BBS/src/MNS/MeqResult.h
+++ b/CEP/BB/BBS/src/MNS/MeqResult.h
@@ -36,7 +36,10 @@
 // This class represents a result of a domain for which an expression
 // has been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmFunklet;
@@ -213,6 +216,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqResultVec.cc b/CEP/BB/BBS/src/MNS/MeqResultVec.cc
index 0b2bc3e278e11e4754b5f7c6fcf45fafe7cdb898..271d14ec30b599eba6fee6fbb6cfd3f124f3a249 100644
--- a/CEP/BB/BBS/src/MNS/MeqResultVec.cc
+++ b/CEP/BB/BBS/src/MNS/MeqResultVec.cc
@@ -26,7 +26,10 @@
 // This class represents the result in a Jones matrix of a domain for
 // which the expressions have been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqResultVecRep::MeqResultVecRep (int size, int nspid)
   : itsCount (0)
@@ -73,4 +76,5 @@ namespace LOFAR {
     return *this;
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqResultVec.h b/CEP/BB/BBS/src/MNS/MeqResultVec.h
index 469448a9dd5b7bf625a327f7e2e4c1ce3bf073ee..7173b25965aaebefc8dc6e54860f2443c7dfde96 100644
--- a/CEP/BB/BBS/src/MNS/MeqResultVec.h
+++ b/CEP/BB/BBS/src/MNS/MeqResultVec.h
@@ -34,7 +34,10 @@
 // This class represents multiple results.
 // It is faster than a vector<MeqResult>.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -110,6 +113,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqSource.cc b/CEP/BB/BBS/src/MNS/MeqSource.cc
index a6f5755852b0c3e5f6771131c3c1e0b168a433c2..03dc3a57097ba3a01693e76ae5e1477e361aedab 100644
--- a/CEP/BB/BBS/src/MNS/MeqSource.cc
+++ b/CEP/BB/BBS/src/MNS/MeqSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqSource::MeqSource (const string& name, const string& groupName,
@@ -39,4 +42,5 @@ MeqSource::MeqSource (const string& name, const string& groupName,
 MeqSource::~MeqSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqSource.h b/CEP/BB/BBS/src/MNS/MeqSource.h
index 420f57ad9994928fa079183788c62af613fb11cb..d4a9d643384529f3ebda33b8d854923339a4fdde 100644
--- a/CEP/BB/BBS/src/MNS/MeqSource.h
+++ b/CEP/BB/BBS/src/MNS/MeqSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -76,6 +79,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqSourceList.cc b/CEP/BB/BBS/src/MNS/MeqSourceList.cc
index e3f4eab7922b8615c80201900eb06f53ea07586c..e24731ee25082133c6d07e933b032aeb27fd9e33 100644
--- a/CEP/BB/BBS/src/MNS/MeqSourceList.cc
+++ b/CEP/BB/BBS/src/MNS/MeqSourceList.cc
@@ -33,7 +33,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqSourceList::MeqSourceList (ParmDB::ParmDB& parmTable, MeqParmGroup& group)
 {
@@ -158,4 +161,5 @@ void MeqSourceList::add (MeqSource* source)
   group.push_back (idx);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqSourceList.h b/CEP/BB/BBS/src/MNS/MeqSourceList.h
index 69f8b45cab5c34ce6f1d450baea2b4c1547a0383..cb59574835dc0764a6e608a0706a0ae69b8fd2cb 100644
--- a/CEP/BB/BBS/src/MNS/MeqSourceList.h
+++ b/CEP/BB/BBS/src/MNS/MeqSourceList.h
@@ -32,7 +32,10 @@
 #include <Common/lofar_vector.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmGroup;
@@ -88,6 +91,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqStatExpr.cc b/CEP/BB/BBS/src/MNS/MeqStatExpr.cc
index cfa107ad5efb66865b7e4c064e6cfd9c2860c811..29b6e5891457c00397fa9688e8934b1a2d64f77c 100644
--- a/CEP/BB/BBS/src/MNS/MeqStatExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqStatExpr.cc
@@ -29,7 +29,10 @@
 #include <BBS/MNS/MeqMatrix.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStatExpr::MeqStatExpr (const MeqExpr& faradayRotation,
 			  const MeqExpr& dipoleRotation,
@@ -191,4 +194,5 @@ MeqJonesResult MeqStatExpr::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqStatExpr.h b/CEP/BB/BBS/src/MNS/MeqStatExpr.h
index 3bbad743d6f031a0c142923cc9230952b368dc03..5a3cb3f576b61471eb1066a7e742eea3fa97d73e 100644
--- a/CEP/BB/BBS/src/MNS/MeqStatExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqStatExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqStatUVW.cc b/CEP/BB/BBS/src/MNS/MeqStatUVW.cc
index 82d5ca9a0a5b54cfe30260dbb459607fcf5de77f..3ec6326fb2d52f9972a164bddfa8614d3479c59d 100644
--- a/CEP/BB/BBS/src/MNS/MeqStatUVW.cc
+++ b/CEP/BB/BBS/src/MNS/MeqStatUVW.cc
@@ -37,7 +37,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStatUVW::MeqStatUVW (MeqStation* station,
             const MeqPhaseRef* phaseRef)
@@ -140,4 +143,5 @@ void MeqStatUVW::set (double time, double u, double v, double w)
   itsUVW[MeqTime(time)] = MeqUVW(u,v,w);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqStatUVW.h b/CEP/BB/BBS/src/MNS/MeqStatUVW.h
index 11e082372669bfa75e0bbc0642b85fdfc8acbf75..bfdfdc4d80a787b40ca1b902328d33cc699729ea 100644
--- a/CEP/BB/BBS/src/MNS/MeqStatUVW.h
+++ b/CEP/BB/BBS/src/MNS/MeqStatUVW.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_map.h>
 #include <measures/Measures/MeasFrame.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -105,6 +108,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqStation.cc b/CEP/BB/BBS/src/MNS/MeqStation.cc
index 5de156a3e43057ee76d429e771311f929a39751b..7763bb92ad8c9140dad8f4706a8a02c4d91b8ff3 100644
--- a/CEP/BB/BBS/src/MNS/MeqStation.cc
+++ b/CEP/BB/BBS/src/MNS/MeqStation.cc
@@ -23,7 +23,10 @@
 #include <lofar_config.h>
 #include <BBS/MNS/MeqStation.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStation::MeqStation()
 {}
@@ -36,4 +39,5 @@ MeqStation::MeqStation (MeqExpr posX, MeqExpr posY, MeqExpr posZ,
   itsName (name)
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqStation.h b/CEP/BB/BBS/src/MNS/MeqStation.h
index e161fc3122e16188f9219949f17ac3a60963eb69..f984aa574b9f9332d094c28e7c90e566963296ec 100644
--- a/CEP/BB/BBS/src/MNS/MeqStation.h
+++ b/CEP/BB/BBS/src/MNS/MeqStation.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/MeqTabular.cc b/CEP/BB/BBS/src/MNS/MeqTabular.cc
index bccfa4676dcf8087a1214bf54937b551bc7459dc..a0a294f4ad2568f25c2aaf4b393957fcc8ae6b15 100644
--- a/CEP/BB/BBS/src/MNS/MeqTabular.cc
+++ b/CEP/BB/BBS/src/MNS/MeqTabular.cc
@@ -36,6 +36,9 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS
+{
+
   MeqTabular::MeqTabular (const ParmDB::ParmValue& pvalue)
   : MeqFunklet (pvalue)
   {
@@ -236,4 +239,6 @@ namespace LOFAR
   {
     return getResult (request, nrpert, pertInx);
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/MNS/MeqTabular.h b/CEP/BB/BBS/src/MNS/MeqTabular.h
index 64fb8a862ace772e4f52a807e68be2cc9c16e8f9..d26d2bb3f8af4385dbd6ce240d12b8885f2fd400 100644
--- a/CEP/BB/BBS/src/MNS/MeqTabular.h
+++ b/CEP/BB/BBS/src/MNS/MeqTabular.h
@@ -31,7 +31,9 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
+ 
 // \ingroup BBS
 // \addtogroup MNS
 // @{
@@ -64,6 +66,7 @@ namespace LOFAR
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MNS/Pool.h b/CEP/BB/BBS/src/MNS/Pool.h
index 859b1bb8abfc0b707c502944bf120d7e7a103904..a28b3632b0b524f3359d4e0b12df042488634f6b 100644
--- a/CEP/BB/BBS/src/MNS/Pool.h
+++ b/CEP/BB/BBS/src/MNS/Pool.h
@@ -4,7 +4,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // The Pool class is a very fast, stack-based allocator where objects can
 // be temporarily stored that would otherwise be deleted and allocated again.
@@ -51,6 +54,7 @@ template <class T> class Pool {
     T *top;
 };
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/MSDataArray.h b/CEP/BB/BBS/src/MSDataArray.h
index 4ad670a3ff09e267a940656c69085b8172bab810..b2bd4473ae7614d373aaaa4b3a4e76024ab877d1 100644
--- a/CEP/BB/BBS/src/MSDataArray.h
+++ b/CEP/BB/BBS/src/MSDataArray.h
@@ -29,8 +29,11 @@
 
 //# Includes
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
+ 
 // \ingroup BBS
 // @{
 
@@ -56,6 +59,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/ParmData.cc b/CEP/BB/BBS/src/ParmData.cc
index 325866c647f23e751aa20dbf6a6e86aec046c184..8555ed51778454909a97d194f5e41f0022559a62 100644
--- a/CEP/BB/BBS/src/ParmData.cc
+++ b/CEP/BB/BBS/src/ParmData.cc
@@ -27,7 +27,11 @@
 #include <Common/VectorUtil.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS 
+{
+  using LOFAR::operator<<;
 
   ParmData::ParmData()
     : itsDBSeqNr   (-1),
@@ -237,4 +241,6 @@ namespace LOFAR {
       os << ' ' << itsDomains[i] << " [" << itsDomainIndices[i] << ']' << endl;
     }
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBS/src/ParmData.h b/CEP/BB/BBS/src/ParmData.h
index b634095d82d2e4afa823489bdd04e819fa17e85c..1de1de7b2ca08ec6729187121d7f8276bd1f8599 100644
--- a/CEP/BB/BBS/src/ParmData.h
+++ b/CEP/BB/BBS/src/ParmData.h
@@ -35,13 +35,16 @@
 
 namespace LOFAR {
 
-// \addtogroup BBS
-// @{
-
 //# Forward Declarations.
 class BlobOStream;
 class BlobIStream;
 
+namespace BBS
+{
+
+// \addtogroup BBS
+// @{
+
 class ParmData
 {
 public:
@@ -187,6 +190,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/ParmWriter.cc b/CEP/BB/BBS/src/ParmWriter.cc
index 010e55a6392fdf286edea0e51b1af41459f16080..ac180f6fc2eb2847cafe6c541c71ac1f3161487e 100644
--- a/CEP/BB/BBS/src/ParmWriter.cc
+++ b/CEP/BB/BBS/src/ParmWriter.cc
@@ -37,6 +37,9 @@ using namespace std;
 
 namespace LOFAR
 {
+namespace BBS 
+{
+
 ParmWriter::ParmWriter()
 {}
 
@@ -115,4 +118,5 @@ void ParmWriter::setCoeff (ParmDB::ParmValueRep& pval, const MeqMatrix& coeff)
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/ParmWriter.h b/CEP/BB/BBS/src/ParmWriter.h
index 2112fb05f576bf30ba7bdc350015acbd76d41bfe..2b249bd2351c273990e6843454d3e1a35fb7747e 100644
--- a/CEP/BB/BBS/src/ParmWriter.h
+++ b/CEP/BB/BBS/src/ParmWriter.h
@@ -31,17 +31,29 @@
 //# Includes
 #include <Common/lofar_map.h>
 
+//# Forward Declarations
 namespace LOFAR
-{
-  // \addtogroup BBS
-  // @{
-  //# Forward Declarations
-  class ParmDataInfo;
-  class MeqMatrix;
-  namespace ParmDB {
+{  
+  namespace ParmDB
+  {
     class ParmValueRep;
   }
 
+  namespace BBS
+  {
+    class ParmDataInfo;
+    class MeqMatrix;
+  }
+}
+
+
+namespace LOFAR
+{
+namespace BBS
+{
+  
+  // \addtogroup BBS
+  // @{
 
   // Description of class.
   class ParmWriter
@@ -62,6 +74,7 @@ namespace LOFAR
   };
 
   // @}
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/Prediffer.cc b/CEP/BB/BBS/src/Prediffer.cc
index d399931c13c330eccc86214d2f3874c82da1054f..ac4ae88c24e978c4d181fdae2d6fd8dc2d91df31 100644
--- a/CEP/BB/BBS/src/Prediffer.cc
+++ b/CEP/BB/BBS/src/Prediffer.cc
@@ -116,6 +116,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 Prediffer::Prediffer(const string& msName,
              const ParmDB::ParmDBMeta& meqPdm,
@@ -2203,4 +2205,5 @@ void Prediffer::showSettings() const
   cout << endl;
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/Prediffer.h b/CEP/BB/BBS/src/Prediffer.h
index 18a2c38c8df8641839e8ba9f05e5c9701eb28889..6d2f86a7fc6106b13999f883411b8f47fb337ea9 100644
--- a/CEP/BB/BBS/src/Prediffer.h
+++ b/CEP/BB/BBS/src/Prediffer.h
@@ -62,6 +62,8 @@ namespace casa {
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -438,6 +440,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/Quality.cc b/CEP/BB/BBS/src/Quality.cc
index 1ef85acf2a5e87d43313264b1d0dc59f7ce5d932..0e1d2f8812d283f061b153f2052f61e8c412759f 100644
--- a/CEP/BB/BBS/src/Quality.cc
+++ b/CEP/BB/BBS/src/Quality.cc
@@ -26,6 +26,8 @@
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 Quality::Quality()
 {
@@ -51,4 +53,5 @@ void Quality::show(ostream& os) const
   os << "itsChi    : " <<  itsChi     << endl;
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/Quality.h b/CEP/BB/BBS/src/Quality.h
index c6398dd5df72f1de7f3562542219433a1cc12f50..fb5281387c1e1ee2f115f4feece84bc50db6a4db 100644
--- a/CEP/BB/BBS/src/Quality.h
+++ b/CEP/BB/BBS/src/Quality.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -62,6 +64,7 @@ inline ostream& operator<< (ostream& os, const Quality& qual)
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/SolveProp.h b/CEP/BB/BBS/src/SolveProp.h
index 3875b0478b11a67191228bee39be02939fc06779..365315b7a2289ac60601178215931da88f58cc7f 100644
--- a/CEP/BB/BBS/src/SolveProp.h
+++ b/CEP/BB/BBS/src/SolveProp.h
@@ -32,6 +32,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -118,6 +120,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/Solver.cc b/CEP/BB/BBS/src/Solver.cc
index 7b87ef4bd10619d30d2648bec3cf4a3ddcaf14c1..729eb4566b8d64e770fbd30cf0922ce2fc0ce697 100644
--- a/CEP/BB/BBS/src/Solver.cc
+++ b/CEP/BB/BBS/src/Solver.cc
@@ -42,6 +42,9 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
+using LOFAR::operator<<;
 
 Solver::Solver ()
 : itsDoSet  (true)
@@ -58,7 +61,7 @@ void Solver::solve (bool useSVD)
 {
   LOG_INFO_STR( "solve using file ");
   ASSERT (!itsDoSet);
-  BBSTest::ScopedTimer timer("S:solver");
+  //BBSTest::ScopedTimer timer("S:solver");
   vector<ParmData>& globalParms = itsParmInfo.parms();
   for (uint i=0; i<itsFitters.size(); ++i) {
     FitterData& fitObj = itsFitters[i];
@@ -322,10 +325,12 @@ void Solver::show (ostream& os)
   }
   os << "Solver ParmInfo: " << endl;
   itsParmInfo.show (os);
+  
   os << "Solver Fitter Values:" << endl;
   for (uint i=0; i<itsFitters.size(); ++i) {
     os << ' ' << itsFitters[i].solvableValues << endl;
   }
+  
   os << "Solver PredInfo:" << endl;
   for (uint i=0; i<itsPredInfo.size(); ++i) {
     os << " sdindices " << itsPredInfo[i].solveDomainIndices << endl;
@@ -337,6 +342,7 @@ void Solver::show (ostream& os)
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
 
 //# Instantiate the makeNorm template.
diff --git a/CEP/BB/BBS/src/Solver.h b/CEP/BB/BBS/src/Solver.h
index cb0f515215a4d397fd4a564e60cb23470e612970..eb8edda60b4549d0374167de1e9add2e9d8b217b 100644
--- a/CEP/BB/BBS/src/Solver.h
+++ b/CEP/BB/BBS/src/Solver.h
@@ -37,6 +37,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -113,10 +115,11 @@ private:
   {
     casa::LSQFit   fitter;
     Quality        quality;
-    vector<double> solvableValues;
+    std::vector<double> solvableValues;
     int            nused;
     int            nflagged;
   };
+  
   struct PredifferInfo
   {
     vector<int>           solveDomainIndices;
@@ -132,6 +135,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/StepProp.cc b/CEP/BB/BBS/src/StepProp.cc
index 0b4aadb8f2ac1ab74ddcc4722b231af587ee81f8..2eef85953220a874b507f274ae6f5d91a77d5f51 100644
--- a/CEP/BB/BBS/src/StepProp.cc
+++ b/CEP/BB/BBS/src/StepProp.cc
@@ -27,6 +27,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 // \addtogroup BBS
 // @{
@@ -124,4 +126,5 @@ void StepProp::expandPatterns (const vector<string>& antNames) const
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/StepProp.h b/CEP/BB/BBS/src/StepProp.h
index 2f06b145b4a453db8e0ed6fab1ef2dcaf1578655..9e0c7d5af7823e37044f58b8ac28a4561bc4b51f 100644
--- a/CEP/BB/BBS/src/StepProp.h
+++ b/CEP/BB/BBS/src/StepProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -139,6 +141,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/src/StrategyProp.cc b/CEP/BB/BBS/src/StrategyProp.cc
index 2d69832a938dd1ada00d8eb7053324a85133deea..83efc149f3eec771c5635d8c95eaa0fc614d06a9 100644
--- a/CEP/BB/BBS/src/StrategyProp.cc
+++ b/CEP/BB/BBS/src/StrategyProp.cc
@@ -27,6 +27,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 // \addtogroup BBS
 // @{
@@ -61,4 +63,5 @@ void StrategyProp::expandPatterns (const vector<string>& antNames) const
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBS/src/StrategyProp.h b/CEP/BB/BBS/src/StrategyProp.h
index d12fa87be77542d452dd4ba6b91f25db02c9acd9..7c287617bc063b360e4a85b45ad9f6cfa28adcd1 100644
--- a/CEP/BB/BBS/src/StrategyProp.h
+++ b/CEP/BB/BBS/src/StrategyProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -95,6 +97,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBS/test/tBandpass.run b/CEP/BB/BBS/test/tBandpass.run
index 4ae03e2ba7abfc9a7a87f2284df78a26ce74b9d8..340683746753e339c2ed873b4a41ce90bb8a9bae 100755
--- a/CEP/BB/BBS/test/tBandpass.run
+++ b/CEP/BB/BBS/test/tBandpass.run
@@ -124,11 +124,11 @@ echo "---------------- END $1 ----------------"
 return $RETURN_VALUE
 }
 
-run_subtest clean_constant &&
-run_subtest clean_polc &&
-run_subtest clean_band_constant &&
-run_subtest noise_constant &&
-run_subtest noise_polc &&
-run_subtest noise_band_constant
+run_subtest clean_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest clean_polc > tBandpass_tmp.log 2>&1 &&
+run_subtest clean_band_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_polc > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_band_constant > tBandpass_tmp.log 2>&1
 
 exit $?
diff --git a/CEP/BB/BBS/test/tBandpass.sh b/CEP/BB/BBS/test/tBandpass.sh
index 6d17a6a92d6ad39704d711ef2e98ba84c02f5181..83a3b0bf03178ed528f633671467f765f364ded3 100755
--- a/CEP/BB/BBS/test/tBandpass.sh
+++ b/CEP/BB/BBS/test/tBandpass.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tBandpass > tBandpass.log 2>&1
+$lofar_sharedir/runtest.sh tBandpass > /dev/null 2>&1
diff --git a/CEP/BB/BBS/test/tCorrect.cc b/CEP/BB/BBS/test/tCorrect.cc
index 4905d04a47a0b58ddfa980488eb614ff694c628a..025f354d712dd3eaa4b6b60ea4d577c0adeb3a86 100644
--- a/CEP/BB/BBS/test/tCorrect.cc
+++ b/CEP/BB/BBS/test/tCorrect.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;
 
diff --git a/CEP/BB/BBS/test/tFillRow.cc b/CEP/BB/BBS/test/tFillRow.cc
index ee0424aec54708ca9f9a610f732f6e28b2e6d4dd..c36bb1d344e244888395af8e9ba3dac337267ca3 100644
--- a/CEP/BB/BBS/test/tFillRow.cc
+++ b/CEP/BB/BBS/test/tFillRow.cc
@@ -27,6 +27,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 void doTest (int nx, int ny)
diff --git a/CEP/BB/BBS/test/tMSData.cc b/CEP/BB/BBS/test/tMSData.cc
index 05f63b6bc3404901fd630f5c2e038aa0e875c258..286be9757d87065c9768374d71e7d93bcdf9138b 100644
--- a/CEP/BB/BBS/test/tMSData.cc
+++ b/CEP/BB/BBS/test/tMSData.cc
@@ -39,6 +39,7 @@
 #include <sstream>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 using namespace std;
 
diff --git a/CEP/BB/BBS/test/tMeqParm.cc b/CEP/BB/BBS/test/tMeqParm.cc
index 4e7c7db65ba3ad570df07c5e6ff955297e6530ec..fa0ecbbf7058da9cbdabb5170a40926d31bbd2b0 100644
--- a/CEP/BB/BBS/test/tMeqParm.cc
+++ b/CEP/BB/BBS/test/tMeqParm.cc
@@ -30,6 +30,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBS/test/tMeqPolc.cc b/CEP/BB/BBS/test/tMeqPolc.cc
index 5aa63d9e39d3c43880f82b77aab0f7cbaafae6a5..aca77884234bd6a8cf592ed4df08ee3b2487506e 100644
--- a/CEP/BB/BBS/test/tMeqPolc.cc
+++ b/CEP/BB/BBS/test/tMeqPolc.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBS/test/tMeqPolcLog.cc b/CEP/BB/BBS/test/tMeqPolcLog.cc
index 847f4a76a1e58d8bf7837fa9b2e34c6988a37e05..d98f6b3b36bb5783c7aeaa5df428f07b8415b2fc 100644
--- a/CEP/BB/BBS/test/tMeqPolcLog.cc
+++ b/CEP/BB/BBS/test/tMeqPolcLog.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBS/test/tMeqTabular.cc b/CEP/BB/BBS/test/tMeqTabular.cc
index 76a372de08235d670eb1ac362b1eaf8dda8d7e16..bab732fab0839bcb18562b97c2c36173bd226219 100644
--- a/CEP/BB/BBS/test/tMeqTabular.cc
+++ b/CEP/BB/BBS/test/tMeqTabular.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 #define EPSILON 1.0e-12
diff --git a/CEP/BB/BBS/test/tParmMerge.cc b/CEP/BB/BBS/test/tParmMerge.cc
index d091c244855c125732f08eeef354a7710fab0057..7f496a90a1c81bf513f5d3ef168a3ced6f91ebe8 100644
--- a/CEP/BB/BBS/test/tParmMerge.cc
+++ b/CEP/BB/BBS/test/tParmMerge.cc
@@ -31,6 +31,7 @@
 #include <Blob/BlobIStream.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 
@@ -81,7 +82,7 @@ void doIt1sd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains, nrpert, nrscids);
     if (nr > 0) {
-      parmdata.parms().push_back (ParmData(iter->second.getName(),
+      parmdata.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					   iter->second.getParmDBSeqNr(),
 					   iter->second.getFunklets()));
     }
@@ -125,7 +126,7 @@ void doIt4sd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains, nrpert, nrscids);
     if (nr > 0) {
-      parmdata.parms().push_back (ParmData(iter->second.getName(),
+      parmdata.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					   iter->second.getParmDBSeqNr(),
 					   iter->second.getFunklets()));
     }
@@ -174,7 +175,7 @@ void doIt4sd2pd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains1, nrpert1, nrscids1);
     if (nr > 0) {
-      parmdata1.parms().push_back (ParmData(iter->second.getName(),
+      parmdata1.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					    iter->second.getParmDBSeqNr(),
 					    iter->second.getFunklets()));
     }
@@ -205,7 +206,7 @@ void doIt4sd2pd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains2, nrpert2, nrscids2);
     if (nr > 0) {
-      parmdata2.parms().push_back (ParmData(iter->second.getName(),
+      parmdata2.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					    iter->second.getParmDBSeqNr(),
 					    iter->second.getFunklets()));
     }
diff --git a/CEP/BB/BBS/test/tPerturbed.cc b/CEP/BB/BBS/test/tPerturbed.cc
index 4462c4f9e6861ec467b97998dbbf7a1377ef4706..cf5e4d3a6e29524acd99bf61863140118c778363 100644
--- a/CEP/BB/BBS/test/tPerturbed.cc
+++ b/CEP/BB/BBS/test/tPerturbed.cc
@@ -34,6 +34,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 // Note:
diff --git a/CEP/BB/BBS/test/tPredSolv.cc b/CEP/BB/BBS/test/tPredSolv.cc
index ce30640d5e9177464bfc649f0550c00d2e323afd..c0ba52aef95c10f03beb3a34c2a3e9e390698c6b 100644
--- a/CEP/BB/BBS/test/tPredSolv.cc
+++ b/CEP/BB/BBS/test/tPredSolv.cc
@@ -37,6 +37,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 // Note:
diff --git a/CEP/BB/BBS/test/tPredict.cc b/CEP/BB/BBS/test/tPredict.cc
index 012cdab9fc41ecea09a4118c265fab2aa7760c9b..15cb07e4c0900099684179abd22fd2ff4182d827 100644
--- a/CEP/BB/BBS/test/tPredict.cc
+++ b/CEP/BB/BBS/test/tPredict.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;
 
diff --git a/CEP/BB/BBS/test/tSubtract.cc b/CEP/BB/BBS/test/tSubtract.cc
index 9732deec0d7dbba304981d6bb4d901cd740efb7c..6d4d919b87e4a1675cf20ee956b12cca8dd2778a 100644
--- a/CEP/BB/BBS/test/tSubtract.cc
+++ b/CEP/BB/BBS/test/tSubtract.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;
 
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h b/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
index 534ac86999ff30027d82633124b1a0790be0b412..2b6df2ed7d9e3bcc72cb0ba27da7e2d7681fa315 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/BBSTestLogger.h
@@ -40,6 +40,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ namespace LOFAR
     };
   }
 
+} // end namespace BBS
 } // end namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Fitter.h b/CEP/BB/BBSKernel/include/BBSKernel/Fitter.h
index 1eb036f82a67895f502edbbbcd5db76596a9932a..c2efaf08b6d87e1d71faace0afcbd485476a5a2e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Fitter.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Fitter.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -61,6 +63,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h b/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
index 5cf7ad4d2aafc7642e9bf75ed76c58ff13408255..c21124403359e7c3805d4fccf8e11bd3983afe65 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/FlagsMap.h
@@ -28,7 +28,8 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
   // This class implements a mmap operation for the data flags which are bits.
 
   class FlagsMap
@@ -94,6 +95,7 @@ namespace LOFAR
     return ((itsFlags[index] & (uchar(1) << (realpos%8)))  ==  0);
   }
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MMap.h b/CEP/BB/BBSKernel/include/BBSKernel/MMap.h
index 0795fdca01771e139332980de5e678513798f498..8c8e14f3d274bbbead6d94266915e5f7b5ac0ef7 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MMap.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MMap.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \ addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ inline bool MMap::isWritable() const
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MMapMSInfo.h b/CEP/BB/BBSKernel/include/BBSKernel/MMapMSInfo.h
index dc521f28f0d447d5b9b4f9d7921b8f2cd832c5c1..9ed6885dccc270841982311a3e62881173acd08b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MMapMSInfo.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MMapMSInfo.h
@@ -34,6 +34,9 @@ namespace LOFAR
   // Forward Declarations.
   class MSDesc;
 
+namespace BBS
+{
+
 // \ addtogroup BBS
 // @{
 // 
@@ -102,6 +105,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
index 8db406906e6260705b1909d4364e838e1e0f001d..122abfe5bc669cf4fe214f043a5762589948d8af 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseDFTPS.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
index 4978e1f287cab7518e94e1717e6d91bf2541732d..562dbecd6ec66cb7925620de07bf301270faeec0 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqBaseLinPS.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqPointSource.h>
 #include <BBS/MNS/MeqDFTPS.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,6 @@ private:
 
 // @}
 
-}
-
+} // namespace BBS
+} // namespace LOFAR
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
index 057fafbf2f2c77b68f0604b1fe1d0f84d5b4905e..4cb817e02cd57386ea480ba960df572f051583f0 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDFTPS.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
index 61228b57629111d10ddcf978e12c7a3e8d4df376..744c75c6f2b5a1fe065e40ac54dd1bba7667d526 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDiag.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
index 8ba9521ccd3199f867cc87cc4b68f72908b6c414..7d04381ff4a1bd46033642d25910c6860f78c57d 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqDomain.h
@@ -29,7 +29,10 @@
 #include <iosfwd>
 #include <ParmDB/ParmDomain.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -85,6 +88,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
index ba266cfbd8f3ef01854d16ba0d54ba0d38bfcb4b..7cbe0f89470248de94c4b114048380be65878b74 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
@@ -38,7 +38,11 @@
     #include <iostream>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+
 //# Forward Declarations.
 class MeqExpr;
 
@@ -276,6 +280,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
index d798f6708fffcae69df0396ee3520cbcd50d96c3..11b7b8666eb19161845fe1a92bd35a3ccc49dc05 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqFunklet.h
@@ -32,7 +32,10 @@
 #include <ParmDB/ParmValue.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -158,6 +161,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
index 024f1c9cb9010e2bcf654e52e4b882be8ab0122f..5577212c35dfac17cd5165d07c74371df7e44dc9 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqGaussSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
index 82e6ecf60a3f8ecee3727d494d7735687e771fa8..f063edd0f5bff37c5d05856f356d21f4930eb1e7 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
index 3641556e8d3b72b65e52f4decae2508027445e3f..557768318c81dc1c24f4a68e8f951ba8bca6fa8c 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesCMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,8 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
index bd061e66871dab655823b7a8b66adbf601ee1864..ee9717907d1bd0f7704a295995de9554b57fea51 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesExpr.h
@@ -33,7 +33,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -127,6 +130,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
index d83615e1481e97e9d5e14dd48207bdb65cf550ed..b086acc9584d4c8a5469b5226f5b3881497d04fb 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesInvert.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
index eca44a5791d445942e9fdf594690deeef1d65118..f6ad6d725210d0330bccbe501c8c54e64ebfdbe5 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMMap.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MMapMSInfo.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -59,6 +62,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
index 0e47f081304fb7e3a7cb27157488f7bef8412637..cecdb0bae2dd4d1b51ae4c816734019b07e35856 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
index 16589806c03b39c1d553c745576f9144ccea4ea2..5f51d6c1d03029f96b64379ece2ab0cfaa412c6a 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
index 502af4476763f78887e693cd6a8a94ec43edb96e..85739fef4d5fa3fe74aec8d1856bf4742c3165dd 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesNode.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
index c12eb0989ea8f44de09314961884f890bb5bc162..8aadacee203450fc08b481891c662526a1cc2bfa 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesResult.h
@@ -32,7 +32,10 @@
 // This class represents the result in a Jones matrix of a domain for
 // which the expressions have been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
index fc414d04de14559b70dc4c8cc607cab333506038..c96509ca2c2c59bb75fcb265baf9ae9bfc74448d 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqJonesSum.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <vector>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
index b2ba596ab341e1228602e7434b15b9ac6e35f1a9..119ff89392eb58c84ae911649129ff4dedc7d663 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqLMN.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -72,6 +75,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
index ee0d40de636b9cf43fb04df16837271f166b42e8..f57291e271a5077c5ae2cfe63eb11b6424e3ee93 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrix.h
@@ -30,17 +30,26 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 
 //# Forward Declarations
-namespace casa {
-template<class T> class Matrix;
+namespace casa
+{
+    template<class T> class Matrix;
 }
 
-namespace LOFAR {
-class BlobOStream;
-class BlobIStream;
-class MeqMatrixTmp;
+namespace LOFAR
+{
+    class BlobOStream;
+    class BlobIStream;
+    
+    namespace BBS
+    {
+        class MeqMatrixTmp;
+    }
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -224,6 +233,8 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& os, MeqMatrix& vec);
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
index a65e835eaebd7c251b736931bb9d480f7088af14..c6ab7d93ec39718c1058a41ab893b7a3f19c5934 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexArr.h
@@ -31,7 +31,10 @@
 #include <Common/lofar_complex.h>
 #include <Common/lofar_stack.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -132,6 +135,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
index 501e6a3d2784db52e3687676f333a89b30fb6098..e6ba3187119c503b7db1decbe83073be1f4c2692 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixComplexSca.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 #include <Common/lofar_complex.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -101,6 +104,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
index 6e114a4c9b77eec3e235cc097e47e81faff38de7..62673f65dc2b03e1d43c5f61257539222400e1a3 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealArr.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -129,6 +132,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
index 3c1a8dfa65b0bc2f6b049c11dcc6ff73d418d8f1..7a4f7c09e2d22b7e4f19792239636bed86fb7ff0 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRealSca.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -109,6 +112,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRep.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRep.h
index f5a6eec2ceecf782252bdf4eb335a5a280fea439..a970b04c9662dbf76e2208e1506c44734dc3dd39 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRep.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixRep.h
@@ -28,14 +28,19 @@
 
 //# Includes
 #include <Common/lofar_complex.h>
-#include <Common/lofar_iostream.h>
+//#include <Common/lofar_iostream.h>
+#include <iostream>
 #include <casa/iosfwd.h>
 
 #if defined _OPENMP
 #include <omp.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::dcomplex;
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -88,7 +93,7 @@ public:
   int nelements() const
     { return itsLength; }
 
-  virtual void show (ostream& os) const = 0;
+  virtual void show (std::ostream& os) const = 0;
 
   bool isComplex() const
     { return (type & 2) != 0; }
@@ -172,6 +177,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
index 4285899b481c9e1e38c8688bdac1cc48d19610af..88ebadaa0a9df6f9ea1cd31b23a560caedf52f42 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqMatrixTmp.h
@@ -33,7 +33,10 @@
 #include <BBS/MNS/MeqMatrixComplexSca.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -176,6 +179,7 @@ inline ostream& operator<< (ostream& os, const MeqMatrixTmp& vec)
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
index 16c16d41d73c8aa7e937da31a4ab9fc2307788b6..6b32358fc1da1c5aec2ea914e2ef903088d020ec 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParm.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_string.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -211,6 +214,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
index f0c59738cbf3dcb13319292ed67c80f9e4e6ee84..42cd4882360ae758c62d7e4e4c68bd3ee9f2fe90 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <ParmDB/ParmDB.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
index 5bcf0e0cf4b07454f83a449b125a3fd60afa3f6c..9acfc1badf0a87f2d9c67675287848c0634459bf 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmFunklet.h
@@ -37,7 +37,10 @@ namespace LOFAR {
   class ParmData;
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -131,6 +134,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
index 3d63111917e220bf0f51daf1afab4a4469e31002..4dd865d50621469e9e344de362abfdf9ddfd96af 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqParmSingle.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqParm.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -57,6 +60,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPhaseRef.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPhaseRef.h
index 785a14f14a34c19a91446f34ff89c6fb7046fda6..f4dd7e3f095afff6a549198cdb0c2598b2cf023f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPhaseRef.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPhaseRef.h
@@ -30,7 +30,10 @@
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MPosition.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
index 2786e324429886913513e3c75908b7b9d837afed..95420d39a5930dc4ecaf43d101600697e9724ab5 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPointSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
index 7b3c8d65ad9ae7967fbaa142b44e27346afd757b..e98179bb1b0b972f6907e0870ed21e487e020884 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolc.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ public:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
index 4c43d914004d9a3e0e79e488cafce1e3a4c5a2b5..d32029ce32d5b07c0e207e0786c7bb1915c8db9d 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqPolcLog.h
@@ -57,7 +57,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -103,6 +106,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
index a3328afa8124b3c3e7907d75749d75904105d873..ca2204b594d0ef678dca4e21e34e3dc2f6b695d1 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequest.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqMatrix.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -134,6 +137,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequestId.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequestId.h
index b134628e3af22b203ac8b309ff714d28a267571f..9dc30d3688e33e395876ca2921a9dc2e31cbe2da 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequestId.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqRequestId.h
@@ -26,7 +26,10 @@
 // \file
 // Class holding an interferometer
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -37,6 +40,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
index 2257609d0735c4bea11cc501fa286c7ac70edd6d..a7e40feabdcacd9c864134c39d87b7348d1549db 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResult.h
@@ -36,7 +36,10 @@
 // This class represents a result of a domain for which an expression
 // has been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmFunklet;
@@ -213,6 +216,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
index 469448a9dd5b7bf625a327f7e2e4c1ce3bf073ee..7173b25965aaebefc8dc6e54860f2443c7dfde96 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqResultVec.h
@@ -34,7 +34,10 @@
 // This class represents multiple results.
 // It is faster than a vector<MeqResult>.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -110,6 +113,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
index 420f57ad9994928fa079183788c62af613fb11cb..d4a9d643384529f3ebda33b8d854923339a4fdde 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -76,6 +79,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
index 69f8b45cab5c34ce6f1d450baea2b4c1547a0383..cb59574835dc0764a6e608a0706a0ae69b8fd2cb 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqSourceList.h
@@ -32,7 +32,10 @@
 #include <Common/lofar_vector.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmGroup;
@@ -88,6 +91,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
index 3bbad743d6f031a0c142923cc9230952b368dc03..5a3cb3f576b61471eb1066a7e742eea3fa97d73e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
index 11e082372669bfa75e0bbc0642b85fdfc8acbf75..bfdfdc4d80a787b40ca1b902328d33cc699729ea 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStatUVW.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_map.h>
 #include <measures/Measures/MeasFrame.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -105,6 +108,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
index e161fc3122e16188f9219949f17ac3a60963eb69..f984aa574b9f9332d094c28e7c90e566963296ec 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqStation.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
index 64fb8a862ace772e4f52a807e68be2cc9c16e8f9..d26d2bb3f8af4385dbd6ce240d12b8885f2fd400 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqTabular.h
@@ -31,7 +31,9 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
+ 
 // \ingroup BBS
 // \addtogroup MNS
 // @{
@@ -64,6 +66,7 @@ namespace LOFAR
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/Pool.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/Pool.h
index 859b1bb8abfc0b707c502944bf120d7e7a103904..a28b3632b0b524f3359d4e0b12df042488634f6b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/Pool.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/Pool.h
@@ -4,7 +4,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // The Pool class is a very fast, stack-based allocator where objects can
 // be temporarily stored that would otherwise be deleted and allocated again.
@@ -51,6 +54,7 @@ template <class T> class Pool {
     T *top;
 };
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MSDataArray.h b/CEP/BB/BBSKernel/include/BBSKernel/MSDataArray.h
index 4ad670a3ff09e267a940656c69085b8172bab810..b2bd4473ae7614d373aaaa4b3a4e76024ab877d1 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MSDataArray.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MSDataArray.h
@@ -29,8 +29,11 @@
 
 //# Includes
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
+ 
 // \ingroup BBS
 // @{
 
@@ -56,6 +59,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h b/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
index b634095d82d2e4afa823489bdd04e819fa17e85c..1de1de7b2ca08ec6729187121d7f8276bd1f8599 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/ParmData.h
@@ -35,13 +35,16 @@
 
 namespace LOFAR {
 
-// \addtogroup BBS
-// @{
-
 //# Forward Declarations.
 class BlobOStream;
 class BlobIStream;
 
+namespace BBS
+{
+
+// \addtogroup BBS
+// @{
+
 class ParmData
 {
 public:
@@ -187,6 +190,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h b/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
index 2112fb05f576bf30ba7bdc350015acbd76d41bfe..2b249bd2351c273990e6843454d3e1a35fb7747e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/ParmWriter.h
@@ -31,17 +31,29 @@
 //# Includes
 #include <Common/lofar_map.h>
 
+//# Forward Declarations
 namespace LOFAR
-{
-  // \addtogroup BBS
-  // @{
-  //# Forward Declarations
-  class ParmDataInfo;
-  class MeqMatrix;
-  namespace ParmDB {
+{  
+  namespace ParmDB
+  {
     class ParmValueRep;
   }
 
+  namespace BBS
+  {
+    class ParmDataInfo;
+    class MeqMatrix;
+  }
+}
+
+
+namespace LOFAR
+{
+namespace BBS
+{
+  
+  // \addtogroup BBS
+  // @{
 
   // Description of class.
   class ParmWriter
@@ -62,6 +74,7 @@ namespace LOFAR
   };
 
   // @}
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
index 18a2c38c8df8641839e8ba9f05e5c9701eb28889..6d2f86a7fc6106b13999f883411b8f47fb337ea9 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Prediffer.h
@@ -62,6 +62,8 @@ namespace casa {
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -438,6 +440,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Quality.h b/CEP/BB/BBSKernel/include/BBSKernel/Quality.h
index c6398dd5df72f1de7f3562542219433a1cc12f50..fb5281387c1e1ee2f115f4feece84bc50db6a4db 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Quality.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Quality.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -62,6 +64,7 @@ inline ostream& operator<< (ostream& os, const Quality& qual)
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h b/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
index 3875b0478b11a67191228bee39be02939fc06779..365315b7a2289ac60601178215931da88f58cc7f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/SolveProp.h
@@ -32,6 +32,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -118,6 +120,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
index cb0f515215a4d397fd4a564e60cb23470e612970..eb8edda60b4549d0374167de1e9add2e9d8b217b 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/Solver.h
@@ -37,6 +37,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -113,10 +115,11 @@ private:
   {
     casa::LSQFit   fitter;
     Quality        quality;
-    vector<double> solvableValues;
+    std::vector<double> solvableValues;
     int            nused;
     int            nflagged;
   };
+  
   struct PredifferInfo
   {
     vector<int>           solveDomainIndices;
@@ -132,6 +135,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/StepProp.h b/CEP/BB/BBSKernel/include/BBSKernel/StepProp.h
index 2f06b145b4a453db8e0ed6fab1ef2dcaf1578655..9e0c7d5af7823e37044f58b8ac28a4561bc4b51f 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/StepProp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/StepProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -139,6 +141,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/StrategyProp.h b/CEP/BB/BBSKernel/include/BBSKernel/StrategyProp.h
index d12fa87be77542d452dd4ba6b91f25db02c9acd9..7c287617bc063b360e4a85b45ad9f6cfa28adcd1 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/StrategyProp.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/StrategyProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -95,6 +97,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/BBSKernel.cc b/CEP/BB/BBSKernel/src/BBSKernel.cc
index 635f36f5c216b0bb75e231c2e1581d0ae3ef66f6..38d0b130f6056013ea9c925b38bdd732f2f174ce 100644
--- a/CEP/BB/BBSKernel/src/BBSKernel.cc
+++ b/CEP/BB/BBSKernel/src/BBSKernel.cc
@@ -27,12 +27,12 @@
 #include <PLC/ACCmain.h>
 #include <BBS/BBSKernelProcessControl.h>
 
-using namespace LOFAR;
+using namespace LOFAR::BBS;
 
 int main(int argc, char **argv)
 {
   INIT_LOGGER(basename(argv[0]));
 
   BBSKernelProcessControl process;
-  return ACC::PLC::ACCmain(argc, argv, &process);
+  return LOFAR::ACC::PLC::ACCmain(argc, argv, &process);
 }
diff --git a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
index 9cfaf0d3337735a99539c31a5e5c1c5a1f94434d..4f26d049f1cdd90609a6a4e4c056ca88cc492672 100644
--- a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
+++ b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.cc
@@ -30,6 +30,9 @@
 
 namespace LOFAR 
 {
+namespace BBS 
+{
+    
     BBSKernelProcessControl::BBSKernelProcessControl()
     : ProcessControl()
     {
@@ -128,4 +131,5 @@ namespace LOFAR
         return std::string("");
     }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.h b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.h
index 20aa181537955b1f020aa55719ed72d44dcc0c3a..ef606db1da8f08b793fdaa0b3e6bc42c856ecef7 100644
--- a/CEP/BB/BBSKernel/src/BBSKernelProcessControl.h
+++ b/CEP/BB/BBSKernel/src/BBSKernelProcessControl.h
@@ -31,7 +31,14 @@
 #include <PLC/ProcessControl.h>
 #include <APS/ParameterSet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+
+// \addtogroup BBS
+// @{
+
 //# Description of class.
 // The ProcessControl class defines the command interface that can be used
 // to control the processes of an application.<br>
@@ -107,6 +114,7 @@ public:
     std::string askInfo(const string& keylist);
 }; // class BBSKernelProcessControl
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/BBSTestLogger.cc b/CEP/BB/BBSKernel/src/BBSTestLogger.cc
index ae4b77016ab95a36a638d8b66e24fbee1c3029b1..adadde26de0c595e23b0daa5537fefc73d593497 100644
--- a/CEP/BB/BBSKernel/src/BBSTestLogger.cc
+++ b/CEP/BB/BBSKernel/src/BBSTestLogger.cc
@@ -30,7 +30,10 @@
 #include <BBS/ParmData.h>
 #include <sstream>
 
-namespace LOFAR{
+namespace LOFAR
+{
+namespace BBS
+{
 
   namespace BBSTest {
 
@@ -98,4 +101,6 @@ namespace LOFAR{
       }
     }
   }
+  
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/BBSTestLogger.h b/CEP/BB/BBSKernel/src/BBSTestLogger.h
index 534ac86999ff30027d82633124b1a0790be0b412..2b6df2ed7d9e3bcc72cb0ba27da7e2d7681fa315 100644
--- a/CEP/BB/BBSKernel/src/BBSTestLogger.h
+++ b/CEP/BB/BBSKernel/src/BBSTestLogger.h
@@ -40,6 +40,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ namespace LOFAR
     };
   }
 
+} // end namespace BBS
 } // end namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/BBSrun.cc b/CEP/BB/BBSKernel/src/BBSrun.cc
index c73f1f9d760cc8a005bd7963818710a1012d941b..7af34e91a99af7afe0fac535b5a5e7ce3153a440 100644
--- a/CEP/BB/BBSKernel/src/BBSrun.cc
+++ b/CEP/BB/BBSKernel/src/BBSrun.cc
@@ -42,6 +42,7 @@
 using namespace std;
 using namespace casa;
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace LOFAR::ParmDB;
 using namespace LOFAR::ACC::APS;
 
diff --git a/CEP/BB/BBSKernel/src/Fitter.cc b/CEP/BB/BBSKernel/src/Fitter.cc
index b00d2bc5f195a8a330b64082491bb870766b438b..34d4a84264723f31e13728a7849d30114730313a 100644
--- a/CEP/BB/BBSKernel/src/Fitter.cc
+++ b/CEP/BB/BBSKernel/src/Fitter.cc
@@ -33,7 +33,10 @@
 using namespace std;
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS 
+{
 
   void Fitter::set (int nfitter, int nunknown)
   {
@@ -97,4 +100,5 @@ namespace LOFAR {
     aio.getend();
   }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/Fitter.h b/CEP/BB/BBSKernel/src/Fitter.h
index 1eb036f82a67895f502edbbbcd5db76596a9932a..c2efaf08b6d87e1d71faace0afcbd485476a5a2e 100644
--- a/CEP/BB/BBSKernel/src/Fitter.h
+++ b/CEP/BB/BBSKernel/src/Fitter.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -61,6 +63,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/FlagsMap.cc b/CEP/BB/BBSKernel/src/FlagsMap.cc
index 4e8c2d9822072acdff1da7fe802c9b7c8c365b7b..94d51ac11ab422bd3f13c2d2a36f92797994594d 100644
--- a/CEP/BB/BBSKernel/src/FlagsMap.cc
+++ b/CEP/BB/BBSKernel/src/FlagsMap.cc
@@ -24,6 +24,8 @@
 #include <BBS/FlagsMap.h>
 
 namespace LOFAR
+{
+namespace BBS 
 {
 
   FlagsMap::FlagsMap (const string& fileName, MMap::protection prot)
@@ -64,4 +66,5 @@ namespace LOFAR
   }
 
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/FlagsMap.h b/CEP/BB/BBSKernel/src/FlagsMap.h
index 5cf7ad4d2aafc7642e9bf75ed76c58ff13408255..c21124403359e7c3805d4fccf8e11bd3983afe65 100644
--- a/CEP/BB/BBSKernel/src/FlagsMap.h
+++ b/CEP/BB/BBSKernel/src/FlagsMap.h
@@ -28,7 +28,8 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
   // This class implements a mmap operation for the data flags which are bits.
 
   class FlagsMap
@@ -94,6 +95,7 @@ namespace LOFAR
     return ((itsFlags[index] & (uchar(1) << (realpos%8)))  ==  0);
   }
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MMap.cc b/CEP/BB/BBSKernel/src/MMap.cc
index fc3e13280b43be20a7bb45860e376cd728f437c8..db791375c0d048d7e5c49d5a7afff83c5b012191 100644
--- a/CEP/BB/BBSKernel/src/MMap.cc
+++ b/CEP/BB/BBSKernel/src/MMap.cc
@@ -32,6 +32,8 @@
 
 namespace LOFAR
 {
+namespace BBS 
+{
   
 MMap::MMap (const string& fileName, protection prot)
   : itsFileName  (fileName),
@@ -141,4 +143,5 @@ void MMap::flush()
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MMap.h b/CEP/BB/BBSKernel/src/MMap.h
index 0795fdca01771e139332980de5e678513798f498..8c8e14f3d274bbbead6d94266915e5f7b5ac0ef7 100644
--- a/CEP/BB/BBSKernel/src/MMap.h
+++ b/CEP/BB/BBSKernel/src/MMap.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \ addtogroup BBS
 // @{
@@ -111,6 +113,7 @@ inline bool MMap::isWritable() const
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MMapMSInfo.cc b/CEP/BB/BBSKernel/src/MMapMSInfo.cc
index e7fd98ec4b8d090b0349470d12a9912d57b0a18f..44ef2b06de0e20f8e552edf0cd1e3ba135a4a0ca 100644
--- a/CEP/BB/BBSKernel/src/MMapMSInfo.cc
+++ b/CEP/BB/BBSKernel/src/MMapMSInfo.cc
@@ -24,6 +24,8 @@
 #include <MS/MSDesc.h>
 
 namespace LOFAR
+{
+namespace BBS 
 {
 
   MMapMSInfo::MMapMSInfo (const MSDesc& msdesc, uint ddid,
@@ -48,4 +50,5 @@ namespace LOFAR
     }
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MMapMSInfo.h b/CEP/BB/BBSKernel/src/MMapMSInfo.h
index dc521f28f0d447d5b9b4f9d7921b8f2cd832c5c1..9ed6885dccc270841982311a3e62881173acd08b 100644
--- a/CEP/BB/BBSKernel/src/MMapMSInfo.h
+++ b/CEP/BB/BBSKernel/src/MMapMSInfo.h
@@ -34,6 +34,9 @@ namespace LOFAR
   // Forward Declarations.
   class MSDesc;
 
+namespace BBS
+{
+
 // \ addtogroup BBS
 // @{
 // 
@@ -102,6 +105,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
index 111c9a3a921a54a9adc0287bfa28baae4260465c..298ead81bdbc9214a6aa8b65823f99dde03f65a7 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.cc
@@ -28,7 +28,12 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::dcomplex;
+using LOFAR::conj;
 
 MeqBaseDFTPS::MeqBaseDFTPS (const MeqExpr& left, const MeqExpr& right,
                 const MeqExpr& lmn)
@@ -173,4 +178,5 @@ std::string MeqBaseDFTPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
index 8db406906e6260705b1909d4364e838e1e0f001d..122abfe5bc669cf4fe214f043a5762589948d8af 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseDFTPS.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
index e23f6083c7d492effc14496afba5255a4803e5dc..19d40ba51aef1891f5260763dcd1a51254e90bf7 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.cc
@@ -29,7 +29,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqBaseLinPS::MeqBaseLinPS (const MeqExpr& dft, MeqPointSource* source)
 : itsDFT    (dft),
@@ -130,4 +133,5 @@ std::string MeqBaseLinPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
index 4978e1f287cab7518e94e1717e6d91bf2541732d..562dbecd6ec66cb7925620de07bf301270faeec0 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqBaseLinPS.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqPointSource.h>
 #include <BBS/MNS/MeqDFTPS.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,6 @@ private:
 
 // @}
 
-}
-
+} // namespace BBS
+} // namespace LOFAR
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
index e99b93b68f26a19d2cde19f983cc7cd293906367..8f1914c457298cdde2eb94a06fdd3c9bfbffa7a9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.cc
@@ -32,8 +32,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDFTPS::MeqDFTPS (const MeqExpr& lmn, MeqStatUVW* uvw)
 : itsLMN (lmn),
@@ -130,4 +132,5 @@ std::string MeqDFTPS::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
index 057fafbf2f2c77b68f0604b1fe1d0f84d5b4905e..4cb817e02cd57386ea480ba960df572f051583f0 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDFTPS.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc b/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
index 14e2efa8e3ef84f8283155b35d5525d802d7ebdb..92de9acc84c15cabd6d29a6a17a59baae80f8488 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDiag.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqDiag.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDiag::MeqDiag(const MeqExpr& xx, const MeqExpr& yy)
 : itsXX(xx),
@@ -53,4 +56,5 @@ MeqJonesResult MeqDiag::getJResult(const MeqRequest& request)
   return res;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDiag.h b/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
index 61228b57629111d10ddcf978e12c7a3e8d4df376..744c75c6f2b5a1fe065e40ac54dd1bba7667d526 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDiag.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
index e32087abd1e3b820fbce1e971d3f7be5f665f351..5191166540c6d779261db12b3494a8ccbadf81a0 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDomain.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqDomain.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqDomain::MeqDomain()
 : itsStartX (0),
@@ -68,4 +71,5 @@ std::ostream& operator<< (std::ostream& os, const MeqDomain& domain)
   return os;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqDomain.h b/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
index 8ba9521ccd3199f867cc87cc4b68f72908b6c414..7d04381ff4a1bd46033642d25910c6860f78c57d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqDomain.h
@@ -29,7 +29,10 @@
 #include <iosfwd>
 #include <ParmDB/ParmDomain.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -85,6 +88,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
index d3e4a879c9640e5545fc84c2d1276ed1c197e075..428b62eac3737d57be504fce953be67a813e47f3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
@@ -31,7 +31,10 @@
 #include <iomanip>
 #include <algorithm>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqExprRep::MeqExprRep()
   : itsCount    (0),
@@ -373,4 +376,5 @@ std::string MeqExprAPToComplex::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
index ba266cfbd8f3ef01854d16ba0d54ba0d38bfcb4b..7cbe0f89470248de94c4b114048380be65878b74 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
@@ -38,7 +38,11 @@
     #include <iostream>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+
 //# Forward Declarations.
 class MeqExpr;
 
@@ -276,6 +280,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
index 8c23e31cb34fd51a4053df2e057469d27ec160df..839db3623878b905391dd31bb44bc7578cd7f137 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.cc
@@ -32,8 +32,11 @@
 
 using namespace casa;
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::operator<<;
 
 MeqFunklet::MeqFunklet()
 : itsNrScid (0)
@@ -188,4 +191,5 @@ void MeqFunklet::update (const vector<double>& values)
   }
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
index d798f6708fffcae69df0396ee3520cbcd50d96c3..11b7b8666eb19161845fe1a92bd35a3ccc49dc05 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqFunklet.h
@@ -32,7 +32,10 @@
 #include <ParmDB/ParmValue.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -158,6 +161,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
index 4b506524626d49f9e2eded2e9cf0591ab3901f39..3e360e4c545c863fc17d842381153a35d75380c4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqGaussSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqGaussSource::MeqGaussSource (const string& name,
 				const string& groupName,
@@ -46,4 +49,5 @@ MeqGaussSource::MeqGaussSource (const string& name,
 MeqGaussSource::~MeqGaussSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
index 024f1c9cb9010e2bcf654e52e4b882be8ab0122f..5577212c35dfac17cd5165d07c74371df7e44dc9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqGaussSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
index e858014df1f4b6a5c527fab6e0c5baaeddc69338..b75c337d590bf264f410b4806c865079ec2a9554 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesCMul2::MeqJonesCMul2 (const MeqJonesExpr& left,
 			      const MeqJonesExpr& right)
@@ -151,4 +154,5 @@ MeqJonesResult MeqJonesCMul2::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
index 82e6ecf60a3f8ecee3727d494d7735687e771fa8..f063edd0f5bff37c5d05856f356d21f4930eb1e7 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
index 2b11de23aa19db7cc953fd088c39cf1cd7fe9d73..fa5079133f593402371842e91f91491b602840ed 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.cc
@@ -35,10 +35,12 @@
 #include <xmmintrin.h>
 #endif
 
-
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesCMul3::MeqJonesCMul3 (const MeqJonesExpr& left,
                   const MeqJonesExpr& mid,
@@ -617,4 +619,5 @@ std::string MeqJonesCMul3::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
index 3641556e8d3b72b65e52f4decae2508027445e3f..557768318c81dc1c24f4a68e8f951ba8bca6fa8c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesCMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -62,6 +65,8 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
index 0ede1819975f26f4517550a2d3d47b261dd3768a..d906012aeaae6550c1b6378bdd029e10af2dbc8b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.cc
@@ -26,7 +26,10 @@
 #include <Common/LofarLogger.h>
 //#include <Common/Timer.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesExprRep::~MeqJonesExprRep()
 {
@@ -42,4 +45,5 @@ void MeqJonesExprRep::precalculate (const MeqRequest& request)
   itsReqId = request.getId();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
index bd061e66871dab655823b7a8b66adbf601ee1864..ee9717907d1bd0f7704a295995de9554b57fea51 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesExpr.h
@@ -33,7 +33,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -127,6 +130,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
index db330b20d262543d16cd2180d1a5483951c49160..f40ce8ef535e85be2ad3cb5b73c96fd562690eb6 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.cc
@@ -40,7 +40,10 @@
 //
 // Also note that conj(AB) = conj(B)conj(A)
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesInvert::~MeqJonesInvert()
 {}
@@ -102,4 +105,5 @@ MeqJonesResult MeqJonesInvert::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
index d83615e1481e97e9d5e14dd48207bdb65cf550ed..b086acc9584d4c8a5469b5226f5b3881497d04fb 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesInvert.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
index 5d03a476713a48e55c79612c60afaac66ad289b3..455a86a9e74e6550c4941ca1fcb6a8345b30aea9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqJonesMMap.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqJonesMMap::MeqJonesMMap (const MMapMSInfo& info, int blnr)
     : itsInfo     (&info),
@@ -137,4 +140,6 @@ namespace LOFAR {
       }
     }
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
index eca44a5791d445942e9fdf594690deeef1d65118..f6ad6d725210d0330bccbe501c8c54e64ebfdbe5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMMap.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MMapMSInfo.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -59,6 +62,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
index d95e24d81f437f3364709a91da3218884c163a98..bdfde50002920e895898c4a55502718003704fbd 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesMul2::MeqJonesMul2 (const MeqJonesExpr& left,
 			    const MeqJonesExpr& right)
@@ -151,4 +154,5 @@ MeqJonesResult MeqJonesMul2::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
index 0e47f081304fb7e3a7cb27157488f7bef8412637..cecdb0bae2dd4d1b51ae4c816734019b07e35856 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul2.h
@@ -28,7 +28,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -54,6 +57,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
index b6b0fd457478c840ec79b684d970fcc05043b728..b002479b40886ca65adae48a535a544b736875b0 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesMul3::MeqJonesMul3 (const MeqJonesExpr& left,
 			    const MeqJonesExpr& mid,
@@ -196,4 +199,5 @@ MeqJonesResult MeqJonesMul3::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
index 16589806c03b39c1d553c745576f9144ccea4ea2..5f51d6c1d03029f96b64379ece2ab0cfaa412c6a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesMul3.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqJonesExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -58,6 +61,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
index 54f36b4fb0a96de3b29b18ce6da61d2a1d3fcb9d..9a14dc5abb2a5e3f1c18ee6ef97c15facf56865c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.cc
@@ -25,7 +25,10 @@
 #include <BBS/MNS/MeqJonesNode.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqJonesNode::MeqJonesNode (const MeqExpr& elem11, const MeqExpr& elem12,
                 const MeqExpr& elem21, const MeqExpr& elem22)
@@ -62,4 +65,5 @@ std::string MeqJonesNode::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
index 502af4476763f78887e693cd6a8a94ec43edb96e..85739fef4d5fa3fe74aec8d1856bf4742c3165dd 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesNode.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
index c12eb0989ea8f44de09314961884f890bb5bc162..8aadacee203450fc08b481891c662526a1cc2bfa 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesResult.h
@@ -32,7 +32,10 @@
 // This class represents the result in a Jones matrix of a domain for
 // which the expressions have been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
index 86d6a3e93a84039d72f01743d85bdade35f1d683..dee25c651cb49281226f2ec9c6c741413d139a5c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqJonesResult.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqJonesSum::MeqJonesSum (const std::vector<MeqJonesExpr>& expr)
     : itsExpr (expr)
@@ -113,4 +116,6 @@ std::string MeqJonesSum::getLabel()
     return std::string("MeqJonesSum\\nSum of Jones matrices");
 }
 #endif
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
index fc414d04de14559b70dc4c8cc607cab333506038..c96509ca2c2c59bb75fcb265baf9ae9bfc74448d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqJonesSum.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <vector>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -60,6 +63,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc b/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
index d686616ef12def0359d93dc8e56cb8bd9bdead41..4fa3eb2e55c71eb02b005149168f0d9af72cf3cc 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMN.cc
@@ -30,7 +30,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqLMN::MeqLMN (MeqSource* source)
 : itsSource    (source)
@@ -209,4 +212,5 @@ std::string MeqLMN::getLabel()
 }
 #endif
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMN.h b/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
index b2ba596ab341e1228602e7434b15b9ac6e35f1a9..119ff89392eb58c84ae911649129ff4dedc7d663 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMN.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -72,6 +75,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc b/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
index 2e21d3ae288a93dc63a8e2f490db83e8f16dcb56..e8750d6836e901dfd189573c6f1d42f7355bd606 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqLMNAn.cc
@@ -31,7 +31,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqLMN::MeqLMN (MeqPointSource* source)
 : itsSource    (source)
@@ -140,4 +143,5 @@ MeqResultVec MeqLMN::getResultVec (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
index fb56173ce91f89f90bd04e37a0cfbc999840af5e..bc49be8f88fcd7236e247940e042282d53ed76d3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.cc
@@ -35,7 +35,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrix::MeqMatrix (double value)
 {
@@ -445,8 +448,8 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& bs, MeqMatrix& vec)
   return bs;
 }
 
-}
-
+} // namespace BBS
+} // namespace LOFAR
 
 //# Instantiate the AIPS++ templates needed for Matrix<dcomplex>
 //# This is needed because dcomplex is usually not the same as casa::DComplex.
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
index ee0d40de636b9cf43fb04df16837271f166b42e8..f57291e271a5077c5ae2cfe63eb11b6424e3ee93 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrix.h
@@ -30,17 +30,26 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 
 //# Forward Declarations
-namespace casa {
-template<class T> class Matrix;
+namespace casa
+{
+    template<class T> class Matrix;
 }
 
-namespace LOFAR {
-class BlobOStream;
-class BlobIStream;
-class MeqMatrixTmp;
+namespace LOFAR
+{
+    class BlobOStream;
+    class BlobIStream;
+    
+    namespace BBS
+    {
+        class MeqMatrixTmp;
+    }
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -224,6 +233,8 @@ LOFAR::BlobIStream& operator>> (LOFAR::BlobIStream& os, MeqMatrix& vec);
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
+
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
index de516f6e026590d42550ea0c49641cf846f30766..4739b80aadffeda466e0aeef5a58f8e9be01800b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.cc
@@ -41,7 +41,10 @@
 #include <xmmintrin.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // Allocation will be done from the pool containing matrices of poolNElements
 // or less elements.
@@ -1015,4 +1018,5 @@ void MeqMatrixComplexArr::fillRowWithProducts(dcomplex v0, dcomplex factor,
 #endif
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
index a65e835eaebd7c251b736931bb9d480f7088af14..c6ab7d93ec39718c1058a41ab893b7a3f19c5934 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexArr.h
@@ -31,7 +31,10 @@
 #include <Common/lofar_complex.h>
 #include <Common/lofar_stack.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -132,6 +135,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
index f97e7856297c7a8409049725bc66681f8b385758..77e7c797181ee79293eae2d894a419a1b1d25bed 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.cc
@@ -33,7 +33,10 @@
 #include <Common/Timer.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixComplexSca::~MeqMatrixComplexSca()
 {}
@@ -305,4 +308,5 @@ MeqMatrixRep* MeqMatrixComplexSca::sum()
   return this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
index 501e6a3d2784db52e3687676f333a89b30fb6098..e6ba3187119c503b7db1decbe83073be1f4c2692 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixComplexSca.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqMatrixRep.h>
 #include <Common/lofar_complex.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -101,6 +104,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
index 664130cc2962f999df3ad43f1b0867c578099c3e..5c373faece82bbdcc7945222b530e3d5d9d88c29 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.cc
@@ -43,7 +43,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // Allocation will be done from the pool containing matrices of poolNElements
 // or less elements.
@@ -887,4 +890,5 @@ MeqMatrixRep* MeqMatrixRealArr::sum()
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
index 6e114a4c9b77eec3e235cc097e47e81faff38de7..62673f65dc2b03e1d43c5f61257539222400e1a3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealArr.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -129,6 +132,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
index ea1ac6018d97130d0c693eb6baa27d2dcda947f6..0b5791c94c72368afb4e400a00efa85ad553ba52 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixRealSca::~MeqMatrixRealSca()
 {}
@@ -257,4 +260,5 @@ MeqMatrixRep* MeqMatrixRealSca::sum()
   return this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
index 3c1a8dfa65b0bc2f6b049c11dcc6ff73d418d8f1..7a4f7c09e2d22b7e4f19792239636bed86fb7ff0 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRealSca.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqMatrixRep.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -109,6 +112,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
index 8a2e05b111269d81276e0b01593012b2057d90fd..10bf4274d045bb886b6fa66c0b7804cc960293d2 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.cc
@@ -26,7 +26,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqMatrixRep::~MeqMatrixRep()
@@ -73,4 +76,5 @@ void MeqMatrixRep::fillRowWithProducts(dcomplex, dcomplex, int)
   throw (AipsError ("MeqMatrixRep::fillRowWithProducts not implemented"));
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.h
index f5a6eec2ceecf782252bdf4eb335a5a280fea439..a970b04c9662dbf76e2208e1506c44734dc3dd39 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixRep.h
@@ -28,14 +28,19 @@
 
 //# Includes
 #include <Common/lofar_complex.h>
-#include <Common/lofar_iostream.h>
+//#include <Common/lofar_iostream.h>
+#include <iostream>
 #include <casa/iosfwd.h>
 
 #if defined _OPENMP
 #include <omp.h>
 #endif
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
+using LOFAR::dcomplex;
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -88,7 +93,7 @@ public:
   int nelements() const
     { return itsLength; }
 
-  virtual void show (ostream& os) const = 0;
+  virtual void show (std::ostream& os) const = 0;
 
   bool isComplex() const
     { return (type & 2) != 0; }
@@ -172,6 +177,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
index 3008190724f5c95fbd46becff2217f595fb45b8f..ace3100a3de660290c13a7c33b2924fea23530e9 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/MeqMatrixComplexArr.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqMatrixTmp::MeqMatrixTmp (double value, int nx, int ny, bool init)
 {
@@ -121,4 +124,5 @@ MeqMatrixTmp sum (const MeqMatrixTmp& arg)
   return arg.itsRep->sum();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
index 4285899b481c9e1e38c8688bdac1cc48d19610af..88ebadaa0a9df6f9ea1cd31b23a560caedf52f42 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqMatrixTmp.h
@@ -33,7 +33,10 @@
 #include <BBS/MNS/MeqMatrixComplexSca.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -176,6 +179,7 @@ inline ostream& operator<< (ostream& os, const MeqMatrixTmp& vec)
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
index 4ff851c5d2211e768d18acf2e7382f5368cf3de9..aa171beaf91b7dd8f0b77670a1974d00a987f0b5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.cc
@@ -25,7 +25,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqParm::MeqParm (const string& name)
@@ -105,4 +108,5 @@ void MeqParmGroup::clear()
   itsParms.clear();
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParm.h b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
index 16c16d41d73c8aa7e937da31a4ab9fc2307788b6..6b32358fc1da1c5aec2ea914e2ef903088d020ec 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParm.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParm.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_string.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -211,6 +214,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
index 45f6b20581b12451a39d30d8aa4d6a560a7a2af2..b9fefc508dde124b96115baff533083cc7198d0a 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqParmFunklet.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqParmExpr::MeqParmExpr (const string& expr, MeqParmGroup& group,
 			    ParmDB::ParmDB* table)
@@ -69,4 +72,5 @@ namespace LOFAR {
     return *v[0] * *v[1];
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
index f0c59738cbf3dcb13319292ed67c80f9e4e6ee84..42cd4882360ae758c62d7e4e4c68bd3ee9f2fe90 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <ParmDB/ParmDB.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -64,6 +67,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
index c34d3594d55a51fe878ba99d46c807449efea795..e325ead049aa653596f306d70c85991dce58395b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.cc
@@ -35,7 +35,7 @@ using namespace std;
 
 // Make sorting vector<MPFHolder> possible (on domain).
 // So define operator< for it.
-bool less_mp (LOFAR::MeqFunklet* x, LOFAR::MeqFunklet* y)
+bool less_mp (LOFAR::BBS::MeqFunklet* x, LOFAR::BBS::MeqFunklet* y)
 {
   return (x->domain().startY() < y->domain().startY()  ||
 	  (x->domain().startY() == y->domain().startY()  &&
@@ -43,7 +43,10 @@ bool less_mp (LOFAR::MeqFunklet* x, LOFAR::MeqFunklet* y)
 }
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqParmFunklet::MeqParmFunklet (const string& name, ParmDB::ParmDB* table)
 : MeqParm    (name),
@@ -398,4 +401,5 @@ void MeqParmFunklet::save()
   }
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
index 5bcf0e0cf4b07454f83a449b125a3fd60afa3f6c..9acfc1badf0a87f2d9c67675287848c0634459bf 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmFunklet.h
@@ -37,7 +37,10 @@ namespace LOFAR {
   class ParmData;
 }
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -131,6 +134,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
index 8c15221574c7981bf10c2b386c2e5658d711bd53..e44f88d72c25e166ae13c35dd00076a733f6a6db 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.cc
@@ -27,7 +27,10 @@
 #include <Common/LofarLogger.h>
 #include <cmath>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqParmSingle::MeqParmSingle (const string& name, double value)
 : MeqParm  (name),
@@ -44,4 +47,5 @@ MeqResult MeqParmSingle::getResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
index 3d63111917e220bf0f51daf1afab4a4469e31002..4dd865d50621469e9e344de362abfdf9ddfd96af 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqParmSingle.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqParm.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -57,6 +60,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
index e01b05e751d6534c81d11163cf3dacdf39ef5159..6ca89c61fb7cf9d029a06ee9106a31c7d58b4e9b 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.cc
@@ -36,7 +36,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPhaseRef::MeqPhaseRef (const MDirection& phaseRef, double startTime)
 : itsStartTime (startTime)
@@ -94,4 +97,5 @@ MeqPhaseRef::MeqPhaseRef (const MDirection& phaseRef, double startTime)
 //  cout << "ep3 " << ep3 << endl;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.h b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.h
index 785a14f14a34c19a91446f34ff89c6fb7046fda6..f4dd7e3f095afff6a549198cdb0c2598b2cf023f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPhaseRef.h
@@ -30,7 +30,10 @@
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MPosition.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -78,6 +81,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
index da9387912622773ddd7053b28eb671882f9e3ee9..10c13727d0c6d8e88e0649886753c96ccdfc1a43 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqPointSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPointSource::MeqPointSource (const string& name,
                 const string& groupName,
@@ -41,4 +44,5 @@ MeqPointSource::MeqPointSource (const string& name,
 MeqPointSource::~MeqPointSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
index 2786e324429886913513e3c75908b7b9d837afed..95420d39a5930dc4ecaf43d101600697e9724ab5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPointSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqSource.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
index 9ee18fbc660be9c056ffcdfd25749daa57cac416..9af88a7c2c99449f98dc8e3938a80b805b4b4ec5 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.cc
@@ -30,7 +30,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqPolc::MeqPolc (const ParmDB::ParmValue& pvalue)
@@ -311,4 +314,5 @@ MeqResult MeqPolc::getAnResult (const MeqRequest& request,
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
index 7b3c8d65ad9ae7967fbaa142b44e27346afd757b..e98179bb1b0b972f6907e0870ed21e487e020884 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolc.h
@@ -29,7 +29,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -68,6 +71,7 @@ public:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
index d38e5f50dbb5fc8f743cf7f22705f69f4286e871..0efa72090e32e7d92c73b1639a0a5af49cdf77c4 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcAn.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqPolc::~MeqPolc()
@@ -178,4 +181,5 @@ MeqResult MeqPolc::getResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
index 07bb81c7d3b930e8400e12334f2c949041d8579d..5f094fb4d435705f68d8360a568db55640e4209e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.cc
@@ -31,7 +31,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqPolcLog::MeqPolcLog(const ParmDB::ParmValue& pvalue)
   : MeqFunklet(pvalue)
@@ -332,4 +335,5 @@ MeqResult MeqPolcLog::getAnResult(const MeqRequest& request, int nrpert, int per
   return getResult(request, nrpert, pertInx);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
index 4c43d914004d9a3e0e79e488cafce1e3a4c5a2b5..d32029ce32d5b07c0e207e0786c7bb1915c8db9d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqPolcLog.h
@@ -57,7 +57,10 @@
 //# Includes
 #include <BBS/MNS/MeqFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -103,6 +106,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc b/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
index 08b64a8dff78ae80edb12b2420d386d0e8340284..fc61d45e5f8396fb4342ad2d0de8e2f12defb597 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqRequest.cc
@@ -25,7 +25,10 @@
 #include <Common/LofarLogger.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqRequestId MeqRequest::theirRequestId = 0;
 
@@ -134,4 +137,5 @@ void MeqRequest::setDomain (const MeqDomain& domain, int nx,
   itsYP = &itsY[0];
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqRequest.h b/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
index a3328afa8124b3c3e7907d75749d75904105d873..ca2204b594d0ef678dca4e21e34e3dc2f6b695d1 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqRequest.h
@@ -32,7 +32,10 @@
 #include <BBS/MNS/MeqMatrix.h>
 #include <Common/lofar_vector.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -134,6 +137,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqRequestId.h b/CEP/BB/BBSKernel/src/MNS/MeqRequestId.h
index b134628e3af22b203ac8b309ff714d28a267571f..9dc30d3688e33e395876ca2921a9dc2e31cbe2da 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqRequestId.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqRequestId.h
@@ -26,7 +26,10 @@
 // \file
 // Class holding an interferometer
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -37,6 +40,7 @@ namespace LOFAR {
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResult.cc b/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
index d468c1f10c36db98202d71f23be543f522d01b8c..577bdb55fc9e79d04fdb6afc76d73c997701aa5f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResult.cc
@@ -26,7 +26,10 @@
 #include <BBS/MNS/Pool.h>
 #include <BBS/MNS/MeqParmFunklet.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 Pool<MeqResultRep> MeqResultRep::theirPool;
 #pragma omp threadprivate(MeqResultRep::theirPool)
@@ -126,4 +129,5 @@ MeqResult& MeqResult::operator= (const MeqResult& that)
   return *this;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResult.h b/CEP/BB/BBSKernel/src/MNS/MeqResult.h
index 2257609d0735c4bea11cc501fa286c7ac70edd6d..a7e40feabdcacd9c864134c39d87b7348d1549db 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResult.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResult.h
@@ -36,7 +36,10 @@
 // This class represents a result of a domain for which an expression
 // has been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmFunklet;
@@ -213,6 +216,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
index 0b2bc3e278e11e4754b5f7c6fcf45fafe7cdb898..271d14ec30b599eba6fee6fbb6cfd3f124f3a249 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.cc
@@ -26,7 +26,10 @@
 // This class represents the result in a Jones matrix of a domain for
 // which the expressions have been evaluated.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
   MeqResultVecRep::MeqResultVecRep (int size, int nspid)
   : itsCount (0)
@@ -73,4 +76,5 @@ namespace LOFAR {
     return *this;
   }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
index 469448a9dd5b7bf625a327f7e2e4c1ce3bf073ee..7173b25965aaebefc8dc6e54860f2443c7dfde96 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqResultVec.h
@@ -34,7 +34,10 @@
 // This class represents multiple results.
 // It is faster than a vector<MeqResult>.
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -110,6 +113,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSource.cc b/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
index a6f5755852b0c3e5f6771131c3c1e0b168a433c2..03dc3a57097ba3a01693e76ae5e1477e361aedab 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSource.cc
@@ -24,7 +24,10 @@
 #include <BBS/MNS/MeqSource.h>
 
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 
 MeqSource::MeqSource (const string& name, const string& groupName,
@@ -39,4 +42,5 @@ MeqSource::MeqSource (const string& name, const string& groupName,
 MeqSource::~MeqSource()
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSource.h b/CEP/BB/BBSKernel/src/MNS/MeqSource.h
index 420f57ad9994928fa079183788c62af613fb11cb..d4a9d643384529f3ebda33b8d854923339a4fdde 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSource.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSource.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -76,6 +79,7 @@ protected:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
index e3f4eab7922b8615c80201900eb06f53ea07586c..e24731ee25082133c6d07e933b032aeb27fd9e33 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.cc
@@ -33,7 +33,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqSourceList::MeqSourceList (ParmDB::ParmDB& parmTable, MeqParmGroup& group)
 {
@@ -158,4 +161,5 @@ void MeqSourceList::add (MeqSource* source)
   group.push_back (idx);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
index 69f8b45cab5c34ce6f1d450baea2b4c1547a0383..cb59574835dc0764a6e608a0706a0ae69b8fd2cb 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqSourceList.h
@@ -32,7 +32,10 @@
 #include <Common/lofar_vector.h>
 #include <Common/lofar_map.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 //# Forward Declarations
 class MeqParmGroup;
@@ -88,6 +91,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
index cfa107ad5efb66865b7e4c064e6cfd9c2860c811..29b6e5891457c00397fa9688e8934b1a2d64f77c 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.cc
@@ -29,7 +29,10 @@
 #include <BBS/MNS/MeqMatrix.h>
 #include <BBS/MNS/MeqMatrixTmp.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStatExpr::MeqStatExpr (const MeqExpr& faradayRotation,
 			  const MeqExpr& dipoleRotation,
@@ -191,4 +194,5 @@ MeqJonesResult MeqStatExpr::getJResult (const MeqRequest& request)
   return result;
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
index 3bbad743d6f031a0c142923cc9230952b368dc03..5a3cb3f576b61471eb1066a7e742eea3fa97d73e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatExpr.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqJonesExpr.h>
 #include <BBS/MNS/MeqExpr.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
index 82d5ca9a0a5b54cfe30260dbb459607fcf5de77f..3ec6326fb2d52f9972a164bddfa8614d3479c59d 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.cc
@@ -37,7 +37,10 @@
 
 using namespace casa;
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStatUVW::MeqStatUVW (MeqStation* station,
             const MeqPhaseRef* phaseRef)
@@ -140,4 +143,5 @@ void MeqStatUVW::set (double time, double u, double v, double w)
   itsUVW[MeqTime(time)] = MeqUVW(u,v,w);
 }
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
index 11e082372669bfa75e0bbc0642b85fdfc8acbf75..bfdfdc4d80a787b40ca1b902328d33cc699729ea 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStatUVW.h
@@ -33,7 +33,10 @@
 #include <Common/lofar_map.h>
 #include <measures/Measures/MeasFrame.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -105,6 +108,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStation.cc b/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
index 5de156a3e43057ee76d429e771311f929a39751b..7763bb92ad8c9140dad8f4706a8a02c4d91b8ff3 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStation.cc
@@ -23,7 +23,10 @@
 #include <lofar_config.h>
 #include <BBS/MNS/MeqStation.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 MeqStation::MeqStation()
 {}
@@ -36,4 +39,5 @@ MeqStation::MeqStation (MeqExpr posX, MeqExpr posY, MeqExpr posZ,
   itsName (name)
 {}
 
-}
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqStation.h b/CEP/BB/BBSKernel/src/MNS/MeqStation.h
index e161fc3122e16188f9219949f17ac3a60963eb69..f984aa574b9f9332d094c28e7c90e566963296ec 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqStation.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqStation.h
@@ -30,7 +30,10 @@
 #include <BBS/MNS/MeqExpr.h>
 #include <Common/lofar_string.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // \ingroup BBS
 // \addtogroup MNS
@@ -66,6 +69,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
index bccfa4676dcf8087a1214bf54937b551bc7459dc..a0a294f4ad2568f25c2aaf4b393957fcc8ae6b15 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.cc
@@ -36,6 +36,9 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS
+{
+
   MeqTabular::MeqTabular (const ParmDB::ParmValue& pvalue)
   : MeqFunklet (pvalue)
   {
@@ -236,4 +239,6 @@ namespace LOFAR
   {
     return getResult (request, nrpert, pertInx);
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
index 64fb8a862ace772e4f52a807e68be2cc9c16e8f9..d26d2bb3f8af4385dbd6ce240d12b8885f2fd400 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqTabular.h
@@ -31,7 +31,9 @@
 
 namespace LOFAR
 {
-
+namespace BBS
+{
+ 
 // \ingroup BBS
 // \addtogroup MNS
 // @{
@@ -64,6 +66,7 @@ namespace LOFAR
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MNS/Pool.h b/CEP/BB/BBSKernel/src/MNS/Pool.h
index 859b1bb8abfc0b707c502944bf120d7e7a103904..a28b3632b0b524f3359d4e0b12df042488634f6b 100644
--- a/CEP/BB/BBSKernel/src/MNS/Pool.h
+++ b/CEP/BB/BBSKernel/src/MNS/Pool.h
@@ -4,7 +4,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS
+{
 
 // The Pool class is a very fast, stack-based allocator where objects can
 // be temporarily stored that would otherwise be deleted and allocated again.
@@ -51,6 +54,7 @@ template <class T> class Pool {
     T *top;
 };
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/MSDataArray.h b/CEP/BB/BBSKernel/src/MSDataArray.h
index 4ad670a3ff09e267a940656c69085b8172bab810..b2bd4473ae7614d373aaaa4b3a4e76024ab877d1 100644
--- a/CEP/BB/BBSKernel/src/MSDataArray.h
+++ b/CEP/BB/BBSKernel/src/MSDataArray.h
@@ -29,8 +29,11 @@
 
 //# Includes
 
-namespace LOFAR {
-
+namespace LOFAR
+{
+namespace BBS
+{
+ 
 // \ingroup BBS
 // @{
 
@@ -56,6 +59,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/ParmData.cc b/CEP/BB/BBSKernel/src/ParmData.cc
index 325866c647f23e751aa20dbf6a6e86aec046c184..8555ed51778454909a97d194f5e41f0022559a62 100644
--- a/CEP/BB/BBSKernel/src/ParmData.cc
+++ b/CEP/BB/BBSKernel/src/ParmData.cc
@@ -27,7 +27,11 @@
 #include <Common/VectorUtil.h>
 #include <Common/LofarLogger.h>
 
-namespace LOFAR {
+namespace LOFAR
+{
+namespace BBS 
+{
+  using LOFAR::operator<<;
 
   ParmData::ParmData()
     : itsDBSeqNr   (-1),
@@ -237,4 +241,6 @@ namespace LOFAR {
       os << ' ' << itsDomains[i] << " [" << itsDomainIndices[i] << ']' << endl;
     }
   }
-}
+
+} // namespace BBS
+} // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/ParmData.h b/CEP/BB/BBSKernel/src/ParmData.h
index b634095d82d2e4afa823489bdd04e819fa17e85c..1de1de7b2ca08ec6729187121d7f8276bd1f8599 100644
--- a/CEP/BB/BBSKernel/src/ParmData.h
+++ b/CEP/BB/BBSKernel/src/ParmData.h
@@ -35,13 +35,16 @@
 
 namespace LOFAR {
 
-// \addtogroup BBS
-// @{
-
 //# Forward Declarations.
 class BlobOStream;
 class BlobIStream;
 
+namespace BBS
+{
+
+// \addtogroup BBS
+// @{
+
 class ParmData
 {
 public:
@@ -187,6 +190,7 @@ private:
 
 // @}
 
-}
+} // namespace BBS
+} // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/ParmWriter.cc b/CEP/BB/BBSKernel/src/ParmWriter.cc
index 010e55a6392fdf286edea0e51b1af41459f16080..ac180f6fc2eb2847cafe6c541c71ac1f3161487e 100644
--- a/CEP/BB/BBSKernel/src/ParmWriter.cc
+++ b/CEP/BB/BBSKernel/src/ParmWriter.cc
@@ -37,6 +37,9 @@ using namespace std;
 
 namespace LOFAR
 {
+namespace BBS 
+{
+
 ParmWriter::ParmWriter()
 {}
 
@@ -115,4 +118,5 @@ void ParmWriter::setCoeff (ParmDB::ParmValueRep& pval, const MeqMatrix& coeff)
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/ParmWriter.h b/CEP/BB/BBSKernel/src/ParmWriter.h
index 2112fb05f576bf30ba7bdc350015acbd76d41bfe..2b249bd2351c273990e6843454d3e1a35fb7747e 100644
--- a/CEP/BB/BBSKernel/src/ParmWriter.h
+++ b/CEP/BB/BBSKernel/src/ParmWriter.h
@@ -31,17 +31,29 @@
 //# Includes
 #include <Common/lofar_map.h>
 
+//# Forward Declarations
 namespace LOFAR
-{
-  // \addtogroup BBS
-  // @{
-  //# Forward Declarations
-  class ParmDataInfo;
-  class MeqMatrix;
-  namespace ParmDB {
+{  
+  namespace ParmDB
+  {
     class ParmValueRep;
   }
 
+  namespace BBS
+  {
+    class ParmDataInfo;
+    class MeqMatrix;
+  }
+}
+
+
+namespace LOFAR
+{
+namespace BBS
+{
+  
+  // \addtogroup BBS
+  // @{
 
   // Description of class.
   class ParmWriter
@@ -62,6 +74,7 @@ namespace LOFAR
   };
 
   // @}
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/Prediffer.cc b/CEP/BB/BBSKernel/src/Prediffer.cc
index d399931c13c330eccc86214d2f3874c82da1054f..ac4ae88c24e978c4d181fdae2d6fd8dc2d91df31 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.cc
+++ b/CEP/BB/BBSKernel/src/Prediffer.cc
@@ -116,6 +116,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 Prediffer::Prediffer(const string& msName,
              const ParmDB::ParmDBMeta& meqPdm,
@@ -2203,4 +2205,5 @@ void Prediffer::showSettings() const
   cout << endl;
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/Prediffer.h b/CEP/BB/BBSKernel/src/Prediffer.h
index 18a2c38c8df8641839e8ba9f05e5c9701eb28889..6d2f86a7fc6106b13999f883411b8f47fb337ea9 100644
--- a/CEP/BB/BBSKernel/src/Prediffer.h
+++ b/CEP/BB/BBSKernel/src/Prediffer.h
@@ -62,6 +62,8 @@ namespace casa {
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -438,6 +440,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/Quality.cc b/CEP/BB/BBSKernel/src/Quality.cc
index 1ef85acf2a5e87d43313264b1d0dc59f7ce5d932..0e1d2f8812d283f061b153f2052f61e8c412759f 100644
--- a/CEP/BB/BBSKernel/src/Quality.cc
+++ b/CEP/BB/BBSKernel/src/Quality.cc
@@ -26,6 +26,8 @@
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 Quality::Quality()
 {
@@ -51,4 +53,5 @@ void Quality::show(ostream& os) const
   os << "itsChi    : " <<  itsChi     << endl;
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/Quality.h b/CEP/BB/BBSKernel/src/Quality.h
index c6398dd5df72f1de7f3562542219433a1cc12f50..fb5281387c1e1ee2f115f4feece84bc50db6a4db 100644
--- a/CEP/BB/BBSKernel/src/Quality.h
+++ b/CEP/BB/BBSKernel/src/Quality.h
@@ -31,6 +31,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -62,6 +64,7 @@ inline ostream& operator<< (ostream& os, const Quality& qual)
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/SolveProp.h b/CEP/BB/BBSKernel/src/SolveProp.h
index 3875b0478b11a67191228bee39be02939fc06779..365315b7a2289ac60601178215931da88f58cc7f 100644
--- a/CEP/BB/BBSKernel/src/SolveProp.h
+++ b/CEP/BB/BBSKernel/src/SolveProp.h
@@ -32,6 +32,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -118,6 +120,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/Solver.cc b/CEP/BB/BBSKernel/src/Solver.cc
index 7b87ef4bd10619d30d2648bec3cf4a3ddcaf14c1..729eb4566b8d64e770fbd30cf0922ce2fc0ce697 100644
--- a/CEP/BB/BBSKernel/src/Solver.cc
+++ b/CEP/BB/BBSKernel/src/Solver.cc
@@ -42,6 +42,9 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
+using LOFAR::operator<<;
 
 Solver::Solver ()
 : itsDoSet  (true)
@@ -58,7 +61,7 @@ void Solver::solve (bool useSVD)
 {
   LOG_INFO_STR( "solve using file ");
   ASSERT (!itsDoSet);
-  BBSTest::ScopedTimer timer("S:solver");
+  //BBSTest::ScopedTimer timer("S:solver");
   vector<ParmData>& globalParms = itsParmInfo.parms();
   for (uint i=0; i<itsFitters.size(); ++i) {
     FitterData& fitObj = itsFitters[i];
@@ -322,10 +325,12 @@ void Solver::show (ostream& os)
   }
   os << "Solver ParmInfo: " << endl;
   itsParmInfo.show (os);
+  
   os << "Solver Fitter Values:" << endl;
   for (uint i=0; i<itsFitters.size(); ++i) {
     os << ' ' << itsFitters[i].solvableValues << endl;
   }
+  
   os << "Solver PredInfo:" << endl;
   for (uint i=0; i<itsPredInfo.size(); ++i) {
     os << " sdindices " << itsPredInfo[i].solveDomainIndices << endl;
@@ -337,6 +342,7 @@ void Solver::show (ostream& os)
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
 
 //# Instantiate the makeNorm template.
diff --git a/CEP/BB/BBSKernel/src/Solver.h b/CEP/BB/BBSKernel/src/Solver.h
index cb0f515215a4d397fd4a564e60cb23470e612970..eb8edda60b4549d0374167de1e9add2e9d8b217b 100644
--- a/CEP/BB/BBSKernel/src/Solver.h
+++ b/CEP/BB/BBSKernel/src/Solver.h
@@ -37,6 +37,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -113,10 +115,11 @@ private:
   {
     casa::LSQFit   fitter;
     Quality        quality;
-    vector<double> solvableValues;
+    std::vector<double> solvableValues;
     int            nused;
     int            nflagged;
   };
+  
   struct PredifferInfo
   {
     vector<int>           solveDomainIndices;
@@ -132,6 +135,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/StepProp.cc b/CEP/BB/BBSKernel/src/StepProp.cc
index 0b4aadb8f2ac1ab74ddcc4722b231af587ee81f8..2eef85953220a874b507f274ae6f5d91a77d5f51 100644
--- a/CEP/BB/BBSKernel/src/StepProp.cc
+++ b/CEP/BB/BBSKernel/src/StepProp.cc
@@ -27,6 +27,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 // \addtogroup BBS
 // @{
@@ -124,4 +126,5 @@ void StepProp::expandPatterns (const vector<string>& antNames) const
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/StepProp.h b/CEP/BB/BBSKernel/src/StepProp.h
index 2f06b145b4a453db8e0ed6fab1ef2dcaf1578655..9e0c7d5af7823e37044f58b8ac28a4561bc4b51f 100644
--- a/CEP/BB/BBSKernel/src/StepProp.h
+++ b/CEP/BB/BBSKernel/src/StepProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -139,6 +141,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/src/StrategyProp.cc b/CEP/BB/BBSKernel/src/StrategyProp.cc
index 2d69832a938dd1ada00d8eb7053324a85133deea..83efc149f3eec771c5635d8c95eaa0fc614d06a9 100644
--- a/CEP/BB/BBSKernel/src/StrategyProp.cc
+++ b/CEP/BB/BBSKernel/src/StrategyProp.cc
@@ -27,6 +27,8 @@ using namespace casa;
 
 namespace LOFAR
 {
+namespace BBS 
+{
 
 // \addtogroup BBS
 // @{
@@ -61,4 +63,5 @@ void StrategyProp::expandPatterns (const vector<string>& antNames) const
   }
 }
 
+} // namespace BBS
 } // namespace LOFAR
diff --git a/CEP/BB/BBSKernel/src/StrategyProp.h b/CEP/BB/BBSKernel/src/StrategyProp.h
index d12fa87be77542d452dd4ba6b91f25db02c9acd9..7c287617bc063b360e4a85b45ad9f6cfa28adcd1 100644
--- a/CEP/BB/BBSKernel/src/StrategyProp.h
+++ b/CEP/BB/BBSKernel/src/StrategyProp.h
@@ -33,6 +33,8 @@
 
 namespace LOFAR
 {
+namespace BBS
+{
 
 // \addtogroup BBS
 // @{
@@ -95,6 +97,7 @@ private:
 
 // @}
 
+} // namespace BBS
 } // namespace LOFAR
 
 #endif
diff --git a/CEP/BB/BBSKernel/test/tBandpass.run b/CEP/BB/BBSKernel/test/tBandpass.run
index 4ae03e2ba7abfc9a7a87f2284df78a26ce74b9d8..340683746753e339c2ed873b4a41ce90bb8a9bae 100755
--- a/CEP/BB/BBSKernel/test/tBandpass.run
+++ b/CEP/BB/BBSKernel/test/tBandpass.run
@@ -124,11 +124,11 @@ echo "---------------- END $1 ----------------"
 return $RETURN_VALUE
 }
 
-run_subtest clean_constant &&
-run_subtest clean_polc &&
-run_subtest clean_band_constant &&
-run_subtest noise_constant &&
-run_subtest noise_polc &&
-run_subtest noise_band_constant
+run_subtest clean_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest clean_polc > tBandpass_tmp.log 2>&1 &&
+run_subtest clean_band_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_constant > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_polc > tBandpass_tmp.log 2>&1 &&
+run_subtest noise_band_constant > tBandpass_tmp.log 2>&1
 
 exit $?
diff --git a/CEP/BB/BBSKernel/test/tBandpass.sh b/CEP/BB/BBSKernel/test/tBandpass.sh
index 6d17a6a92d6ad39704d711ef2e98ba84c02f5181..83a3b0bf03178ed528f633671467f765f364ded3 100755
--- a/CEP/BB/BBSKernel/test/tBandpass.sh
+++ b/CEP/BB/BBSKernel/test/tBandpass.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tBandpass > tBandpass.log 2>&1
+$lofar_sharedir/runtest.sh tBandpass > /dev/null 2>&1
diff --git a/CEP/BB/BBSKernel/test/tCorrect.cc b/CEP/BB/BBSKernel/test/tCorrect.cc
index 4905d04a47a0b58ddfa980488eb614ff694c628a..025f354d712dd3eaa4b6b60ea4d577c0adeb3a86 100644
--- a/CEP/BB/BBSKernel/test/tCorrect.cc
+++ b/CEP/BB/BBSKernel/test/tCorrect.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;
 
diff --git a/CEP/BB/BBSKernel/test/tFillRow.cc b/CEP/BB/BBSKernel/test/tFillRow.cc
index ee0424aec54708ca9f9a610f732f6e28b2e6d4dd..c36bb1d344e244888395af8e9ba3dac337267ca3 100644
--- a/CEP/BB/BBSKernel/test/tFillRow.cc
+++ b/CEP/BB/BBSKernel/test/tFillRow.cc
@@ -27,6 +27,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 void doTest (int nx, int ny)
diff --git a/CEP/BB/BBSKernel/test/tMSData.cc b/CEP/BB/BBSKernel/test/tMSData.cc
index 05f63b6bc3404901fd630f5c2e038aa0e875c258..286be9757d87065c9768374d71e7d93bcdf9138b 100644
--- a/CEP/BB/BBSKernel/test/tMSData.cc
+++ b/CEP/BB/BBSKernel/test/tMSData.cc
@@ -39,6 +39,7 @@
 #include <sstream>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 using namespace std;
 
diff --git a/CEP/BB/BBSKernel/test/tMeqParm.cc b/CEP/BB/BBSKernel/test/tMeqParm.cc
index 4e7c7db65ba3ad570df07c5e6ff955297e6530ec..fa0ecbbf7058da9cbdabb5170a40926d31bbd2b0 100644
--- a/CEP/BB/BBSKernel/test/tMeqParm.cc
+++ b/CEP/BB/BBSKernel/test/tMeqParm.cc
@@ -30,6 +30,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBSKernel/test/tMeqPolc.cc b/CEP/BB/BBSKernel/test/tMeqPolc.cc
index 5aa63d9e39d3c43880f82b77aab0f7cbaafae6a5..aca77884234bd6a8cf592ed4df08ee3b2487506e 100644
--- a/CEP/BB/BBSKernel/test/tMeqPolc.cc
+++ b/CEP/BB/BBSKernel/test/tMeqPolc.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBSKernel/test/tMeqPolcLog.cc b/CEP/BB/BBSKernel/test/tMeqPolcLog.cc
index 847f4a76a1e58d8bf7837fa9b2e34c6988a37e05..d98f6b3b36bb5783c7aeaa5df428f07b8415b2fc 100644
--- a/CEP/BB/BBSKernel/test/tMeqPolcLog.cc
+++ b/CEP/BB/BBSKernel/test/tMeqPolcLog.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 
diff --git a/CEP/BB/BBSKernel/test/tMeqTabular.cc b/CEP/BB/BBSKernel/test/tMeqTabular.cc
index 76a372de08235d670eb1ac362b1eaf8dda8d7e16..bab732fab0839bcb18562b97c2c36173bd226219 100644
--- a/CEP/BB/BBSKernel/test/tMeqTabular.cc
+++ b/CEP/BB/BBSKernel/test/tMeqTabular.cc
@@ -29,6 +29,7 @@
 #include <Common/LofarLogger.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace casa;
 
 #define EPSILON 1.0e-12
diff --git a/CEP/BB/BBSKernel/test/tParmMerge.cc b/CEP/BB/BBSKernel/test/tParmMerge.cc
index d091c244855c125732f08eeef354a7710fab0057..7f496a90a1c81bf513f5d3ef168a3ced6f91ebe8 100644
--- a/CEP/BB/BBSKernel/test/tParmMerge.cc
+++ b/CEP/BB/BBSKernel/test/tParmMerge.cc
@@ -31,6 +31,7 @@
 #include <Blob/BlobIStream.h>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 
@@ -81,7 +82,7 @@ void doIt1sd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains, nrpert, nrscids);
     if (nr > 0) {
-      parmdata.parms().push_back (ParmData(iter->second.getName(),
+      parmdata.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					   iter->second.getParmDBSeqNr(),
 					   iter->second.getFunklets()));
     }
@@ -125,7 +126,7 @@ void doIt4sd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains, nrpert, nrscids);
     if (nr > 0) {
-      parmdata.parms().push_back (ParmData(iter->second.getName(),
+      parmdata.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					   iter->second.getParmDBSeqNr(),
 					   iter->second.getFunklets()));
     }
@@ -174,7 +175,7 @@ void doIt4sd2pd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains1, nrpert1, nrscids1);
     if (nr > 0) {
-      parmdata1.parms().push_back (ParmData(iter->second.getName(),
+      parmdata1.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					    iter->second.getParmDBSeqNr(),
 					    iter->second.getFunklets()));
     }
@@ -205,7 +206,7 @@ void doIt4sd2pd (const ParmDB::ParmDBMeta& pdm)
   {
     int nr = iter->second.initDomain (localSolveDomains2, nrpert2, nrscids2);
     if (nr > 0) {
-      parmdata2.parms().push_back (ParmData(iter->second.getName(),
+      parmdata2.parms().push_back (LOFAR::BBS::ParmData(iter->second.getName(),
 					    iter->second.getParmDBSeqNr(),
 					    iter->second.getFunklets()));
     }
diff --git a/CEP/BB/BBSKernel/test/tPerturbed.cc b/CEP/BB/BBSKernel/test/tPerturbed.cc
index 4462c4f9e6861ec467b97998dbbf7a1377ef4706..cf5e4d3a6e29524acd99bf61863140118c778363 100644
--- a/CEP/BB/BBSKernel/test/tPerturbed.cc
+++ b/CEP/BB/BBSKernel/test/tPerturbed.cc
@@ -34,6 +34,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 // Note:
diff --git a/CEP/BB/BBSKernel/test/tPredSolv.cc b/CEP/BB/BBSKernel/test/tPredSolv.cc
index ce30640d5e9177464bfc649f0550c00d2e323afd..c0ba52aef95c10f03beb3a34c2a3e9e390698c6b 100644
--- a/CEP/BB/BBSKernel/test/tPredSolv.cc
+++ b/CEP/BB/BBSKernel/test/tPredSolv.cc
@@ -37,6 +37,7 @@
 
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 
 // Note:
diff --git a/CEP/BB/BBSKernel/test/tPredict.cc b/CEP/BB/BBSKernel/test/tPredict.cc
index 012cdab9fc41ecea09a4118c265fab2aa7760c9b..15cb07e4c0900099684179abd22fd2ff4182d827 100644
--- a/CEP/BB/BBSKernel/test/tPredict.cc
+++ b/CEP/BB/BBSKernel/test/tPredict.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;
 
diff --git a/CEP/BB/BBSKernel/test/tSubtract.cc b/CEP/BB/BBSKernel/test/tSubtract.cc
index 9732deec0d7dbba304981d6bb4d901cd740efb7c..6d4d919b87e4a1675cf20ee956b12cca8dd2778a 100644
--- a/CEP/BB/BBSKernel/test/tSubtract.cc
+++ b/CEP/BB/BBSKernel/test/tSubtract.cc
@@ -29,6 +29,7 @@
 #include <stdexcept>
 
 using namespace LOFAR;
+using namespace LOFAR::BBS;
 using namespace std;
 using namespace casa;