diff --git a/.gitignore b/.gitignore
index 9316555b15a4571a8fc3a8a87a8b3a3f2e55b646..122c697a7dbab3dce7d4262b1c91a804a7b922f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,12 @@ CEP/Calibration/BBSControl/lofarconf
 CEP/Calibration/BBSKernel/Makefile.common
 CEP/Calibration/BBSKernel/autoconf_share
 CEP/Calibration/BBSKernel/lofarconf
-CEP/DP3/CS1_SPWCombine/Makefile.common
-CEP/DP3/CS1_SPWCombine/autoconf_share
-CEP/DP3/CS1_SPWCombine/lofarconf
 CEP/DP3/DPPP/Makefile.common
 CEP/DP3/DPPP/autoconf_share
 CEP/DP3/DPPP/lofarconf
+CEP/DP3/SPWCombine/Makefile.common
+CEP/DP3/SPWCombine/autoconf_share
+CEP/DP3/SPWCombine/lofarconf
 CEP/Imager/MWCommon/Makefile.common
 CEP/Imager/MWCommon/autoconf_share
 CEP/Imager/MWCommon/lofarconf
diff --git a/CEP/DP3/CS1_SPWCombine/CS1_SPWCombine.spec.in b/CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/CS1_SPWCombine.spec.in
rename to CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in
diff --git a/CEP/DP3/CS1_SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/Makefile.am
rename to CEP/DP3/SPWCombine/Makefile.am
diff --git a/CEP/DP3/CS1_SPWCombine/bootstrap b/CEP/DP3/SPWCombine/bootstrap
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/bootstrap
rename to CEP/DP3/SPWCombine/bootstrap
diff --git a/CEP/DP3/CS1_SPWCombine/configure.in b/CEP/DP3/SPWCombine/configure.in
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/configure.in
rename to CEP/DP3/SPWCombine/configure.in
diff --git a/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h b/CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
rename to CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h
diff --git a/CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/Makefile.am b/CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/include/CS1_SPWCombine/Makefile.am
rename to CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am
diff --git a/CEP/DP3/CS1_SPWCombine/include/Makefile.am b/CEP/DP3/SPWCombine/include/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/include/Makefile.am
rename to CEP/DP3/SPWCombine/include/Makefile.am
diff --git a/CEP/DP3/CS1_SPWCombine/package.dox b/CEP/DP3/SPWCombine/package.dox
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/package.dox
rename to CEP/DP3/SPWCombine/package.dox
diff --git a/CEP/DP3/CS1_SPWCombine/src/Combiner.cc b/CEP/DP3/SPWCombine/src/Combiner.cc
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/src/Combiner.cc
rename to CEP/DP3/SPWCombine/src/Combiner.cc
diff --git a/CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc b/CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/src/CombinerProcessControl.cc
rename to CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
diff --git a/CEP/DP3/CS1_SPWCombine/src/Makefile.am b/CEP/DP3/SPWCombine/src/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/src/Makefile.am
rename to CEP/DP3/SPWCombine/src/Makefile.am
diff --git a/CEP/DP3/CS1_SPWCombine/src/SPWCombine.cc b/CEP/DP3/SPWCombine/src/SPWCombine.cc
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/src/SPWCombine.cc
rename to CEP/DP3/SPWCombine/src/SPWCombine.cc
diff --git a/CEP/DP3/CS1_SPWCombine/src/SPWCombine.h b/CEP/DP3/SPWCombine/src/SPWCombine.h
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/src/SPWCombine.h
rename to CEP/DP3/SPWCombine/src/SPWCombine.h
diff --git a/CEP/DP3/CS1_SPWCombine/test/CS1_SPWCombine.debug b/CEP/DP3/SPWCombine/test/CS1_SPWCombine.debug
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/test/CS1_SPWCombine.debug
rename to CEP/DP3/SPWCombine/test/CS1_SPWCombine.debug
diff --git a/CEP/DP3/CS1_SPWCombine/test/CS1_SPWCombine.parset b/CEP/DP3/SPWCombine/test/CS1_SPWCombine.parset
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/test/CS1_SPWCombine.parset
rename to CEP/DP3/SPWCombine/test/CS1_SPWCombine.parset
diff --git a/CEP/DP3/CS1_SPWCombine/test/Makefile.am b/CEP/DP3/SPWCombine/test/Makefile.am
similarity index 100%
rename from CEP/DP3/CS1_SPWCombine/test/Makefile.am
rename to CEP/DP3/SPWCombine/test/Makefile.am