diff --git a/CEP/MWCommon/include/MWCommon/ClusterDesc.h b/CEP/MWCommon/include/MWCommon/ClusterDesc.h
index eb1e187d3579da9cb133181e7a2ab07b77f50174..a57c06118fd1a5301d3842aed887f2b594303a4c 100644
--- a/CEP/MWCommon/include/MWCommon/ClusterDesc.h
+++ b/CEP/MWCommon/include/MWCommon/ClusterDesc.h
@@ -1,22 +1,22 @@
 //# ClusterDesc.h:  Description of a cluster and the nodes in it
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/include/MWCommon/Controller.h b/CEP/MWCommon/include/MWCommon/Controller.h
index 87e9fee22a3c65ba3bf0799fa3bdfc83186d7180..d3ad2bbb9e70fa35214cc23eaae4588540dfbfe6 100644
--- a/CEP/MWCommon/include/MWCommon/Controller.h
+++ b/CEP/MWCommon/include/MWCommon/Controller.h
@@ -1,22 +1,22 @@
 //# Controller.h: Class to execute the master and the workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/ControllerBase.h b/CEP/MWCommon/include/MWCommon/ControllerBase.h
index 1105d4a9c67a1e14f7999c4cbb7161a45a286aff..e80849a30d39007347b5073bfdfcb133df5b62d2 100644
--- a/CEP/MWCommon/include/MWCommon/ControllerBase.h
+++ b/CEP/MWCommon/include/MWCommon/ControllerBase.h
@@ -1,22 +1,22 @@
 //# ControllerBase.h: Base class to execute the master and the workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/DomainShape.h b/CEP/MWCommon/include/MWCommon/DomainShape.h
index a1dd25ed611120e3f8840d57278a4e79c1c67cd3..957437db407ac08455c65c06c67fd81f03a35a9d 100644
--- a/CEP/MWCommon/include/MWCommon/DomainShape.h
+++ b/CEP/MWCommon/include/MWCommon/DomainShape.h
@@ -1,22 +1,22 @@
 //# DomainShape.h: Define the shape of a domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MPIConnection.h b/CEP/MWCommon/include/MWCommon/MPIConnection.h
index 90196f51da9c4aecef82c14dfee268e582290c50..31a4d65741d1f195176632b6734e1de563c972d9 100644
--- a/CEP/MWCommon/include/MWCommon/MPIConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MPIConnection.h
@@ -1,22 +1,22 @@
 //# MPIConnection.h: Connection to workers based on MPI
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h b/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
index 7a3c076b2a5e289e787f87fe45ecd3c89af491e6..5e741c988a31c86ff38317eb7051248b7b266a6c 100644
--- a/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MPIConnectionSet.h
@@ -1,24 +1,24 @@
 //# MPIConnectionSet.h: Class to hold a set of MPI connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
-// $Id$
+//# $Id$
 
 #ifndef LOFAR_MWCOMMON_MPICONNECTIONSET_H
 #define LOFAR_MWCOMMON_MPICONNECTIONSET_H
diff --git a/CEP/MWCommon/include/MWCommon/MWBlobIO.h b/CEP/MWCommon/include/MWCommon/MWBlobIO.h
index b613489d8485dfcc55b78d77385d3d352d4c7701..d81e60439fa064fa3b8d150d6bad945b132fc4e6 100644
--- a/CEP/MWCommon/include/MWCommon/MWBlobIO.h
+++ b/CEP/MWCommon/include/MWCommon/MWBlobIO.h
@@ -1,22 +1,22 @@
 //# MWBlobIO.h: Class to convert a message from a blob
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWConnection.h b/CEP/MWCommon/include/MWCommon/MWConnection.h
index ddb77dcac242c38f9df3b96a95b8b56369a1b4c9..83ed801e05eefa84148903bf27e1e44a6f35fd59 100644
--- a/CEP/MWCommon/include/MWCommon/MWConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MWConnection.h
@@ -1,22 +1,22 @@
 //# MWConnection.h: Abstract base class for all MWConnections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWConnectionSet.h b/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
index e1aff1f21e23ed1aef7e100ccefa97c40b85a8ec..d1a8b5089c41679bad2ba7c4b160e191abc59ea5 100644
--- a/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MWConnectionSet.h
@@ -1,22 +1,22 @@
 //# MWConnectionSet.h: Abstract base class for all MWConnectionSets
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWError.h b/CEP/MWCommon/include/MWCommon/MWError.h
index 54006ad05f454f1f22ca2308424a0b6fb2e51053..ba977288d690c8f3cd1870e104198c11096fc0d7 100644
--- a/CEP/MWCommon/include/MWCommon/MWError.h
+++ b/CEP/MWCommon/include/MWCommon/MWError.h
@@ -1,22 +1,22 @@
 //# MWError.h: Basic exception for master/worker related errors
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWGlobalStep.h b/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
index 116c129cdd1cb6b8994f840ee069a000a8fc4795..c49c35a2d15f4bff7d85cfd2d0eb08441d28cf63 100644
--- a/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWGlobalStep.h
@@ -1,22 +1,22 @@
 //# MWGlobalStep.h: Base classes for global MW commands (like subtract)
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWIos.h b/CEP/MWCommon/include/MWCommon/MWIos.h
index f13db38d50fe2cd9d022ce0c83e6a675a26c97f8..4337595f27bfb8bccaffa8b52326f896eb996f70 100644
--- a/CEP/MWCommon/include/MWCommon/MWIos.h
+++ b/CEP/MWCommon/include/MWCommon/MWIos.h
@@ -21,6 +21,22 @@
 //#  MWIos.h: 
 //#
 //#  Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWLocalStep.h b/CEP/MWCommon/include/MWCommon/MWLocalStep.h
