diff -urpN JohnTheRipper.orig/src/agilekeychain_fmt_plug.c JohnTheRipper/src/agilekeychain_fmt_plug.c
--- JohnTheRipper.orig/src/agilekeychain_fmt_plug.c	2013-01-04 19:15:32.916659144 +0000
+++ JohnTheRipper/src/agilekeychain_fmt_plug.c	2013-01-04 19:23:58.421684861 +0000
@@ -240,7 +240,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main agile_keychain_fmt = {
+struct fmt_main fmt_agile_keychain= {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/chap_fmt_plug.c JohnTheRipper/src/chap_fmt_plug.c
--- JohnTheRipper.orig/src/chap_fmt_plug.c	2013-01-04 19:15:32.907659146 +0000
+++ JohnTheRipper/src/chap_fmt_plug.c	2013-01-04 19:24:36.192686786 +0000
@@ -205,7 +205,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main chap_fmt = {
+struct fmt_main fmt_chap = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/dmg_fmt_plug.c JohnTheRipper/src/dmg_fmt_plug.c
--- JohnTheRipper.orig/src/dmg_fmt_plug.c	2013-01-04 19:15:32.911659146 +0000
+++ JohnTheRipper/src/dmg_fmt_plug.c	2013-01-04 19:25:27.573689392 +0000
@@ -570,7 +570,7 @@ static int cmp_exact(char *source, int i
 	return cracked[index];
 }
 
-struct fmt_main dmg_fmt = {
+struct fmt_main fmt_dmg = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/episerver_fmt_plug.c JohnTheRipper/src/episerver_fmt_plug.c
--- JohnTheRipper.orig/src/episerver_fmt_plug.c	2013-01-04 19:15:32.909659146 +0000
+++ JohnTheRipper/src/episerver_fmt_plug.c	2013-01-04 19:26:03.608691236 +0000
@@ -246,7 +246,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main episerver_fmt = {
+struct fmt_main fmt_episerver = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/ike_fmt_plug.c JohnTheRipper/src/ike_fmt_plug.c
--- JohnTheRipper.orig/src/ike_fmt_plug.c	2013-01-04 19:15:32.917659146 +0000
+++ JohnTheRipper/src/ike_fmt_plug.c	2013-01-04 19:27:00.397694119 +0000
@@ -251,7 +251,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main ike_fmt = {
+struct fmt_main fmt_ike = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/keepass_fmt_plug.c JohnTheRipper/src/keepass_fmt_plug.c
--- JohnTheRipper.orig/src/keepass_fmt_plug.c	2013-01-04 19:15:32.917659146 +0000
+++ JohnTheRipper/src/keepass_fmt_plug.c	2013-01-04 19:23:20.346682939 +0000
@@ -378,7 +378,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main KeePass_fmt = {
+struct fmt_main fmt_KeePass = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/keychain_fmt_plug.c JohnTheRipper/src/keychain_fmt_plug.c
--- JohnTheRipper.orig/src/keychain_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/keychain_fmt_plug.c	2013-01-04 19:27:38.777696055 +0000
@@ -214,7 +214,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main keychain_fmt = {
+struct fmt_main fmt_keychain = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/keyring_fmt_plug.c JohnTheRipper/src/keyring_fmt_plug.c
--- JohnTheRipper.orig/src/keyring_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/keyring_fmt_plug.c	2013-01-04 19:28:22.077698276 +0000
@@ -282,7 +282,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main keyring_fmt = {
+struct fmt_main fmt_keyring = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/lastpass_sniffed_fmt_plug.c JohnTheRipper/src/lastpass_sniffed_fmt_plug.c
--- JohnTheRipper.orig/src/lastpass_sniffed_fmt_plug.c	2013-01-04 19:15:32.916659144 +0000
+++ JohnTheRipper/src/lastpass_sniffed_fmt_plug.c	2013-01-04 19:43:07.245743280 +0000
@@ -206,7 +206,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main lastpass_fmt = {
+struct fmt_main fmt_sniffed_lastpass = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/mongodb_fmt_plug.c JohnTheRipper/src/mongodb_fmt_plug.c
--- JohnTheRipper.orig/src/mongodb_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/mongodb_fmt_plug.c	2013-01-04 19:29:53.157702907 +0000
@@ -270,7 +270,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main mongodb_fmt = {
+struct fmt_main fmt_mongodb = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/mysql_netauth_fmt_plug.c JohnTheRipper/src/mysql_netauth_fmt_plug.c
--- JohnTheRipper.orig/src/mysql_netauth_fmt_plug.c	2013-01-04 19:15:32.916659144 +0000
+++ JohnTheRipper/src/mysql_netauth_fmt_plug.c	2013-01-04 19:31:01.499706385 +0000
@@ -207,7 +207,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main mysqlna_fmt = {
+struct fmt_main fmt_mysqlna = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/nukedclan_fmt_plug.c JohnTheRipper/src/nukedclan_fmt_plug.c
--- JohnTheRipper.orig/src/nukedclan_fmt_plug.c	2013-01-04 19:15:32.910659146 +0000
+++ JohnTheRipper/src/nukedclan_fmt_plug.c	2013-01-04 19:31:54.424709076 +0000
@@ -250,7 +250,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main nk_fmt = {
+struct fmt_main fmt_nk = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/o5logon_fmt_plug.c JohnTheRipper/src/o5logon_fmt_plug.c
--- JohnTheRipper.orig/src/o5logon_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/o5logon_fmt_plug.c	2013-01-04 19:32:55.358712174 +0000
@@ -195,7 +195,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main o5logon_fmt = {
+struct fmt_main fmt_o5logon = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/odf_fmt_plug.c JohnTheRipper/src/odf_fmt_plug.c
--- JohnTheRipper.orig/src/odf_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/odf_fmt_plug.c	2013-01-04 19:33:31.697714000 +0000
@@ -318,7 +318,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main odf_fmt = {
+struct fmt_main fmt_odf = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/office_fmt_plug.c JohnTheRipper/src/office_fmt_plug.c
--- JohnTheRipper.orig/src/office_fmt_plug.c	2013-01-04 19:15:32.914659144 +0000
+++ JohnTheRipper/src/office_fmt_plug.c	2013-01-04 19:34:09.188715930 +0000
@@ -491,7 +491,7 @@ static char *get_key(int index)
 	return (char*)utf16_to_enc(saved_key[index]);
 }
 
-struct fmt_main office_fmt = {
+struct fmt_main fmt_office = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/oldoffice_fmt_plug.c JohnTheRipper/src/oldoffice_fmt_plug.c
--- JohnTheRipper.orig/src/oldoffice_fmt_plug.c	2013-01-04 19:15:32.907659146 +0000
+++ JohnTheRipper/src/oldoffice_fmt_plug.c	2013-01-04 19:34:30.254717004 +0000
@@ -282,7 +282,7 @@ static char *get_key(int index)
 	return (char*)utf16_to_enc(saved_key[index]);
 }
 
-struct fmt_main oldoffice_fmt = {
+struct fmt_main fmt_oldoffice = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/postgre_fmt_plug.c JohnTheRipper/src/postgre_fmt_plug.c
--- JohnTheRipper.orig/src/postgre_fmt_plug.c	2013-01-04 19:15:32.914659144 +0000
+++ JohnTheRipper/src/postgre_fmt_plug.c	2013-01-04 19:35:12.314719112 +0000
@@ -194,7 +194,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main postgre_fmt = {
+struct fmt_main fmt_postgre = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/pst_fmt_plug.c JohnTheRipper/src/pst_fmt_plug.c
--- JohnTheRipper.orig/src/pst_fmt_plug.c	2013-01-04 19:15:32.916659144 +0000
+++ JohnTheRipper/src/pst_fmt_plug.c	2013-01-04 19:35:46.269720856 +0000
@@ -128,7 +128,7 @@ static int get_hash_2(int index) { retur
 static int get_hash_3(int index) { return crypt_out[index] & 0xffff; }
 static int get_hash_4(int index) { return crypt_out[index] & 0xfffff; }
 
-struct fmt_main pst_fmt = {
+struct fmt_main fmt_pst = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/pwsafe_fmt_plug.c JohnTheRipper/src/pwsafe_fmt_plug.c
--- JohnTheRipper.orig/src/pwsafe_fmt_plug.c	2013-01-04 19:15:32.910659146 +0000
+++ JohnTheRipper/src/pwsafe_fmt_plug.c	2013-01-04 19:37:07.917725020 +0000
@@ -214,7 +214,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main pwsafe_fmt = {
+struct fmt_main fmt_pwsafe = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/racf_fmt_plug.c JohnTheRipper/src/racf_fmt_plug.c
--- JohnTheRipper.orig/src/racf_fmt_plug.c	2013-01-04 19:15:32.913659145 +0000
+++ JohnTheRipper/src/racf_fmt_plug.c	2013-01-04 19:37:41.159726710 +0000
@@ -299,7 +299,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main racf_fmt = {
+struct fmt_main fmt_racf = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/radmin_fmt_plug.c JohnTheRipper/src/radmin_fmt_plug.c
--- JohnTheRipper.orig/src/radmin_fmt_plug.c	2013-01-04 19:15:32.909659146 +0000
+++ JohnTheRipper/src/radmin_fmt_plug.c	2013-01-04 19:38:13.066728328 +0000
@@ -152,7 +152,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main radmin_fmt = {
+struct fmt_main fmt_radmin = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/sip_fmt_plug.c JohnTheRipper/src/sip_fmt_plug.c
--- JohnTheRipper.orig/src/sip_fmt_plug.c	2013-01-04 19:15:32.910659146 +0000
+++ JohnTheRipper/src/sip_fmt_plug.c	2013-01-04 19:38:39.005729652 +0000
@@ -233,7 +233,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main sip_fmt = {
+struct fmt_main fmt_sip = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/ssh_ng_fmt_plug.c JohnTheRipper/src/ssh_ng_fmt_plug.c
--- JohnTheRipper.orig/src/ssh_ng_fmt_plug.c	2013-01-04 19:15:32.906659146 +0000
+++ JohnTheRipper/src/ssh_ng_fmt_plug.c	2013-01-04 19:39:14.896731484 +0000
@@ -340,7 +340,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main sshng_fmt = {
+struct fmt_main fmt_sshng = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/strip_fmt_plug.c JohnTheRipper/src/strip_fmt_plug.c
--- JohnTheRipper.orig/src/strip_fmt_plug.c	2013-01-04 19:15:32.909659146 +0000
+++ JohnTheRipper/src/strip_fmt_plug.c	2013-01-04 19:40:03.596733960 +0000
@@ -231,7 +231,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main strip_fmt = {
+struct fmt_main fmt_strip = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/sxc_fmt_plug.c JohnTheRipper/src/sxc_fmt_plug.c
--- JohnTheRipper.orig/src/sxc_fmt_plug.c	2013-01-04 19:15:32.910659146 +0000
+++ JohnTheRipper/src/sxc_fmt_plug.c	2013-01-04 19:40:43.672735937 +0000
@@ -303,7 +303,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main sxc_fmt = {
+struct fmt_main fmt_sxc = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/vnc_fmt_plug.c JohnTheRipper/src/vnc_fmt_plug.c
--- JohnTheRipper.orig/src/vnc_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/vnc_fmt_plug.c	2013-01-04 19:41:10.946737386 +0000
@@ -270,7 +270,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main vnc_fmt = {
+struct fmt_main fmt_vnc = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,
diff -urpN JohnTheRipper.orig/src/wbb3_fmt_plug.c JohnTheRipper/src/wbb3_fmt_plug.c
--- JohnTheRipper.orig/src/wbb3_fmt_plug.c	2013-01-04 19:15:32.908659146 +0000
+++ JohnTheRipper/src/wbb3_fmt_plug.c	2013-01-04 21:04:31.947991792 +0000
@@ -255,7 +255,7 @@ static char *get_key(int index)
 	return saved_key[index];
 }
 
-struct fmt_main wbb3_fmt = {
+struct fmt_main fmt_wbb3 = {
 	{
 		FORMAT_LABEL,
 		FORMAT_NAME,