-{section: DRAFT Welcome to the Condor Administrator Wiki}
+{section: DRAFT Welcome to the HTCondor Administrator Wiki}
 
 
 <html>
@@ -9,8 +9,8 @@
 
 *Administrators*
 *: {wiki: HowToAdminRecipes Administrator HOWTO Recipes}
-*: {wiki: CondorPortsTable The Condor Ports Table}
-*: {link: http://www.cs.wisc.edu/condor/security/ Security Issues In Condor}
+*: {wiki: CondorPortsTable The HTCondor Ports Table}
+*: {link: http://www.cs.wisc.edu/condor/security/ Security Issues In HTCondor}
 
 
 <html>
@@ -38,15 +38,15 @@
 *: {wiki: HowToInsertClassAdIntoMachineAds How to insert custom ClassAd attributes into a machine ad}
 *: {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}
 
 <html>
 </td>