index 28ba2fd771cece8188e791271e683372152f9f30..6fa24c885ceaf57432ae5ac19a63335ea1319ba2 100644
--- a/CEP/MWCommon/include/MWCommon/MWLocalStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWLocalStep.h
@@ -1,22 +1,22 @@
 //# MWLocalStep.h: Base class for a step to process a local MW command
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWMultiStep.h b/CEP/MWCommon/include/MWCommon/MWMultiStep.h
index 5f3e8ea61af0bb28d94e1df4ab0e22ffe4ef40a1..76df439b2b42d9edff9fff18d1d6db7041a09e2b 100644
--- a/CEP/MWCommon/include/MWCommon/MWMultiStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWMultiStep.h
@@ -1,22 +1,22 @@
 //# MWMultiStep.h: A step consisting of several other steps
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStep.h b/CEP/MWCommon/include/MWCommon/MWStep.h
index 78276eae6945ca42df75a3730a79e5e95bec7673..6455bb20b9d0cd4d65da441ae8b9f8645630eed0 100644
--- a/CEP/MWCommon/include/MWCommon/MWStep.h
+++ b/CEP/MWCommon/include/MWCommon/MWStep.h
@@ -1,22 +1,22 @@
 //# MWStep.h: Abstract base class for steps to process MW commands
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStepFactory.h b/CEP/MWCommon/include/MWCommon/MWStepFactory.h
index 034efca65d0a7717b5418247e5e8c84b5670f5fa..4f752e74e03f8b97353493541cffb76a379b2302 100644
--- a/CEP/MWCommon/include/MWCommon/MWStepFactory.h
+++ b/CEP/MWCommon/include/MWCommon/MWStepFactory.h
@@ -1,22 +1,22 @@
 //# MWStepFactory.h: Factory pattern to make the correct MWStep object
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MWStepVisitor.h b/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
index 67471d7116d5fcf0092a032a04414e108d454cac..a9e7b3fc3fb4640deaf9fcdab366c6ae93ef33ec 100644
--- a/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
+++ b/CEP/MWCommon/include/MWCommon/MWStepVisitor.h
@@ -1,22 +1,22 @@
 //# MWStepVisitor.h: Base visitor class to visit an MWStep hierarchy
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MasterControl.h b/CEP/MWCommon/include/MWCommon/MasterControl.h
index 1d28cb9a25c77f529cd6f5c1f573eb6e209780a7..6921998ebc52d2a0e2fb59897e610935a02d2df5 100644
--- a/CEP/MWCommon/include/MWCommon/MasterControl.h
+++ b/CEP/MWCommon/include/MWCommon/MasterControl.h
@@ -1,22 +1,22 @@
 //# MasterControl.h: Master control of a distributed process
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MemConnection.h b/CEP/MWCommon/include/MWCommon/MemConnection.h
index 7e29a632103ad8ede54f54a5740fb055c124e212..a90d8667be2ef9476b57395b161b82fb19d9d422 100644
--- a/CEP/MWCommon/include/MWCommon/MemConnection.h
+++ b/CEP/MWCommon/include/MWCommon/MemConnection.h
@@ -1,22 +1,22 @@
 //# MemConnection.h: Connection to workers based on memory
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/MemConnectionSet.h b/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
index 2636bdd7a663211114eca38beaf819c107fad112..ddbfae5c2d3e6f0d469bb25dd1ea30adbb59b845 100644
--- a/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/MemConnectionSet.h
@@ -1,22 +1,22 @@
 //# MemConnectionSet.h: Set of Memory connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/NodeDesc.h b/CEP/MWCommon/include/MWCommon/NodeDesc.h
index e650d7fe58766fc067d74657d3a87ade6e96ce0e..5c62b10b9ba4b528ddfa54c9e69c70ac23d4e0aa 100644
--- a/CEP/MWCommon/include/MWCommon/NodeDesc.h
+++ b/CEP/MWCommon/include/MWCommon/NodeDesc.h
@@ -1,22 +1,22 @@
 //# NodeDesc.h: Description of a node in a cluster
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/ObsDomain.h b/CEP/MWCommon/include/MWCommon/ObsDomain.h
index 457be83628bc943c8535bf9f909d6bf5b1b3b097..e591ef955ebe416be724120eccd5d0c69c68ef62 100644
--- a/CEP/MWCommon/include/MWCommon/ObsDomain.h
+++ b/CEP/MWCommon/include/MWCommon/ObsDomain.h
@@ -1,22 +1,22 @@
 //# ObsDomain.h:  Define the boundary values of a domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/ParameterHandler.h b/CEP/MWCommon/include/MWCommon/ParameterHandler.h
