diff --git a/CMakeLists.txt b/CMakeLists.txt
index acff42e78099bc3b295ebf4aeddfbebe99cd80cb..70860acb6435db6975bf1ed6a59dc7d9b3b69461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,15 +89,11 @@ TSTInitUniqueNodeId.srv
 TSTMakeLocalCopy.srv
 TSTRemoveNode.srv
 TSTRemoveNodeWaitForFinished.srv
-TSTSetAbortedFlag.srv
-TSTSetRevokedFlag.srv
-TSTSetActiveFlag.srv
 TSTSetApprovedFlag.srv
 TSTSetTreeApprovedFlag.srv
 TSTSetConstraints.srv
 TSTSetExecInfo.srv
-TSTSetExecutingFlag.srv
-TSTSetFinishedFlag.srv
+TSTSetFlag.srv
 TSTSetNodeParameterFloat64.srv
 TSTSetNodeParameterFloat64s.srv
 TSTSetNodeParameterBool.srv
@@ -110,18 +106,15 @@ TSTSetNodeParameterPoints.srv
 TSTSetNodeParameterPose.srv
 TSTSetNodeParameterString.srv
 TSTSetNodeParameterStrings.srv
-TSTSetPausedFlag.srv
 TSTSetFailReason.srv
 TSTSetStartExecutorFlag.srv
 TSTSetAbortExecutorFlag.srv
 TSTSetPauseExecutorFlag.srv
 TSTSetContinueExecutorFlag.srv
 TSTSetEnoughExecutorFlag.srv
-TSTSetSucceededFlag.srv
 TSTSetTree.srv
 TSTSetTreeStartTime.srv
 TSTSetNodeStartTime.srv
-TSTSetWaitingFlag.srv
 TSTSetAllSame.srv
 TSTSetAllDifferent.srv
 TSTSetDelExecResources.srv
diff --git a/srv/TSTSetActiveFlag.srv b/srv/TSTSetActiveFlag.srv
deleted file mode 100644
index 29f12bf53651809af46168a7024388088ffb8c7c..0000000000000000000000000000000000000000
--- a/srv/TSTSetActiveFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag active to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetExecutingFlag.srv b/srv/TSTSetExecutingFlag.srv
deleted file mode 100644
index 37673a4a8b07a5cf1873c0c557f1f4fc5a396c82..0000000000000000000000000000000000000000
--- a/srv/TSTSetExecutingFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag executing to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetFinishedFlag.srv b/srv/TSTSetFinishedFlag.srv
deleted file mode 100644
index c035ba9338ef6bfa129200be0e8fe7165eaf5a24..0000000000000000000000000000000000000000
--- a/srv/TSTSetFinishedFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag finished to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetAbortedFlag.srv b/srv/TSTSetFlag.srv
similarity index 58%
rename from srv/TSTSetAbortedFlag.srv
rename to srv/TSTSetFlag.srv
index 404dc1ac4667b56e7b5295ff6ed22a2acd78db5b..7fcb7a90dbf9d3e001435c050d3409d2f801fcd0 100644
--- a/srv/TSTSetAbortedFlag.srv
+++ b/srv/TSTSetFlag.srv
@@ -1,5 +1,5 @@
 #
-# Set the node flag aborted to the value val.
+# Set the flag for node to val. The service name indicates which flag to set.
 #
 
 int32  id               # Node id in the factory
diff --git a/srv/TSTSetPausedFlag.srv b/srv/TSTSetPausedFlag.srv
deleted file mode 100644
index 7380811e880ba7526cfcbd30c7481b376a8f7474..0000000000000000000000000000000000000000
--- a/srv/TSTSetPausedFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag paused to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetRevokedFlag.srv b/srv/TSTSetRevokedFlag.srv
deleted file mode 100644
index e6d449ed210d4b477204723782cc572759a1086c..0000000000000000000000000000000000000000
--- a/srv/TSTSetRevokedFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag revoked to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetSucceededFlag.srv b/srv/TSTSetSucceededFlag.srv
deleted file mode 100644
index 9819b1207ef77519a1c07bf5a347cff44eaa9133..0000000000000000000000000000000000000000
--- a/srv/TSTSetSucceededFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag succeeded to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetWaitingFlag.srv b/srv/TSTSetWaitingFlag.srv
deleted file mode 100644
index 35efe9c693b5bb858d77206830d709913a4c8ed3..0000000000000000000000000000000000000000
--- a/srv/TSTSetWaitingFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag waiting to the value val.
-#
-
-int32  id               # Node id in the factory
-bool   val
----
-bool success
-int32 error
-string reason