-{section: Welcome to the Condor Flightworthy Development Wiki}
+{section: Welcome to the HTCondor Flightworthy Development Wiki}
 
 <html>
 <table>
@@ -8,18 +8,18 @@
 
 {subsection: User FAQs}
 *: {wiki: GettingStarted Getting Started!}
-*: {wiki: HowToAdminRecipes Condor HOWTO Recipes for configuration, fancy tricks}
+*: {wiki: HowToAdminRecipes HTCondor HOWTO Recipes for configuration, fancy tricks}
 *: {wiki: MakingContributions How to submit a source code patch}
 *: {wiki: ContribModules List of optional contribution modules "contribs"}
-*: {wiki: DagManUnderCondorc Running DAGMan itself as a Condor-C job}
-*: {wiki: SoapWisdom Using SOAP with Condor} - includes a Python/suds example
+*: {wiki: DagManUnderCondorc Running DAGMan itself as a HTCondor-C job}
+*: {wiki: SoapWisdom Using SOAP with HTCondor} - includes a Python/suds example
 *: {link: http://www.cs.wisc.edu/condor/developers/ports.html Ports and Where They Work}
 *: {wiki: PortsTable The Ports Table}
 
-{subsection: People who maintain and author Condor}
+{subsection: People who maintain and author HTCondor}
 
 *: {wiki:DeveloperHomePages Developer Home Pages}
-*: {wiki:CondorContributors Condor Contributors Past and Present}
+*: {wiki:CondorContributors HTCondor Contributors Past and Present}
 
 {subsection: Really Important Stuff}
 
@@ -31,19 +31,19 @@
 *: {wiki: PublicGitRepo Info on how gitweb is updated} and which branches are mirrored to gitweb
 *: {link: http://www.cs.wisc.edu/condor/developers/download_stats/downloads.html Download Analysis}
 *: {link: http://tonic.cs.wisc.edu:8080 Coverity-found bugs}
-*: {link: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=condor Debian bug tracker, Condor issues}
+*: {link: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=condor Debian bug tracker, HTCondor issues}
 *: {wiki: ReleaseHistory Release History - Ticket counts by series}
 
-{subsection: <A NAME="BuildingAndTestingCondor"></A>Building and Testing Condor}
+{subsection: <A NAME="BuildingAndTestingCondor"></A>Building and Testing HTCondor}
 
-*: {wiki: DownloadingSource Download Condor source code}
-*: {wiki: BuildingCondorOnUnix Building Condor on Unix}
-*: {wiki: TestingCondorOnUnix Testing Condor on Unix}
-*: {wiki: BuildingCondorOnWindows Building Condor on Windows}
-*: {wiki: TestingCondorOnWindows Testing Condor on Windows}
-*: {wiki: BatLabBuild Building Condor in BATLab} - New BATLab
-*: {wiki: NmiBuild Building Condor in NMI} - Old BATLab
-*: {wiki: NmiTest Testing Condor in NMI}
+*: {wiki: DownloadingSource Download HTCondor source code}
+*: {wiki: BuildingCondorOnUnix Building HTCondor on Unix}
+*: {wiki: TestingCondorOnUnix Testing HTCondor on Unix}
+*: {wiki: BuildingCondorOnWindows Building HTCondor on Windows}
+*: {wiki: TestingCondorOnWindows Testing HTCondor on Windows}
+*: {wiki: BatLabBuild Building HTCondor in BATLab} - New BATLab
+*: {wiki: NmiBuild Building HTCondor in NMI} - Old BATLab
+*: {wiki: NmiTest Testing HTCondor in NMI}
 *: {wiki: ResubmitLastNightsBuilds Resubmitting nightly builds in NMI}
 *: {wiki: IgorStressTest} The Igor Stress Test
 *: {wiki: ContinuousBuildAndTestsInNmi Continuous build and tests in NMI}
@@ -53,9 +53,9 @@
 
 *: {link: http://www.cs.wisc.edu/condor/overview/ Non-technical overview}
 *: {wiki: DeveloperTechnicalOverview Technical overview}
-*: {wiki: PortingCondorInfo Porting Condor Info}
-*: {wiki: CreatingPersonalCondor Creating a Personal Condor}
-*: {wiki: EmacsSettingsForCondorCodingStyle Emacs Settings For Condor Coding Style}
+*: {wiki: PortingCondorInfo Porting HTCondor Info}
+*: {wiki: CreatingPersonalCondor Creating a Personal HTCondor}
+*: {wiki: EmacsSettingsForCondorCodingStyle Emacs Settings For HTCondor Coding Style}
 
 {subsection: Information for Collaborators}
 
@@ -68,8 +68,8 @@
 *: {wiki: CodeCruft List of cruft that could be expunged from the code}
 *: {wiki: DevelopersEnhancements 7.3 series enhancements}
 *: DraftWikiHomePage
-*: {wiki: IpvSixWorkNote Condor IPv6 Port Work Note}
-*: {wiki: IpvSixWorkNoteTwo Condor IPv6 Port Work Note second}
+*: {wiki: IpvSixWorkNote HTCondor IPv6 Port Work Note}
+*: {wiki: IpvSixWorkNoteTwo HTCondor IPv6 Port Work Note second}
 *: {wiki: NeosMigration NEOS Server Migration}
 *: {wiki: WindowsInstallerConfig Windows Installer Config}
 *: {wiki: StreamingCe Streaming CE Requirements}
@@ -94,7 +94,7 @@
 *: #1377 How our download pages work.
 *: #1397 How our nightly builds work.
 *: {wiki: DaemonMeditations Daemon Meditations - Control flows in daemons}
-*: {wiki: StdUnivPorting Standard Universe Porting Information - Port logs and other information for performing a full port of Condor}
+*: {wiki: StdUnivPorting Standard Universe Porting Information - Port logs and other information for performing a full port of HTCondor}
 *: {wiki: AddConfigParams Adding Configuration File Parameters}
 *: {wiki: RepositoryBackups Repository Backups}
 *: {wiki: MemoryProfiling Profiling Memory Usage}
@@ -115,22 +115,22 @@
 *: {wiki: WindowsDevelopmentAndDebugging Windows Development and 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: MagicNumbers Magic Numbers in Condor and Grid Software}
+*: {wiki: MagicNumbers Magic Numbers in HTCondor and Grid Software}
 *: ArchitectureManuals
 *: {wiki: BuildModernization Build Modernization} (CMAKE)
 *: {wiki: VmUniverse VM Universe}
-*: {wiki: CondorNativePackages Condor Native Packages}
-*: {wiki: CondorUserFortune Condor users' tips in a fortune file}
+*: {wiki: CondorNativePackages HTCondor Native Packages}
+*: {wiki: CondorUserFortune HTCondor users' tips in a fortune file}
 *: {wiki: MyStringVsStdString Differences between MyString and std::string}
 *: {wiki: ReleasingClassAds Releasing a new ClassAds version}
 *: {wiki: ScriptingGitTrac Scripting against GitTrac}
-*: {wiki: GdbAndClone GDB internal errors and Condor's clone}
-*: {wiki: CondorOnWindows Running Condor On Windows}
+*: {wiki: GdbAndClone GDB internal errors and HTCondor's clone}
+*: {wiki: CondorOnWindows Running HTCondor On Windows}
 *: {wiki: GridmanagerLog Reading the Gridmanager Log}
-*: {wiki: WisdomIpvSix IPv6 in Condor, a developer's perspective}
+*: {wiki: WisdomIpvSix IPv6 in HTCondor, a developer's perspective}
 *: {wiki: DagManDesignDocs DAGMan design documents}
-*: {wiki: DaemonDebugging Debugging condor daemons}
-*: {wiki: CondorSyscallLibCommandLine Condor Syscall Lib (standard universe) command line options}
+*: {wiki: DaemonDebugging Debugging HTCondor daemons}
+*: {wiki: CondorSyscallLibCommandLine HTCondor Syscall Lib (standard universe) command line options}
 *: {wiki: NonRootGlobusInstall Building and installing Globus Toolkit as non-root}
 *: {wiki: DebianNativePackage Debian Native Package}
 
@@ -143,7 +143,7 @@
 *: {link: http://www.cs.wisc.edu/condor/publications.html Research Publications }
 
 
-{subsection: Condor Testsuite Info}
+{subsection: HTCondor Testsuite Info}
 
 *: {wiki: TestAddHowto All about the test suite }
 *: {wiki: RunCmd Our system call interface - runcmd}
@@ -170,7 +170,7 @@
 
 {subsection: Obsolete Wisdom}
 Kept for historical use
-*: {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)
 *: {wiki: HfcRequirements High Frequency Computing Requirements}
 *: {wiki: HfcDesignAndProgress High Frequency Computing Design and Progress}