8 files changed, 12 insertions, 12 deletions
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-add-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account
index 92b6b73..137ffb8 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-add-account
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account
@@ -24,14 +24,14 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='Usage: %prog [options] <account>')
     parser.add_option('-s', '--suffix', dest='suffix',
         default='', help='The suffix to use with the reseller prefix as the '
         'storage account name (default: <randomly-generated-uuid4>) Note: If '
         'the account already exists, this will have no effect on existing '
         'service URLs. Those will need to be updated with '
-        'swauth-set-account-service')
+        'gswauth-set-account-service')
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
         'subsystem (default: http://127.0.0.1:8080/auth/)')
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-add-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user
index 7336297..3ede12a 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-add-user
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user
@@ -24,7 +24,7 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(
         usage='Usage: %prog [options] <account> <user> <password>')
     parser.add_option('-a', '--admin', dest='admin', action='store_true',
@@ -41,7 +41,7 @@ if __name__ == '__main__':
         'storage account name (default: <randomly-generated-uuid4>) Note: If '
         'the account already exists, this will have no effect on existing '
         'service URLs. Those will need to be updated with '
-        'swauth-set-account-service')
+        'gswauth-set-account-service')
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
         'subsystem (default: http://127.0.0.1:8080/auth/')
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-cleanup-tokens b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
index 21f99ba..621124e 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-cleanup-tokens
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
@@ -28,7 +28,7 @@ from time import sleep, time
 from swiftclient.client import Connection, ClientException
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='Usage: %prog [options]')
     parser.add_option('-t', '--token-life', dest='token_life',
         default='86400', help='The expected life of tokens; token objects '
@@ -105,7 +105,7 @@ if __name__ == '__main__':
                 objs = conn.get_container(container, marker=marker)[1]
             except ClientException, e:
                 if e.http_status == 404:
-                    exit('Container %s not found. swauth-prep needs to be '
+                    exit('Container %s not found. gswauth-prep needs to be '
                         'rerun' % (container))
                 elif e.http_status == 401:
                     exit('Cleanup tokens failed: 401 Unauthorized: Invalid user/key provided')
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account
index 3ada02c..7bd513c 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-account
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account
@@ -24,7 +24,7 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='Usage: %prog [options] <account>')
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
index d87d02b..5958d5e 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-delete-user
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
@@ -24,7 +24,7 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='Usage: %prog [options] <account> <user>')
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-list b/gluster/swift/common/middleware/gswauth/bin/gswauth-list
index 4a8c546..ebf9b6f 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-list
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-list
@@ -29,7 +29,7 @@ from swift.common.utils import urlparse
 from prettytable import PrettyTable
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='''
 Usage: %prog [options] [account] [user]
 
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-prep b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep
index f520426..74071d5 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-prep
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep
@@ -24,7 +24,7 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='Usage: %prog [options]')
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '
diff --git a/gluster/swift/common/middleware/gswauth/bin/swauth-set-account-service b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service
index 41a33d2..eef4f05 100755
--- a/gluster/swift/common/middleware/gswauth/bin/swauth-set-account-service
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service
@@ -28,13 +28,13 @@ from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':
-    gettext.install('swauth', unicode=1)
+    gettext.install('gswauth', unicode=1)
     parser = OptionParser(usage='''
 Usage: %prog [options] <account> <service> <name> <value>
 
 Sets a service URL for an account. Can only be set by a reseller admin.
 
-Example: %prog -K swauthkey test storage local http://127.0.0.1:8080/v1/AUTH_018c3946-23f8-4efb-a8fb-b67aae8e4162
+Example: %prog -K gswauthkey test storage local http://127.0.0.1:8080/v1/AUTH_018c3946-23f8-4efb-a8fb-b67aae8e4162
 '''.strip())
     parser.add_option('-A', '--admin-url', dest='admin_url',
         default='http://127.0.0.1:8080/auth/', help='The URL to the auth '