index 3a98573de912684968b3222f34d24252ad7b4f83..383cf0ca183dff76a2741dd4b8a89dfb6736615a 100644
--- a/CEP/MWCommon/include/MWCommon/ParameterHandler.h
+++ b/CEP/MWCommon/include/MWCommon/ParameterHandler.h
@@ -1,22 +1,22 @@
 //# ParameterHandler.h: Handle a LOFAR .parset file
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketConnection.h b/CEP/MWCommon/include/MWCommon/SocketConnection.h
index fe95b0dc846c4aeb38afbfdb7a5213bf607893f3..0c65a29aae3110a495e0b85115310ac4d910e739 100644
--- a/CEP/MWCommon/include/MWCommon/SocketConnection.h
+++ b/CEP/MWCommon/include/MWCommon/SocketConnection.h
@@ -1,22 +1,22 @@
 //# SocketConnection.h: Connection to workers based on a socket
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h b/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
index f0f46dfd651eae0554156bc14437d0cd433f8558..40296e2bc2ab93f58c76927100a85126df194243 100644
--- a/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
+++ b/CEP/MWCommon/include/MWCommon/SocketConnectionSet.h
@@ -1,22 +1,22 @@
 //# SocketConnectionSet.h: Set of socket connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/SocketListener.h b/CEP/MWCommon/include/MWCommon/SocketListener.h
index 8f6ecb2dd170affc1854a49d9229812e661260cd..71cd6c7cfa62ac00fe23ba3f6da46517a7aa7a8b 100644
--- a/CEP/MWCommon/include/MWCommon/SocketListener.h
+++ b/CEP/MWCommon/include/MWCommon/SocketListener.h
@@ -1,22 +1,22 @@
 //# SocketListener.h: Class that creates a socket and accepts connections
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/VdsDesc.h b/CEP/MWCommon/include/MWCommon/VdsDesc.h
index fb1dd1a746de41edaba25b722ba9848173957e27..42e3e4c1bcdb1724cfcbd9797a56ea1471e5732d 100644
--- a/CEP/MWCommon/include/MWCommon/VdsDesc.h
+++ b/CEP/MWCommon/include/MWCommon/VdsDesc.h
@@ -1,22 +1,22 @@
 //# VdsDesc.h: Describe an entire visibility data set
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/VdsPartDesc.h b/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
index b995565922959c2d1964a73a513b1d48b78f1b59..ebc52d96d9d08585af52c1ba03fbd83904d98d48 100644
--- a/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
+++ b/CEP/MWCommon/include/MWCommon/VdsPartDesc.h
@@ -1,22 +1,22 @@
 //# VdsPartDesc.h: Description of a visibility data set or part thereof
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h b/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
index e8c7218cb678e1520fbb47b96dc55ca1d856e0fa..859f368ee8784245793dfd343328e2e00747722c 100644
--- a/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
+++ b/CEP/MWCommon/include/MWCommon/WorkDomainSpec.h
@@ -1,22 +1,22 @@
 //# WorkDomainSpec.h: Define the specifications of the work domain
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerControl.h b/CEP/MWCommon/include/MWCommon/WorkerControl.h
index eccc3b3da5ae08a72abd106576b99783ea1ebb48..9538ba5caab0157d54feec1ebdac455ee94c2fa0 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerControl.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerControl.h
@@ -1,22 +1,22 @@
 //# WorkerControl.h: High level worker control
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerFactory.h b/CEP/MWCommon/include/MWCommon/WorkerFactory.h
index ea74078b572ca30fdcd3380845898b0d0894a569..a5a599c5e76c2999d32e8678076305e2b9cd506c 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerFactory.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerFactory.h
@@ -1,22 +1,22 @@
 //# WorkerFactory.h: Factory pattern to generate a WorkerProxy object
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerInfo.h b/CEP/MWCommon/include/MWCommon/WorkerInfo.h
index db3891de78a5d9ec97a8fe8d8fc5c34d171bc928..736d52a83797a53bc7dcf231b83524431bb5b4be 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerInfo.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerInfo.h
@@ -1,22 +1,22 @@
 //# WorkerInfo.h: Information about a worker
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkerProxy.h b/CEP/MWCommon/include/MWCommon/WorkerProxy.h
index f33a5420f74f91672f7564dcdc223580757480f0..40d8531f0d7d2de178407b8efcc549245e9f912e 100644
--- a/CEP/MWCommon/include/MWCommon/WorkerProxy.h
+++ b/CEP/MWCommon/include/MWCommon/WorkerProxy.h
@@ -1,22 +1,22 @@
 //# WorkerProxy.h: Abstract base class for all worker proxies
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/include/MWCommon/WorkersDesc.h b/CEP/MWCommon/include/MWCommon/WorkersDesc.h
index 9817f97bf704d6ea13ef4fd46218a8856a2b41ce..49e23970c487efded132d6c490b8fbcb1a2f105e 100644
--- a/CEP/MWCommon/include/MWCommon/WorkersDesc.h
+++ b/CEP/MWCommon/include/MWCommon/WorkersDesc.h
@@ -1,22 +1,22 @@
 //# WorkerDesc.h: Description of all workers
 //#
 //# Copyright (C) 2005
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/ClusterDesc.cc b/CEP/MWCommon/src/ClusterDesc.cc
index f4915e5f0202a3c231207a422f544092bc6f4364..6bbc71f0d1016a6488f2029934f5090a10f02ed2 100644
--- a/CEP/MWCommon/src/ClusterDesc.cc
+++ b/CEP/MWCommon/src/ClusterDesc.cc
@@ -1,22 +1,22 @@
 //# ClusterDesc.cc: Description of a cluster
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/src/Controller.cc b/CEP/MWCommon/src/Controller.cc
index 8fd8972d10893b469c111afa2d97e6422e8efab0..e89eb52a351b150e63652af815f475f09fc4c4b1 100644
--- a/CEP/MWCommon/src/Controller.cc
+++ b/CEP/MWCommon/src/Controller.cc
@@ -1,6 +1,22 @@
 //#  Controller.cc: Class to execute the master and workers
 //#
 //#  Copyright (C) 2008
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/src/ControllerBase.cc b/CEP/MWCommon/src/ControllerBase.cc
index 360e695498df42752543f4ac199eb564e7315e9b..07ad7186a73d36407e891f2a11892a36f3ed4375 100644
--- a/CEP/MWCommon/src/ControllerBase.cc
+++ b/CEP/MWCommon/src/ControllerBase.cc
@@ -1,6 +1,22 @@
 //#  ControllerBase.cc: Base class to execute the master and workers
 //#
 //#  Copyright (C) 2008
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/src/DomainShape.cc b/CEP/MWCommon/src/DomainShape.cc
index 2cee50476849d1510b087570d1b1b3f992f5ae1f..f554366fa70ae2c9c011d5f4059f7996bbcbf11e 100644
--- a/CEP/MWCommon/src/DomainShape.cc
+++ b/CEP/MWCommon/src/DomainShape.cc
@@ -1,7 +1,22 @@
 //# DomainShape.cc: Define the shape of a domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MPIConnection.cc b/CEP/MWCommon/src/MPIConnection.cc
