Index: docs/pwsafe.1
===================================================================
--- docs/pwsafe.1	(revision 5210)
+++ docs/pwsafe.1	(working copy)
@@ -1,11 +1,11 @@
 .\" Process this file with
 .\" groff -man -Tascii pwsafe.1
 .\"
-.TH PWSAFE 1 "JULY 2010" Linux "User Manuals"
+.TH PASSWORDSAFE 1 "JULY 2010" Linux "User Manuals"
 .SH NAME
-pwsafe \- Secure Password Manager
+passwordsafe \- Secure Password Manager
 .SH SYNOPSIS
-.B pwsafe [-g
+.B passwordsafe [-g
 .I config-file
 .B ] [-u
 .I user
@@ -17,24 +17,24 @@
 .I database
 .B ]
 .br
-.B pwsafe
+.B passwordsafe
 .B -v
 .I database
 .br
-.B pwsafe
+.B passwordsafe
 .B [-e|-d]
 .I file
 .br
-.B pwsafe
+.B passwordsafe
 .B [-c|-s|-m]
 .SH DESCRIPTION
-.B pwsafe
+.B passwordsafe
 manages your passwords in a convenient yet secure manner.
 .SH OPTIONS
 .IP -g
 .I config-file
 This will cause the specified config-file to be used for loading and storing
-preferences, instead of the default pwsafe.cfg (see
+preferences, instead of the default passwordsafe.cfg (see
 .B FILES
 ).
 .IP -u
@@ -90,14 +90,14 @@
 .SH ENVIRONMENT
 .IP PWS_PREFSDIR
 If set,
-.B pwsafe
+.B passwordsafe
 will look for the preference file in this directory rather than in
 .I ~/.pwsafe.
 .SH DIAGNOSTICS
-.B pwsafe
+.B passwordsafe
 Will issue error messages if the database is damaged. If this occurs,
 invoking
-.B pwsafe
+.B passwordsafe
 with the 
 .B -v
 option may help.
Index: install/desktop/pwsafe.desktop
===================================================================
--- install/desktop/pwsafe.desktop	(revision 5210)
+++ install/desktop/pwsafe.desktop	(working copy)
@@ -3,9 +3,9 @@
 Name=PasswordSafe
 
 Comment=Manage passwords
-Exec=pwsafe %f
-Icon=pwsafe
+Exec=passwordsafe %f
+Icon=passwordsafe
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GTK;Utility;Security;
\ No newline at end of file
+Categories=GTK;Utility;
\ No newline at end of file