diff -urpN JohnTheRipper.orig/src/john.c JohnTheRipper/src/john.c
--- JohnTheRipper.orig/src/john.c	2013-01-04 17:13:01.723285399 +0000
+++ JohnTheRipper/src/john.c	2013-01-04 17:24:31.276320262 +0000
@@ -113,7 +113,7 @@ extern struct fmt_main fmt_truecrypt_whi
 #endif
 
 #if defined(__GNUC__) && defined(__SSE2__)
-extern struct fmt_main sha1_fmt_ng;
+extern struct fmt_main fmt_sha1_ng;
 #endif
 
 #ifdef HAVE_SKEY
@@ -121,7 +121,7 @@ extern struct fmt_main fmt_SKEY;
 #endif
 
 #ifdef HAVE_NSS
-extern struct fmt_main mozilla_fmt;
+extern struct fmt_main fmt_mozilla;
 extern int mozilla2john(int argc, char **argv);
 #endif
 #ifdef HAVE_KRB5
@@ -165,7 +165,7 @@ extern struct fmt_main fmt_opencl_office
 extern struct fmt_main fmt_opencl_office2010;
 extern struct fmt_main fmt_opencl_office2013;
 extern struct fmt_main fmt_opencl_NTLMv2;
-extern struct fmt_main fmt_ocl_krb5pa_sha1;
+extern struct fmt_main fmt_opencl_krb5pa_sha1;
 extern struct fmt_main fmt_opencl_rar;
 #endif
 #ifdef HAVE_CUDA
@@ -186,8 +186,8 @@ extern struct fmt_main fmt_cuda_pwsafe;
 extern struct fmt_main fmt_ssh;
 extern struct fmt_main fmt_pfx;
 extern struct fmt_main fmt_pdf;
-extern struct fmt_main rar_fmt;
-extern struct fmt_main zip_fmt;
+extern struct fmt_main fmt_rar;
+extern struct fmt_main fmt_zip;
 extern struct fmt_main fmt_wpapsk;
 
 #include "fmt_externs.h"
@@ -264,11 +264,11 @@ static void john_register_all(void)
 #endif
 
 #if defined(__GNUC__) && defined(__SSE2__)
-	john_register_one(&sha1_fmt_ng);
+	john_register_one(&fmt_sha1_ng);
 #endif
 
 #ifdef HAVE_NSS
-	john_register_one(&mozilla_fmt);
+	john_register_one(&fmt_mozilla);
 #endif
 #ifdef HAVE_KRB5
 	john_register_one(&fmt_KRB5_kinit);
@@ -288,9 +288,9 @@ static void john_register_all(void)
 	john_register_one(&fmt_pdf);
 	john_register_one(&fmt_wpapsk);
 #ifndef _MSC_VER
-	john_register_one(&rar_fmt);
+	john_register_one(&fmt_rar);
 #endif
-	john_register_one(&zip_fmt);
+	john_register_one(&fmt_zip);
 	john_register_one(&fmt_dummy);
 
 #ifdef CL_VERSION_1_0
@@ -328,7 +328,7 @@ static void john_register_all(void)
 	john_register_one(&fmt_opencl_office2010);
 	john_register_one(&fmt_opencl_office2013);
 	john_register_one(&fmt_opencl_NTLMv2);
-	john_register_one(&fmt_ocl_krb5pa_sha1);
+	john_register_one(&fmt_opencl_krb5pa_sha1);
 	john_register_one(&fmt_opencl_rar);
 #endif
 
diff -urpN JohnTheRipper.orig/src/mozilla_fmt.c JohnTheRipper/src/mozilla_fmt.c
--- JohnTheRipper.orig/src/mozilla_fmt.c	2013-01-04 17:13:01.732285243 +0000
+++ JohnTheRipper/src/mozilla_fmt.c	2013-01-04 17:22:30.052314090 +0000
@@ -239,7 +239,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main mozilla_fmt = {
+struct fmt_main fmt_mozilla = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/opencl_krb5pa-sha1_fmt.c JohnTheRipper/src/opencl_krb5pa-sha1_fmt.c
--- JohnTheRipper.orig/src/opencl_krb5pa-sha1_fmt.c	2013-01-04 17:13:01.727285309 +0000
+++ JohnTheRipper/src/opencl_krb5pa-sha1_fmt.c	2013-01-04 17:24:50.670321254 +0000
@@ -878,7 +878,7 @@ static int cmp_exact(char *source, int i
 	return 1;
 }
 
-struct fmt_main fmt_ocl_krb5pa_sha1 = {
+struct fmt_main fmt_opencl_krb5pa_sha1 = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/rar_fmt.c JohnTheRipper/src/rar_fmt.c
--- JohnTheRipper.orig/src/rar_fmt.c	2013-01-04 17:13:01.721285455 +0000
+++ JohnTheRipper/src/rar_fmt.c	2013-01-04 17:23:52.456319618 +0000
@@ -658,7 +658,7 @@ static int cmp_exact(char *source, int i
 	return 1;
 }
 
-struct fmt_main rar_fmt = {
+struct fmt_main fmt_rar = {
 {
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/rawSHA1_ng_fmt.c JohnTheRipper/src/rawSHA1_ng_fmt.c
--- JohnTheRipper.orig/src/rawSHA1_ng_fmt.c	2013-01-04 17:13:01.734285219 +0000
+++ JohnTheRipper/src/rawSHA1_ng_fmt.c	2013-01-04 17:15:38.654293441 +0000
@@ -678,7 +678,7 @@ static int sha1_fmt_cmp_exact(char *sour
                   sizeof full_sha1_digest) == 0;
 }
 
-struct fmt_main sha1_fmt_ng = {
+struct fmt_main fmt_sha1_ng = {
     .params                 = {
         .label              = "raw-sha1-ng",
         .format_name        = "Raw SHA-1 (pwlen <= 15)",
diff -urpN JohnTheRipper.orig/src/zip_fmt.c JohnTheRipper/src/zip_fmt.c
--- JohnTheRipper.orig/src/zip_fmt.c	2013-01-04 17:13:01.731285257 +0000
+++ JohnTheRipper/src/zip_fmt.c	2013-01-04 17:24:05.000318955 +0000
@@ -155,7 +155,7 @@ static int cmp_exact(char *source, int i
 	return has_been_cracked[index];
 }
 
-struct fmt_main zip_fmt = {
+struct fmt_main fmt_zip = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,