diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh
index e131b730ccc..a3f2bce8242 100755
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ b/releng/org.eclipse.rse.build/bin/batch_sign.sh
@@ -46,7 +46,7 @@ RDIR=`pwd`
 mkdir -p signed
 nameToSign=`basename $RDIR`
 ZIPS=`ls *.zip *.jar`
-STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
+STAGING=/home/data/httpd/download-staging.priv/tools/tm
 STDIR=${STAGING}/${nameToSign}
 mkdir -p ${STDIR}
 cp ${ZIPS} ${STDIR}
diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index 0ca4bb47e41..5cf5883c437 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -96,14 +96,14 @@ tail -30 $log
 if [ -d /home/data/httpd/archive.eclipse.org/tm/downloads ]; then
   cd /home/data/httpd/archive.eclipse.org/tm/downloads
   cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
+  chgrp tools.tm * CVS/* 2>/dev/null
   cd /home/data/httpd/download.eclipse.org/tm/downloads
   cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/*
+  chgrp tools.tm * CVS/*
 
   #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  echo "Fixup: chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*"
-  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
+  echo "Fixup: chgrp -R tools.tm drops/${buildType}*${daystamp}*"
+  chgrp -R tools.tm drops/${buildType}*${daystamp}*
   chmod -R g+w drops/${buildType}*${daystamp}*
 fi
 
@@ -138,7 +138,7 @@ if [ -f package.count -a "$FILES" != "" ]; then
     else
       echo "ERROR: missing TM-terminal-*.zip"
     fi
-    chgrp dsdp-tmadmin ../N.latest/*.zip
+    chgrp tools.tm ../N.latest/*.zip
     chmod g+w ../N.latest/*.zip
   fi
 
@@ -159,4 +159,4 @@ if [ -f package.count -a "$FILES" != "" ]; then
 else
   echo "package.count missing, release seems failed"
 fi
-chgrp dsdp-tm-rse $log
+chgrp tools.tm $log
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index 4da10416fbe..c153cefc211 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -52,13 +52,13 @@ tail -30 $log
 if [ -d /home/data/httpd/archive.eclipse.org/tm/downloads ]; then
   cd /home/data/httpd/archive.eclipse.org/tm/downloads
   cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
+  chgrp tools.tm * CVS/* 2>/dev/null
   cd /home/data/httpd/download.eclipse.org/tm/downloads
   cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
+  chgrp tools.tm * CVS/* 2>/dev/null
 
   #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}* 2>/dev/null
+  chgrp -R tools.tm drops/${buildType}*${daystamp}* 2>/dev/null
   chmod -R g+w drops/${buildType}*${daystamp}* 2>/dev/null
 fi
 
@@ -78,7 +78,7 @@ if [ -d N.latest ]; then
       echo "ERROR: missing TM-terminal-*.zip"
     fi
     cd ../N.latest
-    chgrp dsdp-tmadmin *.zip
+    chgrp tools.tm *.zip
     chmod g+w *.zip
   fi
 fi
diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh
index 6db977a97b8..8467cb2cb57 100755
--- a/releng/org.eclipse.rse.build/bin/make_signed.sh
+++ b/releng/org.eclipse.rse.build/bin/make_signed.sh
@@ -100,10 +100,10 @@ if [ "${have_server}" = "" ]; then
       rm -rf ${tmpdir}
       exit 1
     fi
-    if [ ! -d /home/data/httpd/download-staging.priv/dsdp/tm ]; then
+    if [ ! -d /home/data/httpd/download-staging.priv/tools/tm ]; then
       echo "Error: Must run on build.eclipse.org to sign"
     fi
-    cd /home/data/httpd/download-staging.priv/dsdp/tm
+    cd /home/data/httpd/download-staging.priv/tools/tm
     SIGN_TMP=tmp.$$
     mkdir ${SIGN_TMP}
     cd ${SIGN_TMP}
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index 1d818bd94c0..c2320a436fd 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -249,7 +249,7 @@ if [ ! -d updates ]; then
   if [ -d ${D} ]; then ln -s ${D} updates; else mkdir updates; fi
 fi
 if [ ! -d staging ]; then
-  D=/home/data/httpd/download-staging.priv/dsdp/tm
+  D=/home/data/httpd/download-staging.priv/tools/tm
   if [ -d ${D} ]; then ln -s ${D} staging; else mkdir staging; fi
 fi
 
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 91a2c550481..9da567a69f9 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -160,7 +160,7 @@ elif [ ${TYPE} = testSigned ]; then
     TPVERSION="${TPVERSION} ${TPTYPE}"
     echo "Working on ${TPVERSION} update site"
     echo "Signing jars from ${SITE}/../testUpdates (expecting conditioned jars)..."
-    STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
+    STAGING=/home/data/httpd/download-staging.priv/tools/tm
     stamp=`date +'%Y%m%d-%H%M'`
     if [ -d ${STAGING} -a -d ${SITE}/../testUpdates ]; then
       #get jars from testUpdates, sign them and put them here
@@ -538,7 +538,7 @@ if [ x${DO_CATEGORIES} = x1 ]; then
 fi
 
 cd $SITE
-chgrp -R dsdp-tmadmin .
+chgrp -R tools.tm .
 chmod -R g+w .
 chmod -R a+r .
 cd $curdir
diff --git a/releng/org.eclipse.rse.updatesite/bin/sign.sh b/releng/org.eclipse.rse.updatesite/bin/sign.sh
index bc0933d0f2b..a5419947211 100755
--- a/releng/org.eclipse.rse.updatesite/bin/sign.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/sign.sh
@@ -34,7 +34,7 @@ FILES=$*
 cd ..
 SITE=`pwd`
 
-STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
+STAGING=/home/data/httpd/download-staging.priv/tools/tm
 stamp=`date +'%Y%m%d-%H%M'`
 WORKDIR=${STAGING}/${stamp}
 mkdir -p ${WORKDIR}
@@ -113,7 +113,7 @@ java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
     -siteXML=$SITE/site.xml
 
 cd $SITE
-chgrp -R dsdp-tmadmin .
+chgrp -R tools.tm .
 chmod -R g+w .
 chmod -R a+r .
 cd $curdir
diff --git a/releng/org.eclipse.tm.releng/promote-I.properties b/releng/org.eclipse.tm.releng/promote-I.properties
index db3da3c77b0..8ca2683afbf 100644
--- a/releng/org.eclipse.tm.releng/promote-I.properties
+++ b/releng/org.eclipse.tm.releng/promote-I.properties
@@ -16,7 +16,7 @@ sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-tm-3.2-nightly/
 targetZipsDir=/home/data/httpd/download.eclipse.org/tm/downloads/drops/3.2.0
 
 # group owner of new files
-targetGroup=dsdp-tmadmin
+targetGroup=tools.tm
 
 # type(s) to copy (N, I, M, S, R; default to all)
 buildTypes=N,I,M,S,R
diff --git a/releng/org.eclipse.tm.releng/promote-N.properties b/releng/org.eclipse.tm.releng/promote-N.properties
index a5b25c46ee3..7311c6a58d5 100644
--- a/releng/org.eclipse.tm.releng/promote-N.properties
+++ b/releng/org.eclipse.tm.releng/promote-N.properties
@@ -15,7 +15,7 @@ sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-tm-3.2-nightly/
 targetZipsDir=/home/data/httpd/download.eclipse.org/tm/downloads/drops/3.2.0
 
 # group owner of new files
-targetGroup=dsdp-tmadmin
+targetGroup=tools.tm
 
 # type(s) to copy (N, I, M, S, R; default to all)
 buildTypes=N