diff --git a/CEP/DP3/SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/Makefile.am
index f16428fb14140d054fe5ece8b46c79bf4215ec66..373b32360e537fdb94ea708ad658b12757227d6d 100644
--- a/CEP/DP3/SPWCombine/Makefile.am
+++ b/CEP/DP3/SPWCombine/Makefile.am
@@ -11,7 +11,7 @@ DISTCHECK_CONFIGURE_FLAGS= \
EXTRA_DIST = \
Makefile.common \
- CS1_SPWCombine.spec \
+ SPWCombine.spec \
autoconf_share/compiletool
include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in b/CEP/DP3/SPWCombine/SPWCombine.spec.in
similarity index 97%
rename from CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in
rename to CEP/DP3/SPWCombine/SPWCombine.spec.in
index 380d2144e2594ae9ee801a23d469fbeb34ea854c..53741048b1bf649bcef30f44fe823a0a231906a5 100644
--- a/CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in
+++ b/CEP/DP3/SPWCombine/SPWCombine.spec.in
@@ -1,5 +1,5 @@
# -*- Mode:rpm-spec -*-
-# CS1_SPWCombine.spec.in
+# SPWCombine.spec.in
#
##############################################################################
@@ -8,7 +8,7 @@
#
##############################################################################
-Summary: CS1_SPWCombine
+Summary: SPWCombine
%define release @RPM_RELEASE@
%define version @VERSION@
@@ -37,7 +37,7 @@ AutoReqProv: no
%description
-CS1_SPWCombine More detailed desciprion will follow.
+SPWCombine More detailed desciption will follow.
##############################################################################
#
diff --git a/CEP/DP3/SPWCombine/configure.in b/CEP/DP3/SPWCombine/configure.in
index 48ea4e2dc64fd70277e38d55400dc17cf31a3018..63c3531ca2877edf01b4e16c05b8ca7aec7622e2 100644
--- a/CEP/DP3/SPWCombine/configure.in
+++ b/CEP/DP3/SPWCombine/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl
AC_INIT
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(CS1_SPWCombine, 1.0, no-define)
+AM_INIT_AUTOMAKE(SPWCombine, 1.0, no-define)
dnl Initialize for LOFAR (may set compilers)
lofar_INIT
@@ -54,9 +54,9 @@ AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
[chmod +x test/runctest.sh])
AC_OUTPUT(
include/Makefile
-include/CS1_SPWCombine/Makefile
+include/SPWCombine/Makefile
src/Makefile
test/Makefile
Makefile
-CS1_SPWCombine.spec
+SPWCombine.spec
)
diff --git a/CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am
deleted file mode 100644
index 08317d898efa88682f1e465bc00fd49d17501d9f..0000000000000000000000000000000000000000
--- a/CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-pkginclude_HEADERS = CombinerProcessControl.h
-
-include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/include/Makefile.am b/CEP/DP3/SPWCombine/include/Makefile.am
index a52e22910e5ceb0836aac073af256c8de52eca20..fbd47ad31a38b7a7fbeb4e3bf879df49b2b85399 100644
--- a/CEP/DP3/SPWCombine/include/Makefile.am
+++ b/CEP/DP3/SPWCombine/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = CS1_SPWCombine
+SUBDIRS = SPWCombine
include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h b/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
similarity index 59%
rename from CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
rename to CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
index 57034010ab1e1caf4f58f92da15f33ab7c60ec44..20629234f86f3f01a04017cff5024f7cf4b0a328 100644
--- a/CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
+++ b/CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
@@ -1,22 +1,25 @@
-/***************************************************************************
- * Copyright (C) 2007 by Adriaan Renting, ASTRON *
- * renting@astron.nl *
- * *
- * 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 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. *
- * *
- * 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. *
- ***************************************************************************/
+//# 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$
+//#
+//# @author Adriaan Renting
+
#ifndef LOFARCOMBINERPROCESSCONTROL_H
#define LOFARCOMBINERPROCESSCONTROL_H
diff --git a/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..cbb184b20a4158149adc3b3f9f9dfde824641e46
--- /dev/null
+++ b/CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am
@@ -0,0 +1,4 @@
+pkginclude_HEADERS = CombinerProcessControl.h \
+ SPWCombine.h
+
+include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/src/SPWCombine.h b/CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h
similarity index 100%
rename from CEP/DP3/SPWCombine/src/SPWCombine.h
rename to CEP/DP3/SPWCombine/include/SPWCombine/SPWCombine.h
diff --git a/CEP/DP3/SPWCombine/package.dox b/CEP/DP3/SPWCombine/package.dox
index 2c492fefae42f74a985376277a705838f4da4141..b46336bce0c9110cb5f2b3dce9e2af461a6016b9 100644
--- a/CEP/DP3/SPWCombine/package.dox
+++ b/CEP/DP3/SPWCombine/package.dox
@@ -1,5 +1,5 @@
// \ingroup DP3
-// \defgroup CS1_SPWCombine Spectral Window Combine.
-// CS1_SPWCombines takes takes all Spectral windows in the input
+// \defgroup SPWCombine Spectral Window Combine.
+// SPWCombines takes takes all Spectral windows in the input
// measurementset(s), and writes their data as a single Spectral Window
// into the output Measurementset.
diff --git a/CEP/DP3/SPWCombine/src/Combiner.cc b/CEP/DP3/SPWCombine/src/Combiner.cc
index 88d3a5d198951ece0defbe4e6f2a4178c81ccaed..6905d94beb35dccb36cedf2d68318f4cce82314f 100644
--- a/CEP/DP3/SPWCombine/src/Combiner.cc
+++ b/CEP/DP3/SPWCombine/src/Combiner.cc
@@ -1,28 +1,30 @@
-/***************************************************************************
- * Copyright (C) 2007 by Adriaan Renting, ASTRON *
- * renting@astron.nl *
- * *
- * 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 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. *
- * *
- * 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. *
- ***************************************************************************/
+//# 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$
+//#
+//# @author Adriaan Renting
#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
-#include <CS1_SPWCombine/CombinerProcessControl.h>
+#include <SPWCombine/CombinerProcessControl.h>
int main(int argc, char *argv[])
{
diff --git a/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc b/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
index d25f2caf5b880645b404b9bb0688715ef06d7e1c..541295ffc5a571473e1c622390a67ca6a0e43a1a 100644
--- a/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
+++ b/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
@@ -1,22 +1,24 @@
-/***************************************************************************
- * Copyright (C) 2007 by Adriaan Renting, ASTRON *
- * renting@astron.nl *
- * *
- * 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 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. *
- * *
- * 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. *
- ***************************************************************************/
+//# 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$
+//#
+//# @author Adriaan Renting
#include <lofar_config.h>
#include <iostream>
@@ -28,8 +30,8 @@
#include <ms/MeasurementSets.h>
#include <casa/Exceptions.h>
-#include <CS1_SPWCombine/CombinerProcessControl.h>
-#include "SPWCombine.h"
+#include <SPWCombine/CombinerProcessControl.h>
+#include <SPWCombine/SPWCombine.h>
#define COMBINER_VERSION "0.22"
// 0.10 Initial version based on DataSquasher
diff --git a/CEP/DP3/SPWCombine/src/Makefile.am b/CEP/DP3/SPWCombine/src/Makefile.am
index 6f14afd6415d67ed18f8d40d50bb3196af69040b..21d25a0d43caeedb08d8ca43e5bf579dc3a47d0f 100644
--- a/CEP/DP3/SPWCombine/src/Makefile.am
+++ b/CEP/DP3/SPWCombine/src/Makefile.am
@@ -1,10 +1,9 @@
-bin_PROGRAMS = CS1_SPWCombine
+bin_PROGRAMS = SPWCombine
-CS1_SPWCombine_SOURCES = Combiner.cc \
+SPWCombine_SOURCES = Combiner.cc \
SPWCombine.cc \
- SPWCombine.h \
CombinerProcessControl.cc
-CS1_SPWCombine_LDADD =
-CS1_SPWCombine_DEPENDENCIES = $(LOFAR_DEPEND)
+SPWCombine_LDADD =
+SPWCombine_DEPENDENCIES = $(LOFAR_DEPEND)
include $(top_srcdir)/Makefile.common
diff --git a/CEP/DP3/SPWCombine/src/SPWCombine.cc b/CEP/DP3/SPWCombine/src/SPWCombine.cc
index 0c44ea25185a2df34876904cc8db4c384564e540..2317fed293a7df2f10265a001eaae6500c47ed04 100644
--- a/CEP/DP3/SPWCombine/src/SPWCombine.cc
+++ b/CEP/DP3/SPWCombine/src/SPWCombine.cc
@@ -1,24 +1,28 @@
-/***************************************************************************
- * Copyright (C) 2007 by Adriaan Renting, ASTRON *
- * renting@astron.nl *
- * *
- * 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 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. *
- * *
- * 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. *
- ***************************************************************************/
+//# 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$
+//#
+//# @author Adriaan Renting
+
#include <lofar_config.h>
-#include "SPWCombine.h"
+#include <SPWCombine/SPWCombine.h>
+
namespace LOFAR
{
namespace CS1
diff --git a/CEP/DP3/SPWCombine/test/Makefile.am b/CEP/DP3/SPWCombine/test/Makefile.am
index 09ccf14af486d1e09e2855f90f1c907def995f0f..0bc52c83cdf7f49e8abf4d4e79867b0bdab292d5 100644
--- a/CEP/DP3/SPWCombine/test/Makefile.am
+++ b/CEP/DP3/SPWCombine/test/Makefile.am
@@ -13,7 +13,7 @@ TESTS = $(TESTSCRIPTS)
XFAIL_TESTS =
# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST = $(TESTSCRIPTS) CS1_SPWCombine.parset
+EXTRA_DIST = $(TESTSCRIPTS) SPWCombine.parset
# Lines to build a test program testprg
#testprg_SOURCES = testprg.cc
diff --git a/CEP/DP3/SPWCombine/test/CS1_SPWCombine.debug b/CEP/DP3/SPWCombine/test/SPWCombine.debug
similarity index 100%
rename from CEP/DP3/SPWCombine/test/CS1_SPWCombine.debug
rename to CEP/DP3/SPWCombine/test/SPWCombine.debug
diff --git a/CEP/DP3/SPWCombine/test/CS1_SPWCombine.parset b/CEP/DP3/SPWCombine/test/SPWCombine.parset
similarity index 100%
rename from CEP/DP3/SPWCombine/test/CS1_SPWCombine.parset
rename to CEP/DP3/SPWCombine/test/SPWCombine.parset