index 4a72ddf9261807ebdf96bd85ff8b5f1591511472..9917cbed32b0cae4ecc47edfd0228490da4a1990 100644
--- a/CEP/MWCommon/src/MPIConnection.cc
+++ b/CEP/MWCommon/src/MPIConnection.cc
@@ -1,7 +1,22 @@
 //# MPIConnection.cc: Connection to workers based on MPI
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MPIConnectionSet.cc b/CEP/MWCommon/src/MPIConnectionSet.cc
index 7f79b9d66ded0ed5ffa4cf1749b543967efd6824..67c969d4ea76a1dafba43ae195d44142ff515b0f 100644
--- a/CEP/MWCommon/src/MPIConnectionSet.cc
+++ b/CEP/MWCommon/src/MPIConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MPIConnectionSet.cc: Set of MPI connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWBlobIO.cc b/CEP/MWCommon/src/MWBlobIO.cc
index e58a9192791fab2953c705695f535b4996e414ed..39d10efdad0c0b2caf2c1753fee96e51404f8182 100644
--- a/CEP/MWCommon/src/MWBlobIO.cc
+++ b/CEP/MWCommon/src/MWBlobIO.cc
@@ -1,7 +1,22 @@
 //# MWBlobIO.cc: 
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWConnection.cc b/CEP/MWCommon/src/MWConnection.cc
index 8e9dcf6ff44f126563320a3ffea64f14d648a6f7..7fe1a9418c684c36ac3894bb8cfa041948eb1f77 100644
--- a/CEP/MWCommon/src/MWConnection.cc
+++ b/CEP/MWCommon/src/MWConnection.cc
@@ -1,7 +1,22 @@
 //# MWConnection.cc: Abstract base class for all MWConnections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWConnectionSet.cc b/CEP/MWCommon/src/MWConnectionSet.cc
index 946d89b252aa3f6a85d70cc008c330ff222269c4..98128c40cbdbd985d4645ca5f70ccbf8d8f7385e 100644
--- a/CEP/MWCommon/src/MWConnectionSet.cc
+++ b/CEP/MWCommon/src/MWConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MWConnectionSet.cc: Abstract base class for all MWConnectionSets
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWGlobalStep.cc b/CEP/MWCommon/src/MWGlobalStep.cc
index 1c388191c02b33315671c04500c5c76fade6e1ce..7a9fb65cf2c43b5c3e5d8b148b504f471b8319e7 100644
--- a/CEP/MWCommon/src/MWGlobalStep.cc
+++ b/CEP/MWCommon/src/MWGlobalStep.cc
@@ -1,7 +1,22 @@
 //# MWGlobalStep.cc: Base classes for global MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWIos.cc b/CEP/MWCommon/src/MWIos.cc
