{section: How to configure MPI on Windows}
 
-Known to work with Condor version: 7.5
+Known to work with HTCondor version: 7.5
 
-_Note: The good folks at Kitware have also posted a {link: http://www.itk.org/Wiki/Proposals:Condor#MPICH2_on_Windows comprehensive webpage detailing their setup using mpich2 with Condor on Windows}_
+_Note: The good folks at Kitware have also posted a {link: http://www.itk.org/Wiki/Proposals:Condor#MPICH2_on_Windows comprehensive webpage detailing their setup using mpich2 with HTCondor on Windows}_
 
 {subsection:Installation}
 
@@ -22,13 +22,13 @@
 
 The final step is to disble the SMPD service.  Using the *Microsoft Managment Console*, open the *Services Common Console Document*.  Find the entry labelled *MPICH2 Process Manager, Argonne National Lab* and modify it's properties such that it is inactive and will no longer start on boot.
 
-We do this so that Condor can manage the MPI processes itself.  That is, we will configure Condor such that it can start, stop and monitor any or all of the MPI related process.
+We do this so that HTCondor can manage the MPI processes itself.  That is, we will configure HTCondor such that it can start, stop and monitor any or all of the MPI related process.
 
 {subsection: Configuration}
 
-The aim of installing MPICH2 is to use it in conjunction with Condor.  To this end, we need to make some changes to Condor's configuration, as well as edit some helper scripts.
+The aim of installing MPICH2 is to use it in conjunction with HTCondor.  To this end, we need to make some changes to HTCondor's configuration, as well as edit some helper scripts.
 
-The following will let Condor manage the =smpd.exe= daemon rather than the Windows Service Manager:
+The following will let HTCondor manage the =smpd.exe= daemon rather than the Windows Service Manager:
 
 {code}
 ##
@@ -39,7 +39,7 @@
 SMPD_SERVER_ARGS = -p 6666 -d 1
 
 ##
-# We are letting Condor spawn and manage the smpd.exe server
+# We are letting HTCondor spawn and manage the smpd.exe server
 # for us, so we need to tell the condor_master on this machine
 # to spawn a smpd.exe server, in addition to any other daemons
 # it is configured to run.
@@ -47,10 +47,10 @@
 DAEMON_LIST = $(DAEMON_LIST), SMPD_SERVER
 {endcode}
 
-Unlike the Condor daemons, we cannot define a log file for the =smpd.exe= daemon in the Condor configuration file, ao we must do this manually:
+Unlike the HTCondor daemons, we cannot define a log file for the =smpd.exe= daemon in the HTCondor configuration file, ao we must do this manually:
 
 {code}
-C:\> smpd.exe -set logfile C:\condor\log\SmpdLog
+C:\> smpd.exe -set logfile C:\HTCondor\log\SmpdLog
 logfile = C:\condor\log\SmpdLog
 {endcode}
 
@@ -74,11 +74,11 @@
 STARTD_EXPRS 	= $(STARTD_EXPRS), DedicatedScheduler
 {endcode}
 
-This configuration will allow Condor to always runs jobs.
+This configuration will allow HTCondor to always runs jobs.
 
 {subsection:Helper Script}
 
-Once Condor has been configured to run parallel jobs, we must create a helper script such that Condor can use it to interact with the new MPICH2 installation.
+Once HTCondor has been configured to run parallel jobs, we must create a helper script such that HTCondor can use it to interact with the new MPICH2 installation.
 
 The following can be used as a base for a more complex driver:
 
@@ -100,7 +100,7 @@
 
 {subsection:Submitting a an MPI Job}
 
-For our purposes we will use the sample shipped with the Windows version of MPICH2 to demostrate how to use Condor and MPI on Windows:
+For our purposes we will use the sample shipped with the Windows version of MPICH2 to demostrate how to use HTCondor and MPI on Windows:
 
 {code}
 C:\demo> cp "C:\Program Files\MPICH2\examples\cpi.exe" .
@@ -138,7 +138,7 @@
 
 Where =mp2script.bat= is the helper script, and =input.file= is the input file.
 
-Now we can submit our MPI application to Condor:
+Now we can submit our MPI application to HTCondor:
 
 {code}
 C:\demo> condor_submit parallel.submit