Ticket #1080: Handle * packaging using CPack for cmake branch {linebreak}
 
 {subsection: Wikis }
-*: {wiki: CondorRepos Condor Native Package Repositories}
-*: {wiki: CondorDroneRpm Condor Drone RPM}
+*: {wiki: CondorRepos HTCondor Native Package Repositories}
+*: {wiki: CondorDroneRpm HTCondor Drone RPM}
 
 {section: Background}
-Old Condor rpm is basically a Condor tar ball packaged inside RPM. It will install Condor into /opt/condor-{version} and runs condor_configure during post install. Below is the list of Condor packages provided by 3rd parties.
+Old HTCondor rpm is basically a HTCondor tar ball packaged inside RPM. It will install HTCondor into /opt/condor-{version} and runs condor_configure during post install. Below is the list of HTCondor packages provided by 3rd parties.
 
-*Fedora* - Current Condor package is based on this one.{linebreak}
+*Fedora* - Current HTCondor package is based on this one.{linebreak}
 http://cvs.fedoraproject.org/viewvc/rpms/condor/ {linebreak}
 *Debian* {linebreak}
 http://www.dcl.hpi.uni-potsdam.de/debian/binary/ {linebreak}
@@ -18,15 +18,15 @@
 http://packages.ubuntu.com/lucid/condor {linebreak}
 
 {section: Design Ideas}
-1: Use dynamic tar file as a source, Condor native package just relocate stuff in tar file to comply with FHS.
-2: During upgrade, there is no need to explicitly restart Condor because the Master daemon will detect file changes and gracefully restart the daemons by itself.
+1: Use dynamic tar file as a source, HTCondor native package just relocate stuff in tar file to comply with FHS.
+2: During upgrade, there is no need to explicitly restart HTCondor because the Master daemon will detect file changes and gracefully restart the daemons by itself.
 3: Minimize post installation logic by using _condor_config_ parameters than match the standard configuration of each distribution.  This will allow RPM to detect configuration file changes. However, when using relocate feature, _condor_config_ will be modified during post install.
 4: In multi-instance installation scenario, the second instance will be installed without touching the first instance. Thus, the proper upgrade path is to remove the second instance and then upgrade the first instance.
-5: Debian have a very detailed packaging policies. Condor's Debian package tries to follows these policies as much as possible.
+5: Debian have a very detailed packaging policies. HTCondor's Debian package tries to follows these policies as much as possible.
 
 {section: Implementation }
 {subsection: Package Layout }
-Please see the following link for more detail on file layout within Condor Packages. {linebreak}
+Please see the following link for more detail on file layout within HTCondor Packages. {linebreak}
 http://www.cs.wisc.edu/condor/yum/index.html#layout {linebreak}
 http://www.cs.wisc.edu/condor/debian/index.html#layout {linebreak}
 
@@ -38,13 +38,13 @@
 1: _(If relocated)_ Update condor_config, /etc/sysconfig/condor to match new location
 2: _(If relocated)_ Install init script only if this is the first instance.
 3: _(If relocated)_ Create soft link to man folder in same level as bin/sbin folder so man can automatically find manpages.
-4: Add Condor service (chkconfig --add)
+4: Add HTCondor service (chkconfig --add)
 5: Run ldconfig (Might not be necessary because we do not put any lib directly into /usr/lib)
 6: Modify SElinux policy of condor_startd binary (Copy from Fedora package)
 
 {subsubsection: preun }
-1: Call init script to stop Condor only if we are removing the last instance of Condor (not include upgrading). If the init script fails, abort the uninstall
-2: Remove Condor service (chkconfig --del)
+1: Call init script to stop HTCondor only if we are removing the last instance of HTCondor (not include upgrading). If the init script fails, abort the uninstall
+2: Remove HTCondor service (chkconfig --del)
 3: _(If relocated)_ remove init script
 
 {subsubsection: postun }
@@ -55,15 +55,15 @@
 1: Add _condor_ user/group if not exists
 
 {subsubsection: postinst }
-1: Add Condor service (update-rc.d)
+1: Add HTCondor service (update-rc.d)
 2: Change owner of some folders to _condor_
 
 {subsubsection: prerm }
-1: _(If remove)_ Stop condor
+1: _(If remove)_ Stop HTCondor
 
 {subsubsection: postrm }
-1: Remove condor service
-2: _(If purge)_ remove files created Condor daemons
+1: Remove HTCondor service
+2: _(If purge)_ remove files created HTCondor daemons
 
 
 {section: Package Building (Imake) }
@@ -90,7 +90,7 @@
 
 {subsubsection: make_native_deb.sh }
 This script contains build logic similar to make_native_rpm.sh + SPEC file + rpmbuild.  Key notes are:
-1: Some condor libraries are not striped so we have to strip it manually. The strip program is invoked with similar argument used by _dh_strip_
+1: Some HTCondor libraries are not striped so we have to strip it manually. The strip program is invoked with similar argument used by _dh_strip_
 2: Debian helper programs (such as _dpkg-shlibdeps_) read and generate metadata files in _debian_ folder, but the final metadata folder that must be presented in the package is _DEBIAN_.
 3: Debian package store its sysconfig file in /etc/default/condor. Thus, this script will modify init script to match the Debian convention.
 
@@ -100,9 +100,9 @@
 2: There is not standard guide lines on how RPM should behave when installing multiple version and/or relocating the RPM. Thus, we should not encourage user to use these features extensively because users may expect different installation behavior.
 
 {subsection: Debian }
-1: Many Debian packages use defconf to allow users to specify some configuration parameters during post install.  For example, user may specify types of installation: central manager or personal condor. This feature is out of the scope of the current package.
-2: Lintian report of the Condor package still contains warnings such as no manpage associated with certain commands. However, any warnings that can be fixed at the packing process have been solved.
+1: Many Debian packages use defconf to allow users to specify some configuration parameters during post install.  For example, user may specify types of installation: central manager or personal HTCondor. This feature is out of the scope of the current package.
+2: Lintian report of the HTCondor package still contains warnings such as no manpage associated with certain commands. However, any warnings that can be fixed at the packing process have been solved.
 
-{section: Condor Packages in the New Build Process (Cmake) }
+{section: HTCondor Packages in the New Build Process (Cmake) }
 1: RPM and Debian package logic will be same. However, some new features have not been ported to the CMake's RPM.
 2: Patched version of CMake (CPack) is required to build these packages. Currently the patches are submitted to CMake developers for review.