index 57de2e7c16c8213d1026057d185c96987cb9db72..3b6273a7fbca440120454496e29e6d9f0ea66392 100644
--- a/CEP/MWCommon/src/MWIos.cc
+++ b/CEP/MWCommon/src/MWIos.cc
@@ -1,6 +1,22 @@
 //#  MWIos.cc:
 //#
 //#  Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/src/MWLocalStep.cc b/CEP/MWCommon/src/MWLocalStep.cc
index b688e7287cb5d1a6a11c7a0ef2f598c8adceb7f6..c6fcb702a13f2e6d3b8b57dfe4a5cc713a87eba5 100644
--- a/CEP/MWCommon/src/MWLocalStep.cc
+++ b/CEP/MWCommon/src/MWLocalStep.cc
@@ -1,7 +1,22 @@
 //# MWLocalStep.cc: Base classes for local MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWMultiStep.cc b/CEP/MWCommon/src/MWMultiStep.cc
index 028529ab14a04d8ea32909f1e711067dd87a51d8..b15d094b69ff05ee83fbea0e709a4dd4b01aa8ad 100644
--- a/CEP/MWCommon/src/MWMultiStep.cc
+++ b/CEP/MWCommon/src/MWMultiStep.cc
@@ -1,7 +1,22 @@
 //# MWMultiStep.cc: A step consisting of several other steps.
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWStep.cc b/CEP/MWCommon/src/MWStep.cc
index 078729846b484dc4b27b9af4532e9bf0770196cb..cb9ec6d0b3e95740d5b6ad88ecd66c720c3a0f1f 100644
--- a/CEP/MWCommon/src/MWStep.cc
+++ b/CEP/MWCommon/src/MWStep.cc
@@ -1,7 +1,22 @@
 //# MWStep.cc: Step to process the MW commands
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWStepFactory.cc b/CEP/MWCommon/src/MWStepFactory.cc
index 327d10fd70aae4e306e99bac36696b4b9a3a9a2b..2db50d581f043842b414a768b8a663b2ea6b3aaf 100644
--- a/CEP/MWCommon/src/MWStepFactory.cc
+++ b/CEP/MWCommon/src/MWStepFactory.cc
@@ -1,7 +1,22 @@
 //# MWStepFactory.cc: Factory pattern to make the correct MWStep object
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MWStepVisitor.cc b/CEP/MWCommon/src/MWStepVisitor.cc
index 7255a13918f3c3c415c14cf35285f0c6098ca853..e97f2150c7d4f599204c720373a8b4eac8461d64 100644
--- a/CEP/MWCommon/src/MWStepVisitor.cc
+++ b/CEP/MWCommon/src/MWStepVisitor.cc
@@ -1,7 +1,22 @@
 //# MWStepVisitor.cc: Base visitor class to visit an MWStep hierarchy
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MasterControl.cc b/CEP/MWCommon/src/MasterControl.cc
index b9b6ef4b0566868a33534221ab8546ff1c834c13..1b3f9e07df730253c0d8f8f906540ad753fc421a 100644
--- a/CEP/MWCommon/src/MasterControl.cc
+++ b/CEP/MWCommon/src/MasterControl.cc
@@ -1,7 +1,22 @@
 //# MasterControl.cc: Master controller of distributed VDS processing
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MemConnection.cc b/CEP/MWCommon/src/MemConnection.cc
index f7fbd4be0d2096a832f0b45bb8121bfa1a6bb5a1..10c4c4051df21ed071c11fd8be0f7be610824d21 100644
--- a/CEP/MWCommon/src/MemConnection.cc
+++ b/CEP/MWCommon/src/MemConnection.cc
@@ -1,7 +1,22 @@
 //# MemConnection.cc: Memory connection to a worker
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/MemConnectionSet.cc b/CEP/MWCommon/src/MemConnectionSet.cc
index 8b3c376fa1abbfcfe19da27d59b4b1254920dc5f..460fc3a5c3b714c4986df884ceb5b3ed0b30abf2 100644
--- a/CEP/MWCommon/src/MemConnectionSet.cc
+++ b/CEP/MWCommon/src/MemConnectionSet.cc
@@ -1,7 +1,22 @@
 //# MemConnectionSet.cc: Set of Memory connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/NodeDesc.cc b/CEP/MWCommon/src/NodeDesc.cc
