diff --git a/ChangeLog b/ChangeLog
index 849eb931..77453954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ version 3.08 ()
       summarize more standard class methods
     * On EOS, the LLDP port ID is a dot1d port
     * Use LLDP in Layer3::Aruba, for switches
+    * Clean up more model names in L2::Baystack
 
    [BUG FIXES]
 
diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm
index 08560382..e5cdef7a 100644
--- a/Info/Layer2/Baystack.pm
+++ b/Info/Layer2/Baystack.pm
@@ -141,6 +141,7 @@ sub model {
     $model =~ s/^sreg-//;
     # Strip ES/ERS/BayStack etc. from those families
     $model =~ s/^(E(R)?S|BayStack|Ethernet(Routing)?Switch)-?//;
+    $model =~ s/-ethSwitchNMM//;
 
     return $model;
 }