This is all for the old BATLab (nmi-s00*.cs.wisc.edu).  For the new BATLab (submit-*.batlab.org), see BatLabBuild.
 
-{section: Building Condor in NMI}
+{section: Building HTCondor in NMI}
 
 {subsection:Resubmitting last night's builds, or one-off nightlys}
 See ResubmitLastNightsBuilds for a one-off reusing last night's tag, or using a new tag.
@@ -9,7 +9,7 @@
 
 Significant new features should be committed into the git repository on their own branch, and this branch should successfully build and pass all regression tests on all supported platforms _before_ the code is merged back into the master branch.
 
-*WARNING* As of 2010-05-12, NMI pulls its repository from the public Condor repository (http://condor-git.cs.wisc.edu/repos/condor.git).  As such, it only includes public branches.  Thus, random other working branches will not generally be available, and the following _will not work_.
+*WARNING* As of 2010-05-12, NMI pulls its repository from the public HTCondor repository (http://condor-git.cs.wisc.edu/repos/condor.git).  As such, it only includes public branches.  Thus, random other working branches will not generally be available, and the following _will not work_.
 
 *Step-by-step instructions:*
 1: Log into nmi-s006.cs.wisc.edu (get an account if necessary).
@@ -79,7 +79,7 @@
 --append 'append_requirements=Machine!="nmi-0102.batlab.cs.wisc.edu"'
 {endcode}
 
-{subsection: Building a Condor workspace in NMI}
+{subsection: Building a HTCondor workspace in NMI}
 
 Here is a common scenario: You would like to do a build on some platform or set of platforms in order to ensure that you haven't broken the build process. What are your options? You could check in the code and wait for the nightly builds, but you may well break the build and receive fifty lashes with a wet noodle. A better solution is to *not* check in your code, but use NMI to build it on any platform that you like.
 
@@ -121,7 +121,7 @@
 Some important options:
 
 *: =--without-tests= suppresses the automatic submission of tests when the build is done.
-*: =--platforms= takes a comma separated list of platforms. Omitting it will build your workspace on all platforms Condor supports. For a list of available platforms, see "Platforms" below.
+*: =--platforms= takes a comma separated list of platforms. Omitting it will build your workspace on all platforms HTCondor supports. For a list of available platforms, see "Platforms" below.
 *: =--use-externals-cache= uses cached externals to speed the build. If you're testing a new external, do *not* use this option.
 *: =--release-only= builds the dynamic binaries, but doesn't package or return them. If you're just doing a compile test and don't need the binaries, this will speed the build by about 45 minutes. If you need to generate a package to give to a user (or to submit for testing), omit this option.
 *: =--desc= specifies a description that appears in the NMI web pages and can help identify your build.
@@ -152,7 +152,7 @@
   vm2@nmi-solaris10.cs.wisc.edu| sun4u_sol_5.9   | Claimed   | Busy       |     15:18:113 | cndrauto@cs.wisc.ed| 11336
   janet.cs.wisc.edu            | x86_winnt_5.1   | Unclaimed | Idle       |     03:34:209 | (None)             | (None)
 
-{subsection: Testing a Condor NMI workspace build in NMI}
+{subsection: Testing a HTCondor NMI workspace build in NMI}
 
 Assuming you're still in the nmi_tools subdirectory of your workspace, and that your build with runid 1234 is completed, you can submit a test run with the following:
 
@@ -162,7 +162,7 @@
 
 {subsection: Checking your build's status}
 
-The NMI job status page is at http://nmi-s006.cs.wisc.edu/nmi/?page=results/overview. There's a Condor-specific page at http://nmi-s006.cs.wisc.edu/results/Run-condor.php.
+The NMI job status page is at http://nmi-s006.cs.wisc.edu/nmi/?page=results/overview. There's a HTCondor-specific page at http://nmi-s006.cs.wisc.edu/results/Run-condor.php.
 
 {subsection: Extracting your binaries}