diff --git a/.gitattributes b/.gitattributes
index 11dc46e622adeec8e2165bf018b6231fdbbf8650..9b1ae86790734174eea25ee5cfa636ce48e62e2c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3247,8 +3247,8 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-hba-solution.li
 MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-lba-solution.lisp -text
 MAC/Deployment/data/OTDB/Calibration.comp -text
 MAC/Deployment/data/OTDB/Cluster.base -text
-MAC/Deployment/data/OTDB/ClustersNode.base -text
-MAC/Deployment/data/OTDB/ClustersNode.list -text
+MAC/Deployment/data/OTDB/ClusterNode.base -text
+MAC/Deployment/data/OTDB/ClusterNode.list -text
 MAC/Deployment/data/OTDB/Component_diff.sh -text svneol=unset#application/x-shellscript
 MAC/Deployment/data/OTDB/LongBaseline.comp -text
 MAC/Deployment/data/OTDB/Pulsar.comp -text
diff --git a/MAC/Deployment/data/OTDB/Cluster.base b/MAC/Deployment/data/OTDB/Cluster.base
index ebc43a813af3d1d96ab35a613ffc922a08cd148f..905a5abc5e49b6c0c9b8aed8fbdd6897aac4cc42 100755
--- a/MAC/Deployment/data/OTDB/Cluster.base
+++ b/MAC/Deployment/data/OTDB/Cluster.base
@@ -19,4 +19,4 @@ node  Cluster     4.0.2  development 'node constraint'  "Place holder for all pr
 #--------------------------------------------------------------------------------------------------------
 #    name                         dir. type   unit   prun. vm   value                   constr.  descr.
 #--------------------------------------------------------------------------------------------------------
-uses  @clusters@            4.0.2  development 'node constraint'  "Cluster descriptions"
+uses  @cluster@            4.0.2  development 'node constraint'  "Cluster descriptions"
diff --git a/MAC/Deployment/data/OTDB/ClustersNode.base b/MAC/Deployment/data/OTDB/ClusterNode.base
similarity index 100%
rename from MAC/Deployment/data/OTDB/ClustersNode.base
rename to MAC/Deployment/data/OTDB/ClusterNode.base
diff --git a/MAC/Deployment/data/OTDB/ClustersNode.list b/MAC/Deployment/data/OTDB/ClusterNode.list
similarity index 100%
rename from MAC/Deployment/data/OTDB/ClustersNode.list
rename to MAC/Deployment/data/OTDB/ClusterNode.list
diff --git a/MAC/Deployment/data/OTDB/create_OTDB_comps b/MAC/Deployment/data/OTDB/create_OTDB_comps
index f786d2979527e6203bbb854f71cb3e557ef27723..c2386aa5ad7a8af4749ce02699728d966f5e1597 100755
--- a/MAC/Deployment/data/OTDB/create_OTDB_comps
+++ b/MAC/Deployment/data/OTDB/create_OTDB_comps
@@ -207,10 +207,10 @@ do
                 expand_dataproduct "InputDataProductNode" "@inputdataproduct@" |\
 		expand_dataproduct "OutputDataProductNode" "@outputdataproduct@" >${outputname}
         fi
-        grep @clusters@ $file >/dev/null 2>&1
+        grep @cluster@ $file >/dev/null 2>&1
         if [ $? -eq 0 ]; then
                 cat $file | \
-                expand_dataproduct "ClustersNode" "@clusters@" >${outputname}
+                expand_dataproduct "ClusterNode" "@cluster@" >${outputname}
         fi