-We have found it useful to stress-test a release candidate by giving it to Igor Sfiligoi to run in =glideinWMS=.  This exercises a lot of Condor features that are important to OSG-type users: glidein, Condor-G, CE schedd, CCB.  Igor suggested that it would be a good idea of we could run this test in-house, and we agree, so we have set up the machinery to do so.  This document describes roughly how we installed it.
+We have found it useful to stress-test a release candidate by giving it to Igor Sfiligoi to run in =glideinWMS=.  This exercises a lot of HTCondor features that are important to OSG-type users: glidein, HTCondor-G, CE schedd, CCB.  Igor suggested that it would be a good idea of we could run this test in-house, and we agree, so we have set up the machinery to do so.  This document describes roughly how we installed it.
 
 {section: High-level View}
 
@@ -6,9 +6,9 @@
 
 *: *CE: vdt-itb.cs.wisc.edu* - an OSG CE that is part of the ITB (integration test bed).  This node will be referred to as the CE.  The schedd on this node is part of the ghost pool.  The jobmanager is vdt-itb.cs.wisc.edu/jobmanager-nfslitecondor.
 
-*: *factory: c157.cs.wisc.edu* - the glideinWMS factory, installed in /data1/itb-stress.  It submits glideins to the CE.  This node is part of the GLOW pool (despite its domain name).  It normally runs condor jobs.  Turn off condor when doing a large-scale test.
+*: *factory: c157.cs.wisc.edu* - the glideinWMS factory, installed in /data1/itb-stress.  It submits glideins to the CE.  This node is part of the GLOW pool (despite its domain name).  It normally runs HTCondor jobs.  Turn off HTCondor when doing a large-scale test.
 
-*: *submit: c158.cs.wisc.edu* - the glideinWMS VO frontend, user job submission node, and collector tree for the glidein pool, all installed in /data1/itb-stress.  This node normally runs condor jobs.  Turn off condor when doing a large-scale test.
+*: *submit: c158.cs.wisc.edu* - the glideinWMS VO frontend, user job submission node, and collector tree for the glidein pool, all installed in /data1/itb-stress.  This node normally runs HTCondor jobs.  Turn off HTCondor when doing a large-scale test.
 
 
 {section: glidein factory setup}
@@ -71,7 +71,7 @@
 
 
 choose [4] pool Collector
-Where do you have the Condor tarball? /afs/cs.wisc.edu/p/condor/public/binaries/v7.4/7.4.1/condor-7.4.1-linux-x86_64-rhel5-dynamic.tar.gz
+Where do you have the HTCondor tarball? /afs/cs.wisc.edu/p/condor/public/binaries/v7.4/7.4.1/condor-7.4.1-linux-x86_64-rhel5-dynamic.tar.gz
 
 Where do you want to install it?: [/home/zmiller/glidecondor] /data1/itb-stress/glidecondor
 Where are the trusted CAs installed?: [/data1/itb-stress/osg_1_2_4/globus/TRUSTED_CA] /etc/grid-security/certificates
@@ -97,7 +97,7 @@
 
 Give a name to this Glidein Factory?: [mySites-c157] ITB-Stress
 
-Do you want to use CCB (requires Condor 7.3.0 or better)?: (y/n) y
+Do you want to use CCB (requires HTCondor 7.3.0 or better)?: (y/n) y
 Do you want to use gLExec?: (y/n) n
 Force VO frontend to provide its own proxy?: (y/n) [y]
 Do you want to fetch entries from RESS?: (y/n) [n]
@@ -109,7 +109,7 @@
 Work dir for 'ITB':
 Site name for 'ITB': [ITB]
 
-Should glideins use the more efficient Match authentication (works for Condor v7.1.3 and later)?: (y/n) y
+Should glideins use the more efficient Match authentication (works for HTCondor v7.1.3 and later)?: (y/n) y
 Do you want to create the glidein (as opposed to just the config file)?: (y/n) [n]
 
 /data1/itb-stress/glideinWMS/creation/create_glidein /data1/itb-stress/glideinsubmit/glidein_v1_0.cfg/glideinWMS.xml
@@ -157,9 +157,9 @@
 
 I had to remove the gass cache on the CE to make this change take effect!
 
-Then there was a problem with the glidein condor binaries being incompatible with the SL4 machines in CHTC.  To change the binaries used by the glidein:
+Then there was a problem with the glidein HTCondor binaries being incompatible with the SL4 machines in CHTC.  To change the binaries used by the glidein:
 
-I unpackd the desired condor tarball and named it
+I unpackd the desired HTCondor tarball and named it
 /data1/itb-stress/condor_versions/7.4.1_x86_rhel3.  I then edited
 glideinsubmit/glidein_v1_0.cfg/glideinWMS.xml.  Remove the existing entry in
 condor_tarballs and replace with this:
@@ -201,7 +201,7 @@
 [5] User Schedd
 Please select: 4,5
 
-Where do you have the Condor tarball? /afs/cs.wisc.edu/p/condor/public/binaries/v7.4/7.4.1/condor-7.4.1-linux-x86_64-rhel5-dynamic.tar.gz
+Where do you have the HTCondor tarball? /afs/cs.wisc.edu/p/condor/public/binaries/v7.4/7.4.1/condor-7.4.1-linux-x86_64-rhel5-dynamic.tar.gz
 
 Where do you want to install it?: [/home/zmiller/glidecondor] /data1/itb-stress/glidecondor
 
@@ -221,7 +221,7 @@
 
 Installing user submit schedds
 
-Do you want to use the more efficient Match authentication (works for Condor v7.1.3 and later)?: (y/n) y
+Do you want to use the more efficient Match authentication (works for HTCondor v7.1.3 and later)?: (y/n) y
 How many secondary schedds do you want?: [9]
 
 ./glideinWMS_install
@@ -287,10 +287,10 @@
 
 {section: setting up CE}
 
-The CE on vdt-itb.cs.wisc.edu was already set up except for a condor jobmanager.
+The CE on vdt-itb.cs.wisc.edu was already set up except for a HTCondor jobmanager.
 
 {verbatim}
-SET UP CONDOR
+SET UP HTCondor
 
 1) installed condor-rhel5.repo into /etc/yum.repo.d