diff --git a/src/analyzer/protocols/CMakeLists.txt b/src/analyzer/protocols/CMakeLists.txt
index 004ec72d35..a4e170f52b 100644
--- a/src/analyzer/protocols/CMakeLists.txt
+++ b/src/analyzer/protocols/CMakeLists.txt
@@ -22,7 +22,7 @@ add_subdirectory(modbus)
 add_subdirectory(mime)
 add_subdirectory(ncp)
 add_subdirectory(netflow)
-add_subdirectory(netbios-ssn)
+add_subdirectory(netbios)
 add_subdirectory(ntp)
 add_subdirectory(pia)
 add_subdirectory(pop3)
diff --git a/src/analyzer/protocols/netbios-ssn/CMakeLists.txt b/src/analyzer/protocols/netbios/CMakeLists.txt
similarity index 88%
rename from src/analyzer/protocols/netbios-ssn/CMakeLists.txt
rename to src/analyzer/protocols/netbios/CMakeLists.txt
index 4318fa2b34..6e7c5251a3 100644
--- a/src/analyzer/protocols/netbios-ssn/CMakeLists.txt
+++ b/src/analyzer/protocols/netbios/CMakeLists.txt
@@ -3,7 +3,7 @@ include(BroPlugin)
 
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-bro_plugin_begin(NetbiosSSN)
+bro_plugin_begin(Netbios)
 bro_plugin_cc(NetbiosSSN.cc Plugin.cc)
 bro_plugin_bif(events.bif)
 bro_plugin_bif(functions.bif)
diff --git a/src/analyzer/protocols/netbios-ssn/NetbiosSSN.cc b/src/analyzer/protocols/netbios/NetbiosSSN.cc
similarity index 100%
rename from src/analyzer/protocols/netbios-ssn/NetbiosSSN.cc
rename to src/analyzer/protocols/netbios/NetbiosSSN.cc
diff --git a/src/analyzer/protocols/netbios-ssn/NetbiosSSN.h b/src/analyzer/protocols/netbios/NetbiosSSN.h
similarity index 100%
rename from src/analyzer/protocols/netbios-ssn/NetbiosSSN.h
rename to src/analyzer/protocols/netbios/NetbiosSSN.h
diff --git a/src/analyzer/protocols/netbios-ssn/Plugin.cc b/src/analyzer/protocols/netbios/Plugin.cc
similarity index 75%
rename from src/analyzer/protocols/netbios-ssn/Plugin.cc
rename to src/analyzer/protocols/netbios/Plugin.cc
index 66b4e82d51..7f71dbbe10 100644
--- a/src/analyzer/protocols/netbios-ssn/Plugin.cc
+++ b/src/analyzer/protocols/netbios/Plugin.cc
@@ -3,8 +3,8 @@
 
 #include "NetbiosSSN.h"
 
-BRO_PLUGIN_BEGIN(NetbiosSSN)
-	BRO_PLUGIN_DESCRIPTION("NetbiosSSN Analyzer");
+BRO_PLUGIN_BEGIN(Netbios)
+	BRO_PLUGIN_DESCRIPTION("Netbios Analyzer (SSN only)");
 	BRO_PLUGIN_ANALYZER("NetbiosSSN", netbios_ssn::NetbiosSSN_Analyzer);
 	BRO_PLUGIN_SUPPORT_ANALYZER("Contents_NetbiosSSN");
 	BRO_PLUGIN_BIF_FILE(events);
diff --git a/src/analyzer/protocols/netbios-ssn/events.bif b/src/analyzer/protocols/netbios/events.bif
similarity index 100%
rename from src/analyzer/protocols/netbios-ssn/events.bif
rename to src/analyzer/protocols/netbios/events.bif
diff --git a/src/analyzer/protocols/netbios-ssn/functions.bif b/src/analyzer/protocols/netbios/functions.bif
similarity index 100%
rename from src/analyzer/protocols/netbios-ssn/functions.bif
rename to src/analyzer/protocols/netbios/functions.bif