diff --git a/menu_css_names.module b/menu_css_names.module
index 1aa5176b0256a9840db702952fb00e6dbc8116d7..d7c48eda2103d2dad52db3bb3d37fa2471f755da 100644
--- a/menu_css_names.module
+++ b/menu_css_names.module
@@ -9,8 +9,8 @@
  */
 function menu_css_names_theme($existing, $type, $theme, $path) {
   return [
-    'menu_css_names__menu' => [
-      'template' => 'menu-css-names--menu',
+    'menu__css_names_menu' => [
+      'template' => 'menu--css-names-menu',
       'base hook' => 'menu',
     ],
   ];
@@ -21,20 +21,18 @@ function menu_css_names_theme($existing, $type, $theme, $path) {
  * @param array $variables
  */
 function menu_css_names_theme_suggestions_menu_alter(array &$suggestions, array $variables) {
-  $suggestions[] = 'menu_css_names__menu';
+  $suggestions[] = 'menu__css_names_menu';
 }
 
 /**
  * Implements hook_preprocess_HOOK() for menu templates.
  */
 function menu_css_names_preprocess_menu(&$variables) {
-  if ($variables['menu_name'] == 'main') {
-    $items = $variables['items'];
-    foreach ($items as $menu_id => $item) {
-      $items[$menu_id]['menu_name_class'] = _make_class_name($items[$menu_id]['title']);
-    }
-    $variables['items'] = $items;
+  $items = $variables['items'];
+  foreach ($items as $menu_id => $item) {
+    $items[$menu_id]['menu_name_class'] = _make_class_name($items[$menu_id]['title']);
   }
+  $variables['items'] = $items;
 }
 
 /**
diff --git a/templates/menu-css-names--menu.html.twig b/templates/menu--css-names-menu.html.twig
similarity index 98%
rename from templates/menu-css-names--menu.html.twig
rename to templates/menu--css-names-menu.html.twig
index eaf89870efb4565971c367a48d7b3d107afa327a..e72d269839cfd440b0724d1705e9e521307feede 100644
--- a/templates/menu-css-names--menu.html.twig
+++ b/templates/menu--css-names-menu.html.twig
@@ -41,7 +41,6 @@
             item.is_expanded ? 'menu-item--expanded',
             item.is_collapsed ? 'menu-item--collapsed',
             item.in_active_trail ? 'menu-item--active-trail',
-            'hello-here2',
             item.menu_name_class
 
             ]