diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index 47ca393b..f000f3a6 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May  1 09:15:13 MDT 2007 - jnorman@novell.com
+
+- Bug 265898. Rename CASAUtil to CASAcli per Baber's request
+
 -------------------------------------------------------------------
 Mon Apr 30 17:01:33 MDT 2007 - jnorman@novell.com
 
diff --git a/CASA/cli/CASAUtil.cs b/CASA/cli/CASAUtil.cs
index ef474906..449d25a8 100644
--- a/CASA/cli/CASAUtil.cs
+++ b/CASA/cli/CASAUtil.cs
@@ -9,7 +9,7 @@ namespace Novell.CASA
     class CASAUtil
     {
 
-        private static string m_sAppname = "CASAUtil";
+        private static string m_sAppname = "CASAcli";
         private static string m_sKeyChainID = SecretStore.SERVER_KEY_CHAIN;
         private const int MODE_GET_CREDENTIAL = 1;
         private const int MODE_SET_CREDENTIAL = 2;
diff --git a/CASA/cli/CASAUtil b/CASA/cli/CASAcli
similarity index 72%
rename from CASA/cli/CASAUtil
rename to CASA/cli/CASAcli
index 61e03a7f..08ea30c4 100644
--- a/CASA/cli/CASAUtil
+++ b/CASA/cli/CASAcli
@@ -8,4 +8,4 @@ fi
 
 
 export MONO_PATH=/usr/lib$ARCH_LIB/
-mono /usr/bin/CASAUtil.exe $1 $2 $3 $4 $5 $6 $7 $8 $9
+mono /usr/bin/CASAcli.exe $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/CASA/cli/Makefile.am b/CASA/cli/Makefile.am
index 14b9cf34..3530af82 100644
--- a/CASA/cli/Makefile.am
+++ b/CASA/cli/Makefile.am
@@ -30,7 +30,7 @@ endif
 SUBDIRS =
 DIST_SUBDIRS =  
 
-EXTRA_DIST = $(CSFILES) CASAUtil* 
+EXTRA_DIST = $(CSFILES) CASAcli* CASAUtil* 
 
 #EXTRA_DIST = $(CSFILES) help/en  help/en/*.htm  help/en/*.gif \
 #	     images/*.png images/*.ico images/*.glade* \
@@ -52,7 +52,7 @@ export MONO_PATH := $(MONO_PATH)
 PLATFORMINDEPENDENTSOURCEDIR =
 PLATFORMDEPENDENTSOURCEDIR = .
 
-MODULE_NAME =CASAUtil
+MODULE_NAME =CASAcli
 MODULE_EXT =exe
 
 CSFILES =$(srcdir)/CASAUtil.cs 
diff --git a/CASA/package/linux/CASA.spec.in b/CASA/package/linux/CASA.spec.in
index bf59a142..e50a5be3 100644
--- a/CASA/package/linux/CASA.spec.in
+++ b/CASA/package/linux/CASA.spec.in
@@ -44,12 +44,12 @@ CASA provides a local on box credential store that is purely session
 based in 1.0. This store is populated with your Desktop and Network Login 
 credentials on Novell Linux Desktop and Windows workstations.
 
-%package util
+%package cli
 Summary:      The CASA command line interface
 Group:        Productivity/Other
 Requires:     CASA = %{version}
 
-%description util
+%description cli
 This package contains a CLI(command line interface) that provides
 a way for administrators to set, reset or delete credentials used by 
 services.  These credentials are stored in CASA.
@@ -128,10 +128,10 @@ install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.FireFox.dll %{buildroot}%{
 install -m 755 %{binsource}/%{cfg}/micasad.exe %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/%{cfg}/micasad-init %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/%{cfg}/CASAManager.exe %{buildroot}%{bin_prefix}/bin 
-install -m 755 %{binsource}/%{cfg}/CASAUtil.exe %{buildroot}%{bin_prefix}/bin 
+install -m 755 %{binsource}/%{cfg}/CASAcli.exe %{buildroot}%{bin_prefix}/bin 
 install -m 755 gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
 install -m 755 gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
-install -m 755 cli/CASAUtil %{buildroot}%{bin_prefix}/bin
+install -m 755 cli/CASAcli %{buildroot}%{bin_prefix}/bin
 install -m 644 gui/images/* %{buildroot}%{prefix}/CASA/images
 install -m 644 gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
 install -m 755 micasad/startup/micasad %{buildroot}/etc/init.d
@@ -246,10 +246,10 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/CASA/doc/License.txt
 %{prefix}/CASA/doc/Readme.txt
 
-%files util
+%files cli
 %defattr(-,root,root)
-%{bin_prefix}/bin/CASAUtil.exe
-%{bin_prefix}/bin/CASAUtil
+%{bin_prefix}/bin/CASAcli.exe
+%{bin_prefix}/bin/CASAcli
 
 %files devel 
 %defattr(-,root,root)