diff --git a/CEP/BB/BBSControl/include/BBSControl/SolveStep.h b/CEP/BB/BBSControl/include/BBSControl/SolveStep.h
index 081c43fbc29755c9c81001b4d0c27c24b747c1e2..460ec008b31d2f0dacf66facbc8f1921c47aa0ad 100644
--- a/CEP/BB/BBSControl/include/BBSControl/SolveStep.h
+++ b/CEP/BB/BBSControl/include/BBSControl/SolveStep.h
@@ -28,7 +28,7 @@
 
 //# Includes
 #include <BBSControl/SingleStep.h>
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 #include <Common/LofarTypes.h>
 #include <Common/lofar_vector.h>
 #include <Common/lofar_string.h>
diff --git a/CEP/BB/BBSControl/include/BBSControl/Step.h b/CEP/BB/BBSControl/include/BBSControl/Step.h
index c7e53bc926308831d45641204ca6c26724daac3b..beb851d94544db8f09828476c75adf7e8f649867 100644
--- a/CEP/BB/BBSControl/include/BBSControl/Step.h
+++ b/CEP/BB/BBSControl/include/BBSControl/Step.h
@@ -28,7 +28,7 @@
 
 //# Includes
 #include <BBSControl/Command.h>
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 #include <Common/lofar_string.h>
 #include <Common/lofar_vector.h>
 #include <Common/lofar_iosfwd.h>
diff --git a/CEP/BB/BBSControl/include/BBSControl/Strategy.h b/CEP/BB/BBSControl/include/BBSControl/Strategy.h
index b53ff9790ecc67c0785cd30e88b962b0eb6eff9d..1a8d7d9a3729591e915ffce1e47853e327a6b309 100644
--- a/CEP/BB/BBSControl/include/BBSControl/Strategy.h
+++ b/CEP/BB/BBSControl/include/BBSControl/Strategy.h
@@ -27,7 +27,7 @@
 // The properties for solvable parameters
 
 //# Includes
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 #include <BBSControl/Command.h>
 #include <Common/lofar_iosfwd.h>
 #include <Common/lofar_string.h>
diff --git a/CEP/BB/BBSControl/include/BBSControl/Structs.h b/CEP/BB/BBSControl/include/BBSControl/Structs.h
index 08e86121ea6cec43d63ca7f28ac950e5f1013bb4..e023822e6582c502a382ea2a7a2ad4870b57cb18 100644
--- a/CEP/BB/BBSControl/include/BBSControl/Structs.h
+++ b/CEP/BB/BBSControl/include/BBSControl/Structs.h
@@ -1,4 +1,4 @@
-//# BBSStructs.h: Some global structs.
+//# Structs.h: Some global structs.
 //#
 //# Copyright (C) 2006
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
diff --git a/CEP/BB/BBSControl/src/CommandExecutor.cc b/CEP/BB/BBSControl/src/CommandExecutor.cc
index f1adb78a1f1eae6c4e641eaea418e63217f096d1..55ac68de9add085d3f771e22fefe17f1f13a7982 100644
--- a/CEP/BB/BBSControl/src/CommandExecutor.cc
+++ b/CEP/BB/BBSControl/src/CommandExecutor.cc
@@ -24,7 +24,7 @@
 #include <BBSControl/CommandExecutor.h>
 
 #include <BBSControl/CommandQueue.h>
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 
 #include <BBSControl/BlobStreamableVector.h>
 #include <BBSControl/BlobStreamableConnection.h>
diff --git a/CEP/BB/BBSControl/src/Strategy.cc b/CEP/BB/BBSControl/src/Strategy.cc
index c8afa164cc9ca86e0c3ec46dd447b918170d91d4..ea91e45bac2d3b3ac4d7f9862e2b9178ac984477 100644
--- a/CEP/BB/BBSControl/src/Strategy.cc
+++ b/CEP/BB/BBSControl/src/Strategy.cc
@@ -24,7 +24,7 @@
 
 #include <BBSControl/Strategy.h>
 #include <BBSControl/Step.h>
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 #include <BBSControl/CommandVisitor.h>
 #include <BBSControl/Exceptions.h>
 #include <APS/ParameterSet.h>
diff --git a/CEP/BB/BBSControl/src/Structs.cc b/CEP/BB/BBSControl/src/Structs.cc
index dc6efe0a56cdc0a51c6431a367f6dd15817e4141..f7cc71ecccd4279022f19b54433c1d30ea0e5d3e 100644
--- a/CEP/BB/BBSControl/src/Structs.cc
+++ b/CEP/BB/BBSControl/src/Structs.cc
@@ -1,4 +1,4 @@
-//#  BBSStructs.cc: 
+//#  Structs.cc: 
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -22,7 +22,7 @@
 
 #include <lofar_config.h>
 
-#include <BBSControl/BBSStructs.h>
+#include <BBSControl/Structs.h>
 #include <BBSControl/StreamUtil.h>
 #include <Common/lofar_sstream.h>
 #include <APS/ParameterSet.h>