Use consistent naming for tools.

Resolves 430243

9 files changed, 17 insertions, 17 deletions

diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile
index 36d5d2247..7e03c2e4e 100644
--- a/ipa-admintools/Makefile
+++ b/ipa-admintools/Makefile
@@ -10,13 +10,13 @@ all: ;
 install:
 	install -m 755 ipa-adduser $(SBINDIR)
 	install -m 755 ipa-finduser $(SBINDIR)
-	install -m 755 ipa-usermod $(SBINDIR)
+	install -m 755 ipa-moduser $(SBINDIR)
 	install -m 755 ipa-deluser $(SBINDIR)
 	install -m 755 ipa-lockuser $(SBINDIR)
 	install -m 755 ipa-addgroup $(SBINDIR)
 	install -m 755 ipa-delgroup $(SBINDIR)
 	install -m 755 ipa-findgroup $(SBINDIR)
-	install -m 755 ipa-groupmod $(SBINDIR)
+	install -m 755 ipa-modgroup $(SBINDIR)
 	install -m 755 ipa-passwd $(SBINDIR)
 	install -m 755 ipa-addservice $(SBINDIR)
 	install -m 755 ipa-adddelegation $(SBINDIR)
diff --git a/ipa-admintools/ipa-groupmod b/ipa-admintools/ipa-modgroup
index c7e6e1fa0..f3f603282 100644
--- a/ipa-admintools/ipa-groupmod
+++ b/ipa-admintools/ipa-modgroup
@@ -32,8 +32,8 @@ import ldap
 import errno
 
 def usage():
-    print "ipa-groupmod [-a|--add] [-r|--remove] user group"
-    print "ipa-groupmod [-d|--desc description STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] group"
+    print "ipa-modgroup [-a|--add] [-r|--remove] user group"
+    print "ipa-modgroup [-d|--desc description STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] group"
     sys.exit(1)
 
 def set_add_usage(which):
diff --git a/ipa-admintools/ipa-usermod b/ipa-admintools/ipa-moduser
index 5d33700f9..81ad71987 100644
--- a/ipa-admintools/ipa-usermod
+++ b/ipa-admintools/ipa-moduser
@@ -32,7 +32,7 @@ import ldap
 import errno
 
 def usage():
-    print "ipa-usermod [-a|--activate] [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell STRING] [--add attribute=value] [--del attribute] [--set attribute=value] user"
+    print "ipa-moduser [-a|--activate] [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell STRING] [--add attribute=value] [--del attribute] [--set attribute=value] user"
     sys.exit(1)
 
 def set_add_usage(which):
diff --git a/ipa-admintools/man/Makefile b/ipa-admintools/man/Makefile
index 154124753..c81513337 100644
--- a/ipa-admintools/man/Makefile
+++ b/ipa-admintools/man/Makefile
@@ -9,12 +9,12 @@ MANFILES=\
 	ipa-deluser.1 \
 	ipa-findgroup.1 \
 	ipa-finduser.1 \
-	ipa-groupmod.1 \
+	ipa-modgroup.1 \
 	ipa-listdelegation.1 \
 	ipa-lockuser.1 \
 	ipa-moddelegation.1 \
 	ipa-passwd.1 \
-	ipa-usermod.1 \
+	ipa-moduser.1 \
 	ipa-getkeytab.1
 
 all: ;
diff --git a/ipa-admintools/man/ipa-groupmod.1 b/ipa-admintools/man/ipa-modgroup.1
index 5d107de2f..caaf64e30 100644
--- a/ipa-admintools/man/ipa-groupmod.1
+++ b/ipa-admintools/man/ipa-modgroup.1
@@ -1,4 +1,4 @@
-.\" A man page for ipa-groupmod
+.\" A man page for ipa-modgroup
 .\" Copyright (C) 2007 Red Hat, Inc.
 .\" 
 .\" This is free software; you can redistribute it and/or modify it under
@@ -17,11 +17,11 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipa-groupmod" "1" "Oct 10 2007" "freeipa" ""
+.TH "ipa-modgroup" "1" "Oct 10 2007" "freeipa" ""
 .SH "NAME"
-ipa\-groupmod \- Modify a group
+ipa\-modgroup \- Modify a group
 .SH "SYNOPSIS"
-ipa\-groupmod [\fIOPTION\fR]... \fIgroup\fR
+ipa\-modgroup [\fIOPTION\fR]... \fIgroup\fR
 
 .SH "DESCRIPTION"
 Updates the members or description of \fIgroup\fR.
diff --git a/ipa-admintools/man/ipa-usermod.1 b/ipa-admintools/man/ipa-moduser.1
index 43c74e450..616cb9b2d 100644
--- a/ipa-admintools/man/ipa-usermod.1
+++ b/ipa-admintools/man/ipa-moduser.1
@@ -1,4 +1,4 @@
-.\" A man page for ipa-usermod
+.\" A man page for ipa-moduser
 .\" Copyright (C) 2007 Red Hat, Inc.
 .\" 
 .\" This is free software; you can redistribute it and/or modify it under
@@ -17,11 +17,11 @@
 .\" 
 .\" Author: Rob Crittenden <rcritten@redhat.com>
 .\" 
-.TH "ipa-usermod" "1" "Oct 10 2007" "freeipa" ""
+.TH "ipa-moduser" "1" "Oct 10 2007" "freeipa" ""
 .SH "NAME"
-ipa\-usermod \- Modify a user
+ipa\-moduser \- Modify a user
 .SH "SYNOPSIS"
-ipa\-usermod [\fIOPTION\fR]... \fIname\fR
+ipa\-moduser [\fIOPTION\fR]... \fIname\fR
 
 .SH "DESCRIPTION"
 Updates the user \fIname\fR.
diff --git a/ipa-radius-admintools/Makefile b/ipa-radius-admintools/Makefile
index 3f2da11af..15357f011 100644
--- a/ipa-radius-admintools/Makefile
+++ b/ipa-radius-admintools/Makefile
@@ -5,11 +5,11 @@ all: ;
 
 install:
 	install -m 755 ipa-addradiusclient $(SBINDIR)
-	install -m 755 ipa-radiusclientmod $(SBINDIR)
+	install -m 755 ipa-modradiusclient $(SBINDIR)
 	install -m 755 ipa-delradiusclient $(SBINDIR)
 	install -m 755 ipa-findradiusclient $(SBINDIR)
 	install -m 755 ipa-addradiusprofile $(SBINDIR)
-	install -m 755 ipa-radiusprofilemod $(SBINDIR)
+	install -m 755 ipa-modradiusprofile $(SBINDIR)
 	install -m 755 ipa-delradiusprofile $(SBINDIR)
 	install -m 755 ipa-findradiusprofile $(SBINDIR)
 
diff --git a/ipa-radius-admintools/ipa-radiusclientmod b/ipa-radius-admintools/ipa-modradiusclient
index 9e973b121..9e973b121 100644
--- a/ipa-radius-admintools/ipa-radiusclientmod
+++ b/ipa-radius-admintools/ipa-modradiusclient
diff --git a/ipa-radius-admintools/ipa-radiusprofilemod b/ipa-radius-admintools/ipa-modradiusprofile
index 405abcfcc..405abcfcc 100644
--- a/ipa-radius-admintools/ipa-radiusprofilemod
+++ b/ipa-radius-admintools/ipa-modradiusprofile