diff --git a/packet-nfs.c b/packet-nfs.c
index 0d454fd41a..e5d1c96244 100644
--- a/packet-nfs.c
+++ b/packet-nfs.c
@@ -2,7 +2,7 @@
  * Routines for nfs dissection
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  *
- * $Id: packet-nfs.c,v 1.3 1999/11/15 14:17:18 nneul Exp $
+ * $Id: packet-nfs.c,v 1.4 1999/11/15 14:32:15 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -1431,7 +1431,7 @@ const vsff nfs3_proc[] = {
 void
 proto_register_nfs(void)
 {
-	proto_nfs = proto_register_protocol("Network File System", "NFS");
+	proto_nfs = proto_register_protocol("Network File System", "nfs");
 
 	/* Register the protocol as RPC */
 	rpc_init_prog(proto_nfs, NFS_PROGRAM, ETT_NFS);
diff --git a/packet-nlm.c b/packet-nlm.c
index d685ea63cd..14a2bc32a0 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
 /* packet-nlm.c
  * Routines for nlm dissection
  *
- * $Id: packet-nlm.c,v 1.1 1999/11/15 14:17:19 nneul Exp $
+ * $Id: packet-nlm.c,v 1.2 1999/11/15 14:32:16 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -74,7 +74,7 @@ const vsff nlm3_proc[] = {
 void
 proto_register_nlm(void)
 {
-	proto_nlm = proto_register_protocol("Network Lock Manager Protocol", "NLM");
+	proto_nlm = proto_register_protocol("Network Lock Manager Protocol", "nlm");
 
 	/* Register the protocol as RPC */
 	rpc_init_prog(proto_nlm, NLM_PROGRAM, ETT_NLM);
diff --git a/packet-rpc.c b/packet-rpc.c
index 830ab020c5..2504523085 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
  * Routines for rpc dissection
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  * 
- * $Id: packet-rpc.c,v 1.12 1999/11/15 14:17:19 nneul Exp $
+ * $Id: packet-rpc.c,v 1.13 1999/11/15 14:32:16 nneul Exp $
  * 
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -184,6 +184,7 @@ rpc_init_prog(int proto, guint32 prog, int ett)
 {
 	rpc_prog_info_key *key;
 	rpc_prog_info_value *value;
+	char *uc_progname = NULL, *lc_progname = NULL;
 
 	key = (rpc_prog_info_key *) g_malloc(sizeof(rpc_prog_info_key));
 	key->prog = prog;
@@ -191,7 +192,18 @@ rpc_init_prog(int proto, guint32 prog, int ett)
 	value = (rpc_prog_info_value *) g_malloc(sizeof(rpc_prog_info_value));
 	value->proto = proto;
 	value->ett = ett;
-	value->progname = proto_registrar_get_abbrev(proto);
+
+	lc_progname = proto_registrar_get_abbrev(proto);
+	if ( lc_progname )
+	{
+		int i;
+		uc_progname = strdup(lc_progname);
+		for (i=0; i<strlen(uc_progname); i++)
+		{
+			uc_progname[i] = toupper(uc_progname[i]);
+		}
+	}
+	value->progname = uc_progname;
 
 	g_hash_table_insert(rpc_progs,key,value);
 }