diff --git a/nmap-service-probes b/nmap-service-probes
index a0801197a..b2a280c21 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -9338,8 +9338,8 @@ Probe TCP JavaRMI q|\x4a\x52\x4d\x49\0\x02\x4b|
 rarity 8
 ports 706,1098,1099,1981
 
-match jrmi m|^\x4e..[0-9.]+\0\0..$|s p/Java RMI/
-match jrmi m|^\x4e..([\w._-]+)\0\0..$|s p/GNU Classpath grmiregistry/ h/$1/
+match rmiregistry m|^\x4e..[0-9.]+\0\0..$|s p/Java RMI/
+match rmiregistry m|^\x4e..([\w._-]+)\0\0..$|s p/GNU Classpath grmiregistry/ h/$1/
 
 ##############################NEXT PROBE##############################
 Probe TCP Radmin q|\x01\x00\x00\x00\x01\x00\x00\x00\x08\x08|
diff --git a/scripts/rmi-dumpregistry.nse b/scripts/rmi-dumpregistry.nse
index 131618b48..312ab4c7c 100644
--- a/scripts/rmi-dumpregistry.nse
+++ b/scripts/rmi-dumpregistry.nse
@@ -18,8 +18,8 @@ Some apps give away the classpath, which this scripts catches in so-called "Cust
 ---
 -- @usage nmap --script "rmi-dumpregistry.nse" -p 1098 <host>
 -- @output
--- PORT     STATE SERVICE REASON
--- 1099/tcp open  rmi     syn-ack
+-- PORT     STATE SERVICE     REASON
+-- 1099/tcp open  rmiregistry syn-ack
 -- | rmi-dumpregistry:  
 -- |   jmxrmi
 -- |     javax.management.remote.rmi.RMIServerImpl_Stub
@@ -30,8 +30,8 @@ Some apps give away the classpath, which this scripts catches in so-called "Cust
 -- |_        java.rmi.server.RemoteObject
 --
 -- @output
--- PORT     STATE SERVICE REASON
--- 1099/tcp open  rmi     syn-ack
+-- PORT     STATE SERVICE     REASON
+-- 1099/tcp open  rmiregistry syn-ack
 -- | rmi-dumpregistry:  
 -- |   cfassembler/default
 -- |     coldfusion.flex.rmi.DataServicesCFProxyServer_Stub
@@ -145,7 +145,7 @@ categories = {"default", "discovery", "safe"}
 
 require "shortport"
 require "rmi"
-portrule = shortport.port_or_service({1098, 1099, 1090, 8901, 8902, 8903}, {"rmi"})
+portrule = shortport.port_or_service({1098, 1099, 1090, 8901, 8902, 8903}, {"rmiregistry"})
 
 -- Some lazy shortcuts