diff --git a/tools/README.mkpasswd b/tools/README.mkpasswd
index 2d87a78..68744b6 100644
--- a/tools/README.mkpasswd
+++ b/tools/README.mkpasswd
@@ -4,20 +4,20 @@ $Id: README.mkpasswd 6 2005-09-10 01:02:21Z nenolod $
 This is documentation for the updated mkpasswd.c included with a number
 of ircd, irc services, and non-IRC related programs
 
-This version of mkpasswd can create DES, Extended DES, BlowFish, and MD5
+This version of mkpasswd can create DES, Extended DES, Blowfish, and MD5
 passwords, with either randomly generated or user provided salts.  
 
 Options:
 -m Generate an MD5 password
 -d Generate a DES password
--b Generate a BlowFish password
+-b Generate a Blowfish password
 -e Generate an Extended (BSDi) DES password
--l Specify a length for a random MD5 or BlowFish salt
--r Specify a number of rounds for a BlowFish or Extended DES password
-   BlowFish: no more than 6 recommended, no less than 4 accepted
+-l Specify a length for a random MD5 or Blowfish salt
+-r Specify a number of rounds for a Blowfish or Extended DES password
+   Blowfish: no more than 6 recommended, no less than 4 accepted
    Extended DES: default of 25
 -s Specify a salt, 2 alphanumeric characters for DES, up to 16 for MD5,
-   up to 22 for BlowFish, 2 for Extended DES
+   up to 22 for Blowfish, 2 for Extended DES
 -p Specify a plaintext password to use
 -? Get brief help
 -h Get extended help
@@ -33,8 +33,8 @@ An MD5 salt consists of up to 16 (though most implementations limit you to
 8) alphanumeric characters (plus '.' and '/'),
 such as 'tGd' or 'J6d4dfG'.
 
-A BlowFish salt consists of up to 22 alphanumeric characters (plus '.' and
-'/').  BlowFish also specifies a number of rounds*, by default 4.
+A Blowfish salt consists of up to 22 alphanumeric characters (plus '.' and
+'/').  Blowfish also specifies a number of rounds*, by default 4.
 
 Known bugs:
 The encryption algorithms supported depend on your system's crypt()
@@ -45,7 +45,7 @@ The maximum length of an MD5 salt is limited to your systems crypt()
 Supported Platforms (Known and tested):
 Linux glibc (DES and MD5)
 FreeBSD 3.x (DES (MD5 maybe))
-FreeBSD 4.x (DES, MD5, BlowFish, Extended DES)
+FreeBSD 4.x (DES, MD5, Blowfish, Extended DES)
 Solaris 2.5-2.6 (DES only)
 Cygwin 1.1.4 (DES only)
 Prior Cygwin with the MD5 libcrypt (MD5 only)
@@ -56,4 +56,4 @@ An MMK build script is included, as well as an MD5 crypt() implementation
 
 Other systems probably work, but they haven't been amply tested.
 
-* BlowFish's rounds parameter is a logarithm, not an integer value
+* Blowfish's rounds parameter is a logarithm, not an integer value
diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c
index 51a4aae..ed18c10 100644
--- a/tools/mkpasswd.c
+++ b/tools/mkpasswd.c
@@ -439,7 +439,7 @@ make_bf_salt(int rounds, int length)
 	char tbuf[3];
 	if(length > 22)
 	{
-		printf("BlowFish salt length too long\n");
+		printf("Blowfish salt length too long\n");
 		exit(0);
 	}
 	sprintf(tbuf, "%02d", rounds);
@@ -494,14 +494,14 @@ full_usage()
 	printf("-y Generate a SHA512 password\n");
 	printf("-m Generate an MD5 password\n");
 	printf("-d Generate a DES password\n");
-	printf("-b Generate a BlowFish password\n");
+	printf("-b Generate a Blowfish password\n");
 	printf("-e Generate an Extended DES password\n");
-	printf("-l Specify a length for a random MD5 or BlowFish salt\n");
-	printf("-r Specify a number of rounds for a BlowFish or Extended DES password\n");
-	printf("   BlowFish:  default 4, no more than 6 recommended\n");
+	printf("-l Specify a length for a random MD5 or Blowfish salt\n");
+	printf("-r Specify a number of rounds for a Blowfish or Extended DES password\n");
+	printf("   Blowfish:  default 4, no more than 6 recommended\n");
 	printf("   Extended DES:  default 25\n");
 	printf("-s Specify a salt, 2 alphanumeric characters for DES, up to 16 for MD5,\n");
-	printf("   up to 22 for BlowFish, and 4 for Extended DES\n");
+	printf("   up to 22 for Blowfish, and 4 for Extended DES\n");
 	printf("-p Specify a plaintext password to use\n");
 	printf("Example: mkpasswd -m -s 3dr -p test\n");
 	exit(0);
@@ -514,7 +514,7 @@ brief_usage()
 	printf("Standard DES:  mkpasswd [-d] [-s salt] [-p plaintext]\n");
 	printf("Extended DES:  mkpasswd -e [-r rounds] [-s salt] [-p plaintext]\n");
 	printf("         MD5:  mkpasswd -m [-l saltlength] [-s salt] [-p plaintext]\n");
-	printf("    BlowFish:  mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n");
+	printf("    Blowfish:  mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n");
 	printf("                           [-p plaintext]\n");
 	printf("Use -h for full usage\n");
 	exit(0);