diff --git a/src/c3_fmt.c b/src/c3_fmt.c
index fa238d4..4efae16 100644
--- a/src/c3_fmt.c
+++ b/src/c3_fmt.c
@@ -71,14 +71,15 @@ struct fmt_main fmt_crypt;
 static void init(struct fmt_main *pFmt)
 {
 	if (options.subformat) {
-		if (strcasecmp(options.subformat, "md5")==0) {
+		if (strcasecmp(options.subformat, "md5crypt")==0 ||
+		    strcasecmp(options.subformat, "md5")==0) {
 			fmt_crypt.params.benchmark_comment = " MD5";
 			tests[0].ciphertext = "$1$dXc3I7Rw$ctlgjDdWJLMT.qwHsWhXR1";
 			tests[1].ciphertext = "$1$dXc3I7Rw$94JPyQc/eAgQ3MFMCoMF.0";
 			tests[2].ciphertext = "$1$dXc3I7Rw$is1mVIAEtAhIzSdfn5JOO0";
 			tests[3].ciphertext = "$1$eQT9Hwbt$XtuElNJD.eW5MN5UCWyTQ0";
 			tests[4].ciphertext = "$1$Eu.GHtia$CFkL/nE1BYTlEPiVx1VWX0";
-		} else if ((strcasecmp(options.subformat, "cryptsha256")==0) ||
+		} else if ((strcasecmp(options.subformat, "sha256crypt")==0) ||
 		           (strcasecmp(options.subformat, "sha-256")==0) ||
 		           (strcasecmp(options.subformat, "sha256")==0)) {
 			fmt_crypt.params.benchmark_comment = " SHA-256 rounds=5000";
@@ -87,7 +88,7 @@ static void init(struct fmt_main *pFmt)
 			tests[2].ciphertext = "$5$LKO/Ute40T3FNF95$8Ry82xGnnPI/6HtFYnvPBTYgOL23sdMXn8C29aO.x/A";
 			tests[3].ciphertext = "$5$9mx1HkCz7G1xho50$O7V7YgleJKLUhcfk9pgzdh3RapEaWqMtEp9UUBAKIPA";
 			tests[4].ciphertext = "$5$kc7lRD1fpYg0g.IP$d7CMTcEqJyTXyeq8hTdu/jB/I6DGkoo62NXbHIR7S43";
-		} else if ((strcasecmp(options.subformat, "cryptsha512")==0) ||
+		} else if ((strcasecmp(options.subformat, "sha512crypt")==0) ||
 		           (strcasecmp(options.subformat, "sha-512")==0) ||
 		           (strcasecmp(options.subformat, "sha512")==0)) {
 			fmt_crypt.params.benchmark_comment = " SHA-512 rounds=5000";
@@ -105,7 +106,8 @@ static void init(struct fmt_main *pFmt)
 			tests[2].ciphertext = "$2a$05$Fa0iKV3E2SYVUlMknirWU.CFYGvJ67UwVKI1E2FP6XeLiZGcH3MJi";
 			tests[3].ciphertext = "$2a$05$.WRrXibc1zPgIdRXYfv.4uu6TD1KWf0VnHzq/0imhUhuxSxCyeBs2";
 			tests[4].ciphertext = "$2a$05$Otz9agnajgrAe0.kFVF9V.tzaStZ2s1s4ZWi/LY4sw2k/MTVFj/IO";
-		} else if (strcasecmp(options.subformat, "des")) {
+		} else if (strcasecmp(options.subformat, "descrypt") &&
+		           strcasecmp(options.subformat, "des")) {
 			fprintf(stderr, "Subformat unknown to John. Currently supported: des, md5, bf, cryptsha256, cryptsha512\n\n");
 			error();
 		}
diff --git a/src/cryptsha256_fmt.c b/src/cryptsha256_fmt.c
index 276f06a..2c17d26 100644
--- a/src/cryptsha256_fmt.c
+++ b/src/cryptsha256_fmt.c
@@ -26,8 +26,8 @@
 #include <omp.h>
 #endif
 
-#define FORMAT_LABEL			"cryptsha256"
-#define FORMAT_NAME			"crypt SHA-256"
+#define FORMAT_LABEL			"sha256crypt"
+#define FORMAT_NAME			"sha256crypt"
 #define ALGORITHM_NAME			"32/" ARCH_BITS_STR
 
 #define BENCHMARK_COMMENT		" (rounds=5000)"
diff --git a/src/cryptsha512_fmt.c b/src/cryptsha512_fmt.c
index 0e99db4..8fcc3e0 100644
--- a/src/cryptsha512_fmt.c
+++ b/src/cryptsha512_fmt.c
@@ -40,8 +40,8 @@
 #include <omp.h>
 #endif
 
-#define FORMAT_LABEL			"cryptsha512"
-#define FORMAT_NAME			"crypt SHA-512"
+#define FORMAT_LABEL			"sha512crypt"
+#define FORMAT_NAME			"sha512crypt"
 #if ARCH_BITS >= 64
 #define ALGORITHM_NAME			"64/" ARCH_BITS_STR
 #else
diff --git a/src/cuda_cryptmd5_fmt.c b/src/cuda_cryptmd5_fmt.c
index ff7c2bf..6fc342d 100644
--- a/src/cuda_cryptmd5_fmt.c
+++ b/src/cuda_cryptmd5_fmt.c
@@ -12,8 +12,8 @@
 #include "cuda_common.h"
 #include "cuda_cryptmd5.h"
 
-#define FORMAT_LABEL		"cryptmd5-cuda"
-#define FORMAT_NAME		"Crypt-MD5"
+#define FORMAT_LABEL		"md5crypt-cuda"
+#define FORMAT_NAME		"md5crypt"
 
 #define ALGORITHM_NAME		"CUDA"
 
diff --git a/src/cuda_cryptsha256_fmt.c b/src/cuda_cryptsha256_fmt.c
index a0b6e11..17a710c 100644
--- a/src/cuda_cryptsha256_fmt.c
+++ b/src/cuda_cryptsha256_fmt.c
@@ -13,12 +13,12 @@
 #include "cuda_common.h"
 #include <unistd.h>
 
-#define FORMAT_LABEL		"cryptsha256-cuda"
-#define FORMAT_NAME		"crypt SHA-256"
+#define FORMAT_LABEL		"sha256crypt-cuda"
+#define FORMAT_NAME		"sha256crypt"
 
 #define ALGORITHM_NAME		"CUDA"
 
-#define BENCHMARK_COMMENT	""
+#define BENCHMARK_COMMENT	" (rounds=5000)"
 #define BENCHMARK_LENGTH	-1
 
 #define PLAINTEXT_LENGTH	15
diff --git a/src/cuda_cryptsha512_fmt.c b/src/cuda_cryptsha512_fmt.c
index 2d7c557..b6a3950 100644
--- a/src/cuda_cryptsha512_fmt.c
+++ b/src/cuda_cryptsha512_fmt.c
@@ -11,12 +11,12 @@
 #include "cuda_cryptsha512.h"
 #include "cuda_common.h"
 
-#define FORMAT_LABEL		"cryptsha512-cuda"
-#define FORMAT_NAME		"crypt SHA-512"
+#define FORMAT_LABEL		"sha512crypt-cuda"
+#define FORMAT_NAME		"sha512crypt"
 
 #define ALGORITHM_NAME		"CUDA"
 
-#define BENCHMARK_COMMENT	""
+#define BENCHMARK_COMMENT	" (rounds=5000)"
 #define BENCHMARK_LENGTH	-1
 
 #define PLAINTEXT_LENGTH	15
diff --git a/src/opencl_cryptmd5_fmt.c b/src/opencl_cryptmd5_fmt.c
index 68e31e0..21dc882 100644
--- a/src/opencl_cryptmd5_fmt.c
+++ b/src/opencl_cryptmd5_fmt.c
@@ -22,8 +22,8 @@
 #define MIN(a,b) 		((a)<(b)?(a):(b))
 #define MAX(a,b) 		((a)>(b)?(a):(b))
 
-#define FORMAT_LABEL		"cryptmd5-opencl"
-#define FORMAT_NAME		"Crypt-MD5"
+#define FORMAT_LABEL		"md5crypt-opencl"
+#define FORMAT_NAME		"md5crypt"
 #define KERNEL_NAME		"cryptmd5"
 
 #define ALGORITHM_NAME		"OpenCL"
diff --git a/src/opencl_cryptsha512_fmt.c b/src/opencl_cryptsha512_fmt.c
index 7435f73..31b9497 100644
--- a/src/opencl_cryptsha512_fmt.c
+++ b/src/opencl_cryptsha512_fmt.c
@@ -18,8 +18,8 @@
 #include "opencl_cryptsha512.h"
 #include <time.h>
 
-#define FORMAT_LABEL			"cryptsha512-opencl"
-#define FORMAT_NAME			"crypt SHA-512"
+#define FORMAT_LABEL			"sha512crypt-opencl"
+#define FORMAT_NAME			"sha512crypt"
 #define ALGORITHM_NAME			"OpenCL"
 
 #define BENCHMARK_COMMENT		" (rounds=5000)"