index 6a1f080ea060a5b5f41c67c876f8a3c8f830ab58..a6f1d204024e16ff549d03ddf7ded96dac00a7c7 100644
--- a/CEP/MWCommon/src/NodeDesc.cc
+++ b/CEP/MWCommon/src/NodeDesc.cc
@@ -1,22 +1,22 @@
 //# NodeDesc.cc: Description of a node
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/src/ObsDomain.cc b/CEP/MWCommon/src/ObsDomain.cc
index d5ec9961d9e49598ce839ef57c2c1e0e8374dd47..2bd5bb204f331a629964438eb5507ecd559d95ae 100644
--- a/CEP/MWCommon/src/ObsDomain.cc
+++ b/CEP/MWCommon/src/ObsDomain.cc
@@ -1,7 +1,22 @@
 //# ObsDomain.cc: Define the shape of a domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/ParameterHandler.cc b/CEP/MWCommon/src/ParameterHandler.cc
index 5afebde343d64fed5222e06a52097cc608d8f8e9..27dfa915a46d21caaacc464f865b07ccb5622593 100644
--- a/CEP/MWCommon/src/ParameterHandler.cc
+++ b/CEP/MWCommon/src/ParameterHandler.cc
@@ -1,6 +1,22 @@
 //#  ParameterHandler.cc: 
 //#
 //#  Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/src/SocketConnection.cc b/CEP/MWCommon/src/SocketConnection.cc
index 554c2e829c76a36b3c1d91c76d124551b777f484..37c8ac5c5a085b857988947de102637c16628fe0 100644
--- a/CEP/MWCommon/src/SocketConnection.cc
+++ b/CEP/MWCommon/src/SocketConnection.cc
@@ -1,7 +1,22 @@
 //# SocketConnection.cc: Connection to workers based on a socket
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/SocketConnectionSet.cc b/CEP/MWCommon/src/SocketConnectionSet.cc
index 46c7197c2119e4c9fe2e683bc3a69cc7e66a0d50..1d3e59723097732a7ce0cdbbb84fef20ac04b90a 100644
--- a/CEP/MWCommon/src/SocketConnectionSet.cc
+++ b/CEP/MWCommon/src/SocketConnectionSet.cc
@@ -1,7 +1,22 @@
 //# SocketConnectionSet.cc: Set of socket connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/SocketListener.cc b/CEP/MWCommon/src/SocketListener.cc
index 79d23df5ee4b3b1e3aafd94ae6e9a41ee34e6478..7153cb3a7908c3e1f711125c01e9463267a99ebc 100644
--- a/CEP/MWCommon/src/SocketListener.cc
+++ b/CEP/MWCommon/src/SocketListener.cc
@@ -1,7 +1,22 @@
 //# SocketListener.cc: Class that creates a socket and accepts connections
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/VdsDesc.cc b/CEP/MWCommon/src/VdsDesc.cc
index 7d62b51c3c082b6b6f4315aab07697c0229535f0..14908043e50486379837f77a8b5d049972c252bf 100644
--- a/CEP/MWCommon/src/VdsDesc.cc
+++ b/CEP/MWCommon/src/VdsDesc.cc
@@ -1,22 +1,22 @@
 //# VdsDesc.cc: Describe an entire visibility data set
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/src/VdsPartDesc.cc b/CEP/MWCommon/src/VdsPartDesc.cc
index 41e2d28038057ac3b34f9fc8cd756ba0eef73a03..5276e0bad091a9f2d1c9c650cd7490c9e01bc210 100644
--- a/CEP/MWCommon/src/VdsPartDesc.cc
+++ b/CEP/MWCommon/src/VdsPartDesc.cc
@@ -1,22 +1,22 @@
 //# VdsPartDesc.cc: Description of a visibility data set or part thereof
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/src/WorkDomainSpec.cc b/CEP/MWCommon/src/WorkDomainSpec.cc
index f6f288aaf68e9b1d1de2c6225e629bf0f234136c..843cceae171bb1804fd636011c31ae79cce1006a 100644
--- a/CEP/MWCommon/src/WorkDomainSpec.cc
+++ b/CEP/MWCommon/src/WorkDomainSpec.cc
@@ -1,7 +1,22 @@
 //# WorkDomainSpec.cc: Define the specifications of the work domain
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/WorkerControl.cc b/CEP/MWCommon/src/WorkerControl.cc
index 62e866e05db38d3ab430851870f09509d30a35a1..15c7d9e3b19885ddb89c7d934ed1e3cdb5a39acf 100644
--- a/CEP/MWCommon/src/WorkerControl.cc
+++ b/CEP/MWCommon/src/WorkerControl.cc
@@ -1,7 +1,22 @@
 //# WorkerControl.cc: Worker connection of distributed VDS processing
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/WorkerFactory.cc b/CEP/MWCommon/src/WorkerFactory.cc
index c8ed3a5b7d00a2b9387cdeae3ee3777735635d86..16ff7b096ce1643244542a36e66b29ff47d24dd6 100644
--- a/CEP/MWCommon/src/WorkerFactory.cc
+++ b/CEP/MWCommon/src/WorkerFactory.cc
@@ -1,7 +1,22 @@
 //# WorkerFactory.cc: Factory pattern to generate a workerproxy object
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/WorkerInfo.cc b/CEP/MWCommon/src/WorkerInfo.cc
index 7585806195893f989e191e1bfedd5e86dedbc374..2cadee69d2b49da4526c7f3415e0a7f9cdf1bfd2 100644
--- a/CEP/MWCommon/src/WorkerInfo.cc
+++ b/CEP/MWCommon/src/WorkerInfo.cc
@@ -1,7 +1,22 @@
 //# WorkerInfo.cc: 
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/WorkerProxy.cc b/CEP/MWCommon/src/WorkerProxy.cc
index 4a98c6bb3349b880854afe8f663cfc9d147b82a4..2d73e469c8da793b3b2b971706def1ec5e5ef506 100644
--- a/CEP/MWCommon/src/WorkerProxy.cc
+++ b/CEP/MWCommon/src/WorkerProxy.cc
@@ -1,7 +1,22 @@
 //# WorkerProxy.cc: Base class for the proxy of a worker
 //#
