-The optional contribution modules (aka "contribs") are tools or plugins operating on top of Condor. None of them underlie the Condor development cycle and the Condor team does not provide support for most of them (exceptions are described in the respective module). Many of the modules are hosted within Condor's git repository in the condor_contrib folder and are distributed with the Condor source release, however, they are not part of Condor's release binaries.
+The optional contribution modules (aka "contribs") are tools or plugins operating on top of HTCondor. None of them underlie the HTCondor development cycle and the HTCondor team does not provide support for most of them (exceptions are described in the respective module). Many of the modules are hosted within HTCondor's git repository in the condor_contrib folder and are distributed with the HTCondor source release, however, they are not part of HTCondor's release binaries.
 
 If you want to provide your own contrib module, please follow the instructions on the wiki page ProvideContribModules.
 
 {section: List of current optional contribution modules}
-{subsection: Condor Quill}
-Quill stores job history data persistently in a database and allows Condor tools to query the database.
+{subsection: HTCondor Quill}
+Quill stores job history data persistently in a database and allows HTCondor tools to query the database.
 See: CondorQuill
-{subsection: Condor DBQ}
-Condor DBQ provides a relational database management system interface to Condor.
+{subsection: HTCondor DBQ}
+HTCondor DBQ provides a relational database management system interface to HTCondor.
 See: CondorDbq
-{subsection: Condor Pigeon}
+{subsection: HTCondor Pigeon}
 Pigeon allows queuing and forwarding of user log messages via AMQP. It consists of a broker and client tools.
 See: CondorPigeon
-{subsection: Condor Aviary}
+{subsection: HTCondor Aviary}
 An alternative SOAP API to Birdbath that uses WSO2 and Axis2/C.
 See: CondorAviary
 {subsection:  CondorAgent }
-An alternative API to the Condor scheduler based on a REST interface. {quote: CondorAgent} is a program that runs beside a Condor scheduler. It provides enhanced access to scheduler-based data and scheduler actions via a HTTP-based REST interface. {quote: CondorAgent} is deployed as either a shell script wrapped Python program (which requires Python 2.4 or greater) or as a Windows binary (which does not require a local Python installation).
+An alternative API to the HTCondor scheduler based on a REST interface. {quote: CondorAgent} is a program that runs beside a HTCondor scheduler. It provides enhanced access to scheduler-based data and scheduler actions via a HTTP-based REST interface. {quote: CondorAgent} is deployed as either a shell script wrapped Python program (which requires Python 2.4 or greater) or as a Windows binary (which does not require a local Python installation).
 See: https://github.com/cyclecomputing/condor-agent
-{subsection: Condor Plumage}
+{subsection: HTCondor Plumage}
 A NoSQL operational data store framework that uses mongodb.
 See: CondorPlumage
 {subsection: CondorLogViewer}
@@ -27,12 +27,12 @@
 {subsection: CondorView}
 A resource viewer.
 See: CondorView
-{subsection: DMTCP/Condor Integration}
+{subsection: DMTCP/HTCondor Integration}
 DMTCP is a third part user space checkpointing library which, through a
 shim script and extra information in one's submit description file, can
 checkpoint vanilla universe jobs. See: DmtcpCondor
-{subsection: QMF management suite for Condor}
-QMF is a set of pluggable modules that assemble a suite for managing Condor jobs. It uses Apache Qpid for message transport
+{subsection: QMF management suite for HTCondor}
+QMF is a set of pluggable modules that assemble a suite for managing HTCondor jobs. It uses Apache Qpid for message transport
 See: QmfSuite
 {subsection: QMF trigger daemon}
 This daemon raises QMF Events based upon user defined ClassAd queries.
@@ -40,8 +40,8 @@
 {subsection: Stork}
 Stork is a batch scheduler specialized in data placement and data movement, which is based on the concept and ideal of making data placement a first class entity in a distributed computing environment.
 See: http://www.storkproject.org
-{subsection: Remote Condor}
-Remote Condor allows a user to submit and monitor batch jobs through a remote instance of Condor from his or her computer without having to install Condor locally.
+{subsection: Remote HTCondor}
+Remote HTCondor allows a user to submit and monitor batch jobs through a remote instance of HTCondor from his or her computer without having to install HTCondor locally.
 See: RemoteCondor
 {subsection: CL-MW: A Master/Slave Distributed Computing Library in Common Lisp}
 See: ClMw