diff --git a/freifunk-versions.php b/freifunk-versions.php
index 09dca23..9941cc1 100644
--- a/freifunk-versions.php
+++ b/freifunk-versions.php
@@ -146,7 +146,6 @@ function ff_hh_beautify_hw_name( $hw, $discard_vendor = '' ) {
 	} elseif ( ! strncmp( $hw, 'ubiquiti', 8 ) ) {
 		if ( $discard_vendor ) $hw = str_replace( $discard_vendor, '', $hw );
 		$hw = str_replace( 'bullet-m', 'bullet-m', $hw );
-		$hw = str_replace( '-m', ' M2', $hw );
 		$hw = str_replace( '-', ' ', $hw );
 		$hw = ucwords( $hw );
 	} elseif ( ! strncmp( $hw, 'd-link', 6 ) ) {
@@ -196,6 +195,11 @@ function ff_hh_beautify_hw_name( $hw, $discard_vendor = '' ) {
                 $hw = strtoupper( $hw );
                 $hw = str_replace( 'meraki', '', $hw );
                 $hw = str_replace( '-', '', $hw );
+        } elseif ( ! strncmp( $hw, 'openmesh', 8 ) ) {
+                if ( $discard_vendor ) $hw = str_replace( $discard_vendor, '', $hw );
+                $hw = strtoupper( $hw );
+                $hw = str_replace( 'openmesh', '', $hw );
+                $hw = str_replace( '-', '', $hw );
 	}
 	return $hw;
 }