-//# @copyright (c) 2007 ASKAP, All Rights Reserved.
-//# @author Ger van Diepen <diepen AT astron nl>
+//# Copyright (c) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/WorkersDesc.cc b/CEP/MWCommon/src/WorkersDesc.cc
index 7ba67350aaacd08e786ecb5f01c3edc87e50165a..2045c90680dcf6bd5b48ec708ec3df4271841469 100644
--- a/CEP/MWCommon/src/WorkersDesc.cc
+++ b/CEP/MWCommon/src/WorkersDesc.cc
@@ -1,22 +1,22 @@
 //# WorkersDesc.cc: Description of a workers
 //#
 //# Copyright (C) 2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# ASTRON (Netherlands Institute for Radio Astronomy)
 //# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This file is part of the LOFAR software suite LOFARsoft.
-//# LOFARsoft is free software: you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation, either version 3 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# LOFARsoft is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with LOFARsoft. If not, see <http://www.gnu.org/licenses/>.
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 //#
diff --git a/CEP/MWCommon/src/finddproc.cc b/CEP/MWCommon/src/finddproc.cc
index fc37c034709c1c30fee03a6b9b5f437ae87ca2e6..61036b9d87b23a77dbed3ed5cfeaa588afc53753 100644
--- a/CEP/MWCommon/src/finddproc.cc
+++ b/CEP/MWCommon/src/finddproc.cc
@@ -1,22 +1,22 @@
 //# finddproc.cc: Create machinefile based on 
 //#
 //# Copyright (C) 2006
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/showclusterdesc.cc b/CEP/MWCommon/src/showclusterdesc.cc
index 6265045dc1d475d06769644e6d2c714edcad03a4..8daa7ebedaacb79eb135241c973736cd653e18c7 100644
--- a/CEP/MWCommon/src/showclusterdesc.cc
+++ b/CEP/MWCommon/src/showclusterdesc.cc
@@ -1,21 +1,21 @@
 //# showclusterdesc.cc: show the (expanded) ClusterDesc
 //# Copyright (C) 2009
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 //#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
 //# (at your option) any later version.
 //#
-//# This program is distributed in the hope that it will be useful,
+//# The LOFAR software suite is distributed in the hope that it will be useful,
 //# but WITHOUT ANY WARRANTY; without even the implied warranty of
 //# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //# GNU General Public License for more details.
 //#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/src/socketrun b/CEP/MWCommon/src/socketrun
index f832a1de75f32468bf68e743ab9da079aa6fb7e5..473f11a70de22407229441155e5500c01be95cec 100755
--- a/CEP/MWCommon/src/socketrun
+++ b/CEP/MWCommon/src/socketrun
@@ -1,24 +1,24 @@
 #!/bin/sh
 
-# socketrun.cc: Start a distributed process using socket connections
+# socketrun: Start a distributed process using socket connections
 #
-#  @copyright (c) 2008, ASTRON
-#  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 #
 # @author Ger van Diepen <diepen AT astron nl>
 #
diff --git a/CEP/MWCommon/src/startdistproc b/CEP/MWCommon/src/startdistproc
index f87e2ed643c85eab084a8a7e9676803f06cf125e..43479f1e4f4346672118ced3c8aaff29c68a5ac6 100755
--- a/CEP/MWCommon/src/startdistproc
+++ b/CEP/MWCommon/src/startdistproc
@@ -2,23 +2,23 @@
 
 # startdistproc: Start a distributed process
 #
-#  @copyright (c) 2008, ASTRON
-#  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 #
 # @author Ger van Diepen <diepen AT astron nl>
 #
diff --git a/CEP/MWCommon/test/tClusterDesc.cc b/CEP/MWCommon/test/tClusterDesc.cc
index c1f9f20736306e1708d3cd88e2017087fe5bf50d..e0345065afd6077dd06dee6173d40e681a1fb9c9 100644
--- a/CEP/MWCommon/test/tClusterDesc.cc
+++ b/CEP/MWCommon/test/tClusterDesc.cc
@@ -1,6 +1,22 @@
 //# tClusterDesc.cc: Test program for class ClusterDesc
 //#
 //# Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/test/tNodeDesc.cc b/CEP/MWCommon/test/tNodeDesc.cc
index f21d59e217b66261c4e381bd2dab00c9b78aacf1..b590db6dd1ab9993012d9e2e2d200647b1675997 100644
--- a/CEP/MWCommon/test/tNodeDesc.cc
+++ b/CEP/MWCommon/test/tNodeDesc.cc
@@ -1,6 +1,22 @@
 //# tNodeDesc.cc: Test program for class NodeDesc
 //#
 //# Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/test/tSocketConnection.cc b/CEP/MWCommon/test/tSocketConnection.cc
index 3dc920f12b3dded8dcb1b8f0a84f1eb0c22821ae..b5eadde203a0fa2bd96fb0b4a57a080c82b2c4ef 100644
--- a/CEP/MWCommon/test/tSocketConnection.cc
+++ b/CEP/MWCommon/test/tSocketConnection.cc
@@ -1,6 +1,22 @@
 //#  tSocketConnection.cc: Program to test SocketConnection
 //#
 //#  Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //#  $Id$
 
diff --git a/CEP/MWCommon/test/tSocketConnection.run b/CEP/MWCommon/test/tSocketConnection.run
index f0b0030d76456d1afa4e19ec2af941435798670b..7659bf39a95fb2d05a35a6977f3fe8e16f1a7010 100755
--- a/CEP/MWCommon/test/tSocketConnection.run
+++ b/CEP/MWCommon/test/tSocketConnection.run
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+# tSocketConnection: Test class SocketConnection in various ways
+#
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 # Run the tSocketConnection test program by starting it twice,
 # once as server and once as client.
 ./tSocketConnection 3851 > tSocketConnection_tmp.outs1 &
diff --git a/CEP/MWCommon/test/tVdsDesc.cc b/CEP/MWCommon/test/tVdsDesc.cc
index 1c2d03d164e4e5046de4620178b2f92ba627dee5..9f26db2cacb49cdfc45b0a57ce5d92b5b3818e8a 100644
--- a/CEP/MWCommon/test/tVdsDesc.cc
+++ b/CEP/MWCommon/test/tVdsDesc.cc
@@ -1,6 +1,22 @@
 //# tVdsDesc.cc: Test program for class VdsDesc
 //#
 //# Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/test/tVdsPartDesc.cc b/CEP/MWCommon/test/tVdsPartDesc.cc
index 610e8203ebb8cab87487de665527104f8a1a3d42..337c102a1124f61c5792fa6a07a4f2aeffe373e1 100644
--- a/CEP/MWCommon/test/tVdsPartDesc.cc
+++ b/CEP/MWCommon/test/tVdsPartDesc.cc
@@ -1,6 +1,22 @@
 //# tVdsPartDesc.cc: Test program for class VdsPartDesc
 //#
 //# Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/test/tWorkersDesc.cc b/CEP/MWCommon/test/tWorkersDesc.cc
index ba72924077cf2dd5b15d7a79176a6bb96db610ec..812be5f32f891eccdbc2c72dbc46bf37b5e68de7 100644
--- a/CEP/MWCommon/test/tWorkersDesc.cc
+++ b/CEP/MWCommon/test/tWorkersDesc.cc
@@ -1,6 +1,22 @@
 //# tWorkersDesc.cc: Test program for class WorkersDesc
 //#
 //# Copyright (C) 2007
+//# ASTRON (Netherlands Institute for Radio Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+//#
+//# This file is part of the LOFAR software suite.
+//# The LOFAR software suite is free software: you can redistribute it and/or
+//# modify it under the terms of the GNU General Public License as published
+//# by the Free Software Foundation, either version 3 of the License, or
+//# (at your option) any later version.
+//#
+//# The LOFAR software suite is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License along
+//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
 //#
 //# $Id$
 
diff --git a/CEP/MWCommon/test/tfinddproc.run b/CEP/MWCommon/test/tfinddproc.run
index a7f3a3ae82d55115700bb0db7060849f9b1c938c..ff7dac0d4b83388610005177a870370d4b679a29 100755
--- a/CEP/MWCommon/test/tfinddproc.run
+++ b/CEP/MWCommon/test/tfinddproc.run
@@ -1,3 +1,28 @@
 #!/bin/sh
 
+# tfinddproc: Test program finddproc
+#
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 ../src/finddproc tfinddproc.in_vd tfinddproc.in_cd
diff --git a/CEP/MWCommon/test/tstartdproc.run b/CEP/MWCommon/test/tstartdproc.run
index 873d24f56810dd3277ecb15cf84dccf149852ae8..902fc9342366c312f7d89d671c7ea54cd40e2c31 100755
--- a/CEP/MWCommon/test/tstartdproc.run
+++ b/CEP/MWCommon/test/tstartdproc.run
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+# tstartdproc: Test script startdistproc in various ways
+#
+# Copyright: 2008
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# @author Ger van Diepen <diepen AT astron nl>
+#
+# $Id$
+
+
 if test "$srcdir" = ""; then
   srcdir=../../../src
 fi