Changed name to targetcli at community request.

32 files changed, 110 insertions, 110 deletions

diff --git a/Makefile b/Makefile
index 5a082d2..91c328b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,12 +13,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-NAME = rtsadmin
+NAME = targetcli
 LIB = /usr/share
 DOC = ${LIB}/doc/
 SETUP = ./setup.py
 GENDOC = ./bin/gendoc
-RPMVERSION = $$(grep Version: redhat/rtsadmin.spec | awk '{print $$2}')
+RPMVERSION = $$(grep Version: redhat/targetcli.spec | awk '{print $$2}')
 GIT_BRANCH = $$(git branch | grep \* | tr -d \*)
 
 all: usage
@@ -32,7 +32,7 @@ usage:
 	@echo "  make doc         - Generate the documentation"
 	@echo "  make sdist       - Build the source tarball"
 	@echo "  make bdist       - Build the installable tarball"
-	@echo "  make install     - Install rtsadmin"
+	@echo "  make install     - Install targetcli"
 	@echo "  make installdocs - Install the documentation"
 
 install:
@@ -49,19 +49,19 @@ installdocs: doc
 
 clean:
 	${CLEAN}
-	rm -fv rtsadmin/*.pyc rtsadmin/*.html
+	rm -fv targetcli/*.pyc targetcli/*.html
 	rm -frv doc
-	rm -frv rtsadmin.egg-info MANIFEST build
+	rm -frv targetcli.egg-info MANIFEST build
 	rm -frv pdf html
 	rm -frv debian/tmp
 	rm -fv build-stamp
 	rm -fv dpkg-buildpackage.log dpkg-buildpackage.version
-	rm -frv *.rpm warnrtsadmin.txt buildrtsadmin
+	rm -frv *.rpm warntargetcli.txt buildtargetcli
 	rm -fv debian/*.debhelper.log debian/*.debhelper debian/*.substvars debian/files
-	rm -fvr debian/rtsadmin-python2.5/
-	rm -fvr debian/rtsadmin-python2.6/ debian/rtsadmin/ debian/rtsadmin-doc/
+	rm -fvr debian/targetcli-python2.5/
+	rm -fvr debian/targetcli-python2.6/ debian/targetcli/ debian/targetcli-doc/
 	rm -fv redhat/*.spec *.spec redhat/sed* sed*
-	rm -frv rtsadmin-*
+	rm -frv targetcli-*
 	./bin/gen_changelog_cleanup
 	@echo "Finished cleanup."
 
@@ -85,18 +85,18 @@ rpm: doc
 	@echo Building RPM version ${RPMVERSION}
 	mkdir -p ~/rpmbuild/SOURCES/
 	mkdir -p build
-	git archive ${GIT_BRANCH} --prefix rtsadmin/ > build/rtsadmin.tar
-	cd build; tar mxf rtsadmin.tar; rm rtsadmin.tar
-	cp rtsadmin/__init__.py build/rtsadmin/rtsadmin
-	cp -r doc build/rtsadmin/
-	mv build/rtsadmin rtsadmin-${RPMVERSION}
-	tar zcf ~/rpmbuild/SOURCES/rtsadmin-${RPMVERSION}.tar.gz rtsadmin-${RPMVERSION}
-	rm -fr rtsadmin-${RPMVERSION}
+	git archive ${GIT_BRANCH} --prefix targetcli/ > build/targetcli.tar
+	cd build; tar mxf targetcli.tar; rm targetcli.tar
+	cp targetcli/__init__.py build/targetcli/targetcli
+	cp -r doc build/targetcli/
+	mv build/targetcli targetcli-${RPMVERSION}
+	tar zcf ~/rpmbuild/SOURCES/targetcli-${RPMVERSION}.tar.gz targetcli-${RPMVERSION}
+	rm -fr targetcli-${RPMVERSION}
 	rpmbuild -ba redhat/*.spec
 	@test -e dist || mkdir dist
-	mv ~/rpmbuild/SRPMS/rtsadmin-${RPMVERSION}*.src.rpm dist/
-	mv ~/rpmbuild/RPMS/*/rtsadmin-${RPMVERSION}*.rpm dist/
-	mv ~/rpmbuild/RPMS/noarch/rtsadmin-doc-${RPMVERSION}*.rpm dist/
+	mv ~/rpmbuild/SRPMS/targetcli-${RPMVERSION}*.src.rpm dist/
+	mv ~/rpmbuild/RPMS/*/targetcli-${RPMVERSION}*.rpm dist/
+	mv ~/rpmbuild/RPMS/noarch/targetcli-doc-${RPMVERSION}*.rpm dist/
 	./bin/gen_changelog_cleanup
 
 sdist: clean doc
diff --git a/README b/README
index 7306a64..0426916 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
@@ -13,13 +13,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-RTSAdmin Community Edition is an administration tool for managing RisingTide
+targetcli is an administration tool for managing RisingTide
 Systems storage targets using the kernel LIO core target and compatible target
-fabric modules. The rtsadmin CLI is built on top of the python configshell CLI
+fabric modules. The targetcli CLI is built on top of the python configshell CLI
 framework.
 
 The latest version of this program might be obtained at:
 http://www.risingtidesystems.com/git/
 
 To run the CLI from this directory use:
-sudo PYTHONPATH=. ./scripts/rtsadmin
+sudo PYTHONPATH=. ./scripts/targetcli
diff --git a/bin/gen_changelog b/bin/gen_changelog
index f0b0d8a..91ef158 100755
--- a/bin/gen_changelog
+++ b/bin/gen_changelog
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,8 +30,8 @@ echo "  * Generated package." >> debian/changelog
 echo >> debian/changelog
 echo " -- ${NAME} <${EMAIL}>  ${DATE}" >> debian/changelog
 
-RH_SPEC="redhat/rtsadmin.spec"
-cp redhat/rtsadmin.spec.tmpl $RH_SPEC
+RH_SPEC="redhat/targetcli.spec"
+cp redhat/targetcli.spec.tmpl $RH_SPEC
 sed -i "s/Version:\( *\).*/Version:\1${VERSION}/g" $RH_SPEC
 echo "* $(date +'%a %b %d %Y') ${NAME} <${EMAIL}> - ${VERSION}" >> $RH_SPEC
 echo "- Generated package." >> $RH_SPEC
diff --git a/bin/gen_changelog_cleanup b/bin/gen_changelog_cleanup
index 3d11deb..bb3dc05 100755
--- a/bin/gen_changelog_cleanup
+++ b/bin/gen_changelog_cleanup
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/bin/gendoc b/bin/gendoc
index 73eb830..f14ce2e 100755
--- a/bin/gendoc
+++ b/bin/gendoc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
@@ -20,11 +20,11 @@ path=$PWD
 rm -rf doc &>/dev/null
 mkdir doc
 cp README COPYING doc/
-cp rtsadmin_doc/rtslogo.* doc/
+cp targetcli_doc/rtslogo.* doc/
 
-CSS=../rtsadmin_doc/html4css1.css
-#CSS=../rtsadmin_doc/voidspace.css
-RSTTITLE="rtsadmin_reference"
+CSS=../targetcli_doc/html4css1.css
+#CSS=../targetcli_doc/voidspace.css
+RSTTITLE="targetcli_reference"
 TITLE=$RSTTITLE
 #MARK="% generated by Docutils"
 MARK="\documentclass.*"
@@ -67,7 +67,7 @@ latex $TITLE.tex $TITLE.dvi
 latex $TITLE.tex $TITLE.dvi
 dvipdf $TITLE.dvi $TITLE.pdf
 
-TITLE="rtsadmin_reference_for_print"
+TITLE="targetcli_reference_for_print"
 
 rst2latex $RSTTITLE.rst --toc-entry-backlinks --compound-enumerators --use-verbatim-when-possible --use-latex-toc --section-numbering --documentclass book --documentoptions "10pt,a4paper" --use-latex-toc --use-latex-docinfo --hyperlink-color black $TITLE.tex
 
diff --git a/bin/gendoc.py b/bin/gendoc.py
index 680555a..74bc433 100755
--- a/bin/gendoc.py
+++ b/bin/gendoc.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# This file is part of RTSAdmin Community Edition.
+# This file is part of targetcli.
 # Copyright (c) 2011 by RisingTide Systems LLC
 #
 # This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@ import inspect
 import textwrap
 import datetime
 sys.path.insert(0, os.path.realpath("."))
-import rtsadmin
+import targetcli
 
 def doctitle(txt):
     return "%s\n%s\n%s\n\n" \
@@ -55,12 +55,12 @@ def gen_help_cmd():
 
 def gen_title():
     string = ""
-    string += doctitle("The rtsadmin Reference Guide")
-    string += docsubtitle(rtsadmin.__description__)
+    string += doctitle("The targetcli Reference Guide")
+    string += docsubtitle(targetcli.__description__)
     string += ":Date: version %s built on %s\n" \
-            % (str(rtsadmin.__version__), 
+            % (str(targetcli.__version__), 
                str(datetime.datetime.now().date()))
-    license_fields = rtsadmin.__license__.split(".")
+    license_fields = targetcli.__license__.split(".")
     string += ":Author: %s. %s.\n" % (license_fields[0], license_fields[1])
     string += "\n"
     return string
diff --git a/debian/control b/debian/control
index 5ea09dc..d2da35f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
-Source: rtsadmin
+Source: targetcli
 Section: python
 Priority: optional
 Maintainer: Jerome Martin <jxm@risingtidesystems.com>
 Build-Depends: debhelper(>= 5.0.1), python2.6, build-essential, python-dev, python2.6-dev, python-epydoc, zlib1g-dev, python-configshell, upx-ucl, python-rtslib
 Standards-Version: 3.8.1
 
-Package: rtsadmin
+Package: targetcli
 Architecture: all
 Depends: python (>= 2.6)|python2.6, python-configshell, python-rtslib, lio-utils
-Suggests: rtsadmin-doc
-Conflicts: rtsadmin-frozen
+Suggests: targetcli-doc
+Conflicts: targetcli-frozen
 Description: CLI for the RisingTide Systems target, with complete sources.
  .
- This package contains the rtsadmin CLI.  
+ This package contains the targetcli CLI.  
 
-Package: rtsadmin-doc
+Package: targetcli-doc
 Section: doc
 Architecture: all
 Recommends: iceweasel | www-browser
-Description: User manual for the rtsadmin CLI
+Description: User manual for the targetcli CLI
  .
- This package contains the User Manual for rtsadmin, the CLI
+ This package contains the User Manual for targetcli, the CLI
  interface to the RisingTide Systems storage clusters.
 
diff --git a/debian/rtsadmin-doc.docs b/debian/rtsadmin-doc.docs
deleted file mode 100644
index 97c4a78..0000000
--- a/debian/rtsadmin-doc.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-doc/README
-doc/COPYING
-doc/rtsadmin_reference.html
-doc/rtsadmin_reference.pdf
-doc/rtsadmin_reference_for_print.pdf
-doc/rtslogo.png
diff --git a/debian/rtsadmin.install b/debian/rtsadmin.install
deleted file mode 100644
index 1b129dd..0000000
--- a/debian/rtsadmin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/rtsadmin      usr/share/python-support
-bin /usr
diff --git a/debian/rtsadmin.preinst b/debian/rtsadmin.preinst
deleted file mode 100755
index c591c64..0000000
--- a/debian/rtsadmin.preinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /usr/share/python-support/rtsadmin/rtsadmin/*.pyc
-rm -f /usr/share/python-support/rtsadmin/rtsadmin/*.pyo
diff --git a/debian/rtsadmin.prerm b/debian/rtsadmin.prerm
deleted file mode 100755
index 1dc3cb5..0000000
--- a/debian/rtsadmin.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-for lib in lib lib64; do
-	for python in python2.6; do
-		if [ -e /usr/${lib}/${python}/rtsadmin ]; then
-			rm -rf /usr/${lib}/${python}/rtsadmin
-		fi
-	done
-done
diff --git a/debian/rules b/debian/rules
index 81a22ef..664cd72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,10 +36,10 @@ build: build-stamp
 build-stamp: 
 	dh_testdir
 	# Build the source package
-	$(setup) build --build-base $(build_dir) install --no-compile --install-purelib $(install_dir)/lib/rtsadmin --install-scripts $(install_dir)/bin
-	echo "2.6" > $(install_dir)/lib/rtsadmin/.version
+	$(setup) build --build-base $(build_dir) install --no-compile --install-purelib $(install_dir)/lib/targetcli --install-scripts $(install_dir)/bin
+	echo "2.6" > $(install_dir)/lib/targetcli/.version
 	# Cleanup
-	rm -f $(install_dir)/lib/rtsadmin/rtsadmin/*.pyc
+	rm -f $(install_dir)/lib/targetcli/targetcli/*.pyc
 	touch build-stamp
 
 clean:
diff --git a/debian/targetcli-doc.docs b/debian/targetcli-doc.docs
new file mode 100644
index 0000000..2e1165c
--- /dev/null
+++ b/debian/targetcli-doc.docs
@@ -0,0 +1,6 @@
+doc/README
+doc/COPYING
+doc/targetcli_reference.html
+doc/targetcli_reference.pdf
+doc/targetcli_reference_for_print.pdf
+doc/rtslogo.png
diff --git a/debian/rtsadmin.dirs b/debian/targetcli.dirs
index f430183..f430183 100644
--- a/debian/rtsadmin.dirs
+++ b/debian/targetcli.dirs
diff --git a/debian/rtsadmin.docs b/debian/targetcli.docs
index 1f562b3..1f562b3 100644
--- a/debian/rtsadmin.docs
+++ b/debian/targetcli.docs
diff --git a/debian/targetcli.install b/debian/targetcli.install
new file mode 100644
index 0000000..5a1dd4b
--- /dev/null
+++ b/debian/targetcli.install
@@ -0,0 +1,2 @@
+lib/targetcli      usr/share/python-support
+bin /usr
diff --git a/debian/rtsadmin.postinst b/debian/targetcli.postinst
index 184f745..8412fc6 100755
--- a/debian/rtsadmin.postinst
+++ b/debian/targetcli.postinst
@@ -2,14 +2,14 @@
 for lib in lib lib64; do
 	for python in python2.6; do
 		if [ -e /usr/${lib}/${python} ]; then
-			if [ ! -e /usr/${lib}/${python}/rtsadmin ]; then
-				mkdir /usr/${lib}/${python}/rtsadmin
-				for source in /usr/share/python-support/rtsadmin/rtsadmin/*.py; do
-					ln -sf ${source} /usr/${lib}/${python}/rtsadmin/
+			if [ ! -e /usr/${lib}/${python}/targetcli ]; then
+				mkdir /usr/${lib}/${python}/targetcli
+				for source in /usr/share/python-support/targetcli/targetcli/*.py; do
+					ln -sf ${source} /usr/${lib}/${python}/targetcli/
 				done
 				python_path=$(which ${python} 2>/dev/null)
 				if [ ! -z $python_path ]; then
-					${python} -c "import compileall; compileall.compile_dir('/usr/${lib}/${python}/rtsadmin', force=1)"
+					${python} -c "import compileall; compileall.compile_dir('/usr/${lib}/${python}/targetcli', force=1)"
 				fi
 			fi
 		fi
diff --git a/debian/targetcli.preinst b/debian/targetcli.preinst
new file mode 100755
index 0000000..58f5f2a
--- /dev/null
+++ b/debian/targetcli.preinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -f /usr/share/python-support/targetcli/targetcli/*.pyc
+rm -f /usr/share/python-support/targetcli/targetcli/*.pyo
diff --git a/debian/targetcli.prerm b/debian/targetcli.prerm
new file mode 100755
index 0000000..7603750
--- /dev/null
+++ b/debian/targetcli.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+for lib in lib lib64; do
+	for python in python2.6; do
+		if [ -e /usr/${lib}/${python}/targetcli ]; then
+			rm -rf /usr/${lib}/${python}/targetcli
+		fi
+	done
+done
diff --git a/redhat/rtsadmin.spec.tmpl b/redhat/targetcli.spec.tmpl
index acfbbab..141dd0c 100644
--- a/redhat/rtsadmin.spec.tmpl
+++ b/redhat/targetcli.spec.tmpl
@@ -1,6 +1,6 @@
-%define oname rtsadmin
+%define oname targetcli
 
-Name:           rtsadmin
+Name:           targetcli
 License:        AGPLv3
 Group:          Applications/System
 Summary:        RisingTide Systems generic SCSI target CLI shell.
@@ -12,20 +12,20 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-rpmroot
 BuildArch:      noarch
 BuildRequires:  python-devel, python-rtslib, python-configshell
 Requires:       python-rtslib, python-configshell, lio-utils
-Conflicts:      rtsadmin-frozen
+Conflicts:      targetcli-frozen
 Vendor:         RisingTide Systems
 
 %description
 RisingTide Systems generic SCSI target CLI shell.
 
 %package doc
-Summary:       PDF user manual for rtsadmin.
+Summary:       PDF user manual for targetcli.
 Group:         Documentation
 BuildRequires: epydoc, python-docutils
 BuildArch:     noarch
 
 %description doc
-PDF user manual for rtsadmin.
+PDF user manual for targetcli.
 
 %prep
 %setup -q -n %{oname}-%{version}
@@ -36,8 +36,8 @@ PDF user manual for rtsadmin.
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
-mkdir -p %{buildroot}/usr/share/doc/rtsadmin-doc-%{version}
-cp -r doc/*.pdf doc/README doc/COPYING %{buildroot}/usr/share/doc/rtsadmin-doc-%{version}/
+mkdir -p %{buildroot}/usr/share/doc/targetcli-doc-%{version}
+cp -r doc/*.pdf doc/README doc/COPYING %{buildroot}/usr/share/doc/targetcli-doc-%{version}/
 
 %clean
 rm -rf %{buildroot}
@@ -45,11 +45,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}
-%{_bindir}/rtsadmin
+%{_bindir}/targetcli
 %doc COPYING README
 
 %files doc
 %defattr(-,root,root,-)
-/usr/share/doc/rtsadmin-doc-%{version}
+/usr/share/doc/targetcli-doc-%{version}
 
 %changelog
diff --git a/scripts/rtsadmin b/scripts/targetcli
index b010823..8af0613 100755
--- a/scripts/rtsadmin
+++ b/scripts/targetcli
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 '''
-Starts the rtsadmin CLI shell.
+Starts the targetcli CLI shell.
 
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
@@ -21,11 +21,11 @@ All rights reserved.
 '''
 
 from os import getuid
-from rtsadmin import UIRoot
+from targetcli import UIRoot
 from rtslib import RTSLibError
 from configshell import ConfigShell
 
-class RTSAdmin(ConfigShell):
+class TargetCLI(ConfigShell):
     default_prefs = {'color_path': 'magenta',
                      'color_command': 'cyan',
                      'color_parameter': 'magenta',
@@ -48,16 +48,16 @@ class RTSAdmin(ConfigShell):
 
 def main():
     '''
-    Start the rtsadmin shell.
+    Start the targetcli shell.
     '''
     if getuid() == 0:
         is_root = True
     else:
         is_root = False
 
-    shell = RTSAdmin('~/.rtsadmin')
+    shell = TargetCLI('~/.targetcli')
     shell.con.epy_write('''
-                        Welcome to the B{rtsadmin Community Edition} CLI::
+                        Welcome to the B{targetcli} shell::
                          Copyright (c) 2011 by RisingTide Systems LLC.
 
                         Visit us at U{http://www.risingtidesystems.com}.
diff --git a/setup.py b/setup.py
index 7968530..5e2010e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 '''
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
@@ -19,14 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from distutils.core import setup
-import rtsadmin
+import targetcli
 
-PKG = rtsadmin
+PKG = targetcli
 VERSION = str(PKG.__version__)
 (AUTHOR, EMAIL) = re.match('^(.*?)\s*<(.*)>$', PKG.__author__).groups()
 URL = PKG.__url__
 LICENSE = PKG.__license__
-SCRIPTS = ["scripts/rtsadmin"]
+SCRIPTS = ["scripts/targetcli"]
 DESCRIPTION = PKG.__description__
 
 setup(
diff --git a/rtsadmin/__init__.py b/targetcli/__init__.py
index 90150a8..12abd31 100644
--- a/rtsadmin/__init__.py
+++ b/targetcli/__init__.py
@@ -1,5 +1,5 @@
 '''
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
diff --git a/rtsadmin/ui_backstore.py b/targetcli/ui_backstore.py
index ddaae69..6d06d04 100644
--- a/rtsadmin/ui_backstore.py
+++ b/targetcli/ui_backstore.py
@@ -1,7 +1,7 @@
 '''
-Implements the rtsadmin backstores related UI.
+Implements the targetcli backstores related UI.
 
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
diff --git a/rtsadmin/ui_backstore_legacy.py b/targetcli/ui_backstore_legacy.py
index 47ccd02..83cbfa5 100644
--- a/rtsadmin/ui_backstore_legacy.py
+++ b/targetcli/ui_backstore_legacy.py
@@ -4,7 +4,7 @@ All rights reserved.
 
 Jerome Martin <jxm@risingtidesystems.com>
 
-Implements the rtsadmin backstores related UI.
+Implements the targetcli backstores related UI.
 '''
 
 from ui_node import UINode, UIRTSLibNode
diff --git a/rtsadmin/ui_node.py b/targetcli/ui_node.py
index 5086952..db12166 100644
--- a/rtsadmin/ui_node.py
+++ b/targetcli/ui_node.py
@@ -1,7 +1,7 @@
 '''
-Implements the rtsadmin base UI node.
+Implements the targetcli base UI node.
 
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@ from rtslib import RTSLibError, RTSRoot
 
 class UINode(ConfigNode):
     '''
-    Our rtsadmin basic UI node.
+    Our targetcli basic UI node.
     '''
     def __init__(self, name, parent=None, shell=None):
         ConfigNode.__init__(self, name, parent, shell)
diff --git a/rtsadmin/ui_root.py b/targetcli/ui_root.py
index fb1fb25..2048544 100644
--- a/rtsadmin/ui_root.py
+++ b/targetcli/ui_root.py
@@ -1,7 +1,7 @@
 '''
-Implements the rtsadmin root UI.
+Implements the targetcli root UI.
 
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ from ui_backstore_legacy import UIBackstoresLegacy
 
 class UIRoot(UINode):
     '''
-    The rtsadmin hierarchy root node.
+    The targetcli hierarchy root node.
     '''
     def __init__(self, shell, as_root=False):
         self.loaded = False
@@ -91,12 +91,12 @@ class UIRoot(UINode):
 
     def ui_command_version(self):
         '''
-        Displays the rtsadmin and support libraries versions.
+        Displays the targetcli and support libraries versions.
         '''
         from rtslib import __version__ as rtslib_version
-        from rtsadmin import __version__ as rtsadmin_version
+        from targetcli import __version__ as targetcli_version
         from configshell import __version__ as configshell_version
-        for package, version in dict(rtsadmin=rtsadmin_version,
+        for package, version in dict(targetcli=targetcli_version,
                                      rtslib=rtslib_version,
                                      configshell=configshell_version).items():
             if version == 'GIT_VERSION':
diff --git a/rtsadmin/ui_target.py b/targetcli/ui_target.py
index cde8c2d..de350a7 100644
--- a/rtsadmin/ui_target.py
+++ b/targetcli/ui_target.py
@@ -1,7 +1,7 @@
 '''
-Implements the rtsadmin target related UI.
+Implements the targetcli target related UI.
 
-This file is part of RTSAdmin Community Edition.
+This file is part of targetcli.
 Copyright (c) 2011 by RisingTide Systems LLC
 
 This program is free software: you can redistribute it and/or modify
diff --git a/rtsadmin_doc/html4css1.css b/targetcli_doc/html4css1.css
index a1e39f4..a1e39f4 100644
--- a/rtsadmin_doc/html4css1.css
+++ b/targetcli_doc/html4css1.css
diff --git a/rtsadmin_doc/rtslogo.eps b/targetcli_doc/rtslogo.eps
index 704c2c8..704c2c8 100644
--- a/rtsadmin_doc/rtslogo.eps
+++ b/targetcli_doc/rtslogo.eps
diff --git a/rtsadmin_doc/rtslogo.png b/targetcli_doc/rtslogo.png
index dc5901b..dc5901b 100644
--- a/rtsadmin_doc/rtslogo.png
+++ b/targetcli_doc/rtslogo.png
diff --git a/rtsadmin_doc/voidspace.css b/targetcli_doc/voidspace.css
index 050d9f0..050d9f0 100644
--- a/rtsadmin_doc/voidspace.css
+++ b/targetcli_doc/voidspace.css