-{section: DRAFT Welcome to the Condor Development Wiki}
+{section: DRAFT Welcome to the HTCondor Development Wiki}
 Some pages need condensing to a sub page, but this is the general idea.
 
 <html>
@@ -12,11 +12,11 @@
 *: {wiki: DeveloperReleasePlan Tickets targeted for the next release}
 *: {link: http://www.cs.wisc.edu/condor/overview/ Non-technical overview}
 *: {link: http://www.cs.wisc.edu/condor/developers/overview.html Technical overview} [pull off of developer site and put into wiki so no password required]
-*: {wiki: CondorMailingLists Condor Mailing Lists}
+*: {wiki: CondorMailingLists HTCondor Mailing Lists}
 *: {wiki: TicketSubmissionGuideLines Ticket Submission Guide Lines}
 *: {wiki: DevTutorials Developer Tutorials}
-*: {wiki: PortingCondorInfo Porting Condor Info} [put into tutorial]
-*: {wiki: CreatingPersonalCondor Creating a Personal Condor} [put into tutorial]
+*: {wiki: PortingCondorInfo Porting HTCondor Info} [put into tutorial]
+*: {wiki: CreatingPersonalCondor Creating a Personal HTCondor} [put into tutorial]
 *: {wiki: CreatingNewDaemons Creating a new daemon} [put into tutorial]
 *: {wiki: AuthoringSuccessfulPatch Authoring a Successful Patch}
 *: {wiki: ManualEntryGuidelines Manual Entry Guidelines}
@@ -26,7 +26,7 @@
 *:: {wiki: BuildingCondorOnWindows Windows}
 *: *Testing*
 *:: {wiki: TestAddHowto Test Suite Overview}
-*:: {wiki: TestingCondorOnWindows Testing Condor on Windows}
+*:: {wiki: TestingCondorOnWindows Testing HTCondor on Windows}
 
 *Core Developers @ UW-Madison*
 
@@ -38,7 +38,7 @@
 *: {link: http://bonsai.cs.wisc.edu/gitweb/gitweb.cgi GitWeb} (and deprecated {link: http://bonsai.cs.wisc.edu/bonsai/cvsqueryform.cgi Bonsai})
 *: {link: http://www.cs.wisc.edu/condor/developers/download_stats/downloads.html Download Analysis}
 *: {link: http://tonic.cs.wisc.edu:5467 Coverity-found bugs}
-*: {wiki: NmiBuild Building Condor on NMI}
+*: {wiki: NmiBuild Building HTCondor on NMI}
 *: {wiki: NmiBuildOlderRelease Building an Older Release in NMI}
 *: {wiki: ReleasePunchList Release Punch-List}
 *: {wiki: ReportWritingTips Git Trac Report Writing Tips}
@@ -67,8 +67,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}
 
 *Wisdom*
 
@@ -77,7 +77,7 @@
 *: SyscallMode (Feb. 1999)
 *: JavaUniverse (Dec. 2001)
 *: {wiki: MpiWisdom MPI Wisdom} (July 2002)
-*: {wiki: CodingGuidelinesAndRulesForImake Coding Guidlines/Rules when using Imake in the Condor build system} (May 2004)
+*: {wiki: CodingGuidelinesAndRulesForImake Coding Guidlines/Rules when using Imake in the HTCondor build system} (May 2004)
 *: {link: http://www.cs.wisc.edu/condor/developers/ports.html Ports and Where They Work}
 *: details about {wiki: DetailsAboutCondorStats condor_stats} (Jan 2004)
 *: {wiki: AddingNewComponentToBuildTree Adding a new component to build tree} (Jan 2004)
@@ -89,9 +89,9 @@
 *: {wiki: WindowsDebugging Windows Debugging}
 *: {link: http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html GCC Inline Assembly Tutorial}
 *: {wiki: WisdomGsiSetup HOWTO quickly setup GSI Security for testing}
-*: {wiki: EmacsSettingsForCondorCodingStyle Emacs Settings For Condor Coding Style}
+*: {wiki: EmacsSettingsForCondorCodingStyle Emacs Settings For HTCondor Coding Style}
 
-*People who maintain and author Condor*
+*People who maintain and author HTCondor*
 *: {wiki:DeveloperHomePages Developer Home Pages}
 
 <html>