*: {wiki: HowToConfigCollectors How to configure multi-tier collectors}
 *: {wiki: HowToConfigPrioritiesForUsers How to configure priorities/quotas for groups of users}
 *: {wiki: HowToConfigJobMonitoringandDebugging How to configure pseudo-interactive job monitoring/debugging}
-*: {wiki: HowToConfigRunOneJobAndExit How to configure Condor on a worker node to run one job and then exit}
+*: {wiki: HowToConfigRunOneJobAndExit How to configure HTCondor on a worker node to run one job and then exit}
 *: {wiki: HowToDisableFairSharing How to disable fair sharing}
 *: {wiki: HowToDisablePreemption How to disable preemption}
 *: {wiki: HowToHaveExecuteMachines How to have execute machines belong to multiple pools}
@@ -28,20 +28,20 @@
 *: {wiki: HowToReserveSlotForSpecialJobs How to reserve a slot or machine for special jobs}
 *: {wiki: HowToLimitDiskUsageOfJobs How to limit disk usage of jobs}
 *: {wiki: HowToLimitMemoryUsage How to limit memory usage of jobs}
-*: {wiki: HowToManageLargeCondorPools How to manage a large Condor pool}
-*: {wiki: HowToMonitorCondorPoolUsage How to monitor condor pool usage}
+*: {wiki: HowToManageLargeCondorPools How to manage a large HTCondor pool}
+*: {wiki: HowToMonitorCondorPoolUsage How to monitor HTCondor pool usage}
 *: {wiki: HowToScavengeCycles How to scavenge cycles from PBS}
 *: {wiki: HowToSetUserPriority How to set user priority factors automatically by domain or other username pattern}
-*: {wiki: HowToShutDownCondor How to shut down Condor without killing jobs}
+*: {wiki: HowToShutDownCondor How to shut down HTCondor without killing jobs}
 *: {wiki: HowToSteerJobs How to steer jobs towards more desirable machines}
 *: {wiki: HowToSuspendJobs How to suspend jobs in place of preemption}
 *: {wiki: HowToSuspendJobsWithAdmin How to suspend jobs with an administative command}
-*: {wiki: HowToUpgradeCondorGracefully How to upgrade Condor gracefully}
+*: {wiki: HowToUpgradeCondorGracefully How to upgrade HTCondor gracefully}
 *: {wiki: HowToManageGpus How to manage GPUs (OpenCL, CUDA)}
 *: {wiki: HowToDebugClassAdExpressions How to debug complicated ClassAd expressions}
 *: {wiki: HowToPackParallelJobs How to schedule parallel universe jobs to use the minimum number of physical machines}
 *: {wiki: HowToEnableIpvSix How to enable IPv6 in the 7.7.x release series}
-*: {wiki: HowToRunServices How to run services in Condor}
+*: {wiki: HowToRunServices How to run services in HTCondor}
 *: {wiki: HowToMakeShortLivedStartdsDisappearFromCollector How to make Cloud or Glidein startds disappear from the collector faster.}
 
 <html>
@@ -54,14 +54,14 @@
 *: {wiki: HowToCheckpoint How to checkpoint vanilla universe jobs}
 *: {wiki: HowToWriteaCondorqWrapper How to write a condor_q wrapper}
 *: {wiki: HowToRunOneCommandOnEachMachine How to run a command on each machine within a pool}
-*: {wiki: ExcelJobs How to automate Excel calculations in Condor}
-*: {wiki: RstatJobs Jobs for R: How to automate R jobs in Condor}
+*: {wiki: ExcelJobs How to automate Excel calculations in HTCondor}
+*: {wiki: RstatJobs Jobs for R: How to automate R jobs in HTCondor}
 *: {wiki: HowToRunMatlab How to run Matlab jobs}
 *: {wiki: AvoidingBlackHoles  How to avoid sending jobs to Black Hole nodes}
 *: {wiki: HowToAvoidJobRestarts How to avoid jobs being restarted}
-*: {wiki: MapReduce How to run Hadoop MapReduce jobs with Condor}
+*: {wiki: MapReduce How to run Hadoop MapReduce jobs with HTCondor}
 *: {wiki: UseVisibleDesktopVista How to get USE_VISIBLE_DESKTOP to work on Vista/Win7}
-*: {wiki: DagManUnderCondorc How to submit dagman itself as a condor-c job}
+*: {wiki: DagManUnderCondorc How to submit dagman itself as a HTCondor-c job}
 *: {wiki: HeterogeneousSubmitBatch A batch script that can run on any platform enables heterogeneous submission of jobs}
 <html>
 </td>