{section: Overview}
 
-For instructions on building Condor in releases *prior to 7.5.5*, see {wiki: BuildingCondorPriorToCmakeOnWindows Building Condor prior to 7.5.5 on Windows}.
+For instructions on building HTCondor in releases *prior to 7.5.5*, see {wiki: BuildingCondorPriorToCmakeOnWindows Building HTCondor prior to 7.5.5 on Windows}.
 
 For information about the conversion of the build process from project files to cmake see {wiki: BuildModernization}
 
-{section: Building Condor with cmake on Windows}
+{section: Building HTCondor with cmake on Windows}
 {subsection: Prerequisites }
 
-In order to build Condor on Windows, the following prerequisites are required. They need to be in the PATH before you can build. There is a batch file =msconfig\set_build_env.bat= in the condor sources that will locate the installed prerequisites and set the PATH for you if you don't wish to add them to your global PATH.
+In order to build HTCondor on Windows, the following prerequisites are required. They need to be in the PATH before you can build. There is a batch file =msconfig\set_build_env.bat= in the HTCondor sources that will locate the installed prerequisites and set the PATH for you if you don't wish to add them to your global PATH.
 
 1: Cmake 2.8.3 or later, the =Cmake\bin= directory should be added your PATH.
 *::http://www.cmake.org/cmake/resources/software.html
@@ -19,7 +19,7 @@
 
 3: [Optional] Start Visual Studio and Open Tools->Options under "Projects and Solutions" click on VC++ Directories and add the following to the *Executable* directories.  This is not needed if you use =msconfig\set_build_env.bat= to set the PATH before you build.
 *::$(SolutionDir)\msconfig
-*::Move $(PATH) to the bottom as sometimes C:\cygwin\bin is in the $(PATH) which can cause issues with condor's bundled binaries.
+*::Move $(PATH) to the bottom as sometimes C:\cygwin\bin is in the $(PATH) which can cause issues with HTCondor's bundled binaries.
 
 3: Install Active Perl. Add it to your PATH.
 *::http://www.activestate.com/activeperl/downloads
@@ -30,10 +30,10 @@
 5: Install the Windows Platform SDK. (may depend on .NET 2.0). Any version of the Platform SDK should be fine.  SDK 6.1 and 7.0 are both known to work.
 *::http://msdn.microsoft.com/en-us/windows/bb980924
 
-1: [Optional but Recommended] Install 7-zip. Add it to your PATH.  7-zip is not needed to build, but it is needed to make the condor .ZIP file.  You will not be able to build the PACKAGE target witout 7-zip.
+1: [Optional but Recommended] Install 7-zip. Add it to your PATH.  7-zip is not needed to build, but it is needed to make the HTCondor .ZIP file.  You will not be able to build the PACKAGE target witout 7-zip.
 *::http://www.7-zip.org/download.html
 
-1: [Optional] install git and add it to your PATH, git is one way to get the Condor sources. It is not needed if you already have the sources.
+1: [Optional] install git and add it to your PATH, git is one way to get the HTCondor sources. It is not needed if you already have the sources.
 *::http://git-scm.com/download
 
 6: [Optional] Install WiX 3.0 on your windows machine (Depends on Visual Studio). WiX is not needed to build, but it is needed to create the MSI installer.
@@ -43,13 +43,13 @@
 
 1.) Open a windows commmand prompt
 
-2.) Checkout origin/master from the git repository, or download the Condor Sources http://www.cs.wisc.edu/condor/downloads-v2/download.pl
+2.) Checkout origin/master from the git repository, or download the HTCondor Sources http://www.cs.wisc.edu/condor/downloads-v2/download.pl
 
 3.) navigate to CONDOR_SRC
 
-4.) add cmake\bin to your PATH if it is not already. One way to do this is to execute =CONDOR_SRC\msconfig\set_build_env.bat=.  This will setup PATH, LIB, and INCLUDE environment variables to build Condor.  If this batch file cannot find cmake.exe It will report an error.
+4.) add cmake\bin to your PATH if it is not already. One way to do this is to execute =CONDOR_SRC\msconfig\set_build_env.bat=.  This will setup PATH, LIB, and INCLUDE environment variables to build HTCondor.  If this batch file cannot find cmake.exe It will report an error.
 
-5.) [Optional] If you want to use cached externals set the environment variable =CONDOR_BLD_EXTERNAL_STAGE= to the path of the externals cache.  Using cached externals can save a lot of time if you plan to build condor more than once.  For example
+5.) [Optional] If you want to use cached externals set the environment variable =CONDOR_BLD_EXTERNAL_STAGE= to the path of the externals cache.  Using cached externals can save a lot of time if you plan to build HTCondor more than once.  For example
 {code}
 set CONDOR_BLD_EXTERNAL_STAGE=c:\scratch\condor_externals
 {endcode}
@@ -58,7 +58,7 @@
 {code}
 cmake -G "Visual Studio 9 2008" .
 {endcode}
-for out-of-source builds, navigate to the build destination folder and execute cmake; passing it the path to the condor sources. For example
+for out-of-source builds, navigate to the build destination folder and execute cmake; passing it the path to the HTCondor sources. For example
 {code}
 // assuming that the current directory is CONDOR_SRC
 set _condor_sources=%CD%
@@ -66,7 +66,7 @@
 cd /d c:\scratch\condor\build_dest
 cmake CMakeLists.txt -G "Visual Studio 9 2008" %_condor_sources%
 {endcode}
-This will create Visual Studio Project and Solution files to build condor.
+This will create Visual Studio Project and Solution files to build HTCondor.
 Many options can be passed to cmake, see CondorCmakeBuildOptions for more information. You can also use the cmake-gui to set options.
 
 6.) Once you have used cmake to build Condor.sln, you can build on the command line or interactively.  The options are
@@ -84,7 +84,7 @@
 Build the *tests* target in the Condor.sln Solution File. Once built you can run all the batch tests as before.
 
 {subsection: Copying Build results to the release Directory}
-There is a cmake file that will copy the build products to the correct subdirectories of a condor installation. This can be used to overwrite an existing Condor install, or to layout the condor files in preparation for making the installer.
+There is a cmake file that will copy the build products to the correct subdirectories of a HTCondor installation. This can be used to overwrite an existing HTCondor install, or to layout the HTCondor files in preparation for making the installer.
 
 {code}
 cmake -DCMAKE_INSTALL_PREFIX:PATH=c:\scratch\condor\release_dir -P cmake_install.cmake