diff --git a/Manager/module.json b/Manager/module.json
index fcd595b..bf46558 100644
--- a/Manager/module.json
+++ b/Manager/module.json
@@ -2,9 +2,9 @@
     "id": "{6F771B18-59D4-4C8A-B951-3B2FE9F6A2C4}",
     "name": "Manager",
     "type": 3,
-    "vendor": "Belevo AG",
+    "vendor": "Enelix",
     "aliases": [
-        "Enelix 2 Manager"
+        "Manager"
     ],
     "parentRequirements": [],
     "childRequirements": [],
diff --git a/Warmwassererwaermer/module.json b/Warmwassererwaermer/module.json
index 2d49deb..6aab4ff 100644
--- a/Warmwassererwaermer/module.json
+++ b/Warmwassererwaermer/module.json
@@ -2,10 +2,10 @@
     "id": "{B7C54AF4-AD7D-4FE4-B75D-203693906251}",
     "name": "VerbraucherWarmwassererwaermer",
     "type": 3,
-    "vendor": "Belevo AG",
+    "vendor": "Enelix",
     "aliases": [
-        "Enelix 2 Verbraucher Warmwassererwaermer",
-        "Enelix 2 Wassererwaermer"
+        "Verbraucher Warmwassererwaermer",
+        "Wassererwaermer"
     ],
     "parentRequirements": [],
     "childRequirements": [],
diff --git a/library.json b/library.json
index 5860fe9..54e04d1 100644
--- a/library.json
+++ b/library.json
@@ -1,7 +1,7 @@
 {
     "id": "{E0185158-0DA9-4D44-BAA7-B06D3D786276}",
     "name": "Enelix EMS",
-    "author": "Belevo AG",
+    "author": "Enelix",
     "url": "https://git.belevo.ch/ENELIX/Enelix-EMS",
     "compatibility": {
         "version": "8.0"
diff --git a/tests/LibraryMetadataTest.php b/tests/LibraryMetadataTest.php
index 586eee9..53b5e8b 100644
--- a/tests/LibraryMetadataTest.php
+++ b/tests/LibraryMetadataTest.php
@@ -15,6 +15,7 @@ final class LibraryMetadataTest extends TestCase
 
         $daten = json_decode($inhalt, true, 512, JSON_THROW_ON_ERROR);
         self::assertSame('Enelix EMS', $daten['name']);
+        self::assertSame('Enelix', $daten['author']);
         self::assertSame('8.0', $daten['compatibility']['version']);
         self::assertMatchesRegularExpression('/^\{[0-9A-F-]{36}\}$/', $daten['id']);
     }
diff --git a/tests/ManagerModulstrukturTest.php b/tests/ManagerModulstrukturTest.php
index a9fea51..b85cfc5 100644
--- a/tests/ManagerModulstrukturTest.php
+++ b/tests/ManagerModulstrukturTest.php
@@ -21,6 +21,8 @@ final class ManagerModulstrukturTest extends TestCase
             JSON_THROW_ON_ERROR
         );
         self::assertSame('Manager', $metadaten['name']);
+        self::assertSame('Enelix', $metadaten['vendor']);
+        self::assertSame(['Manager'], $metadaten['aliases']);
         self::assertSame(3, $metadaten['type']);
         self::assertMatchesRegularExpression('/^\{[0-9A-F-]{36}\}$/', $metadaten['id']);
     }
diff --git a/tests/WarmwassererwaermerModulstrukturTest.php b/tests/WarmwassererwaermerModulstrukturTest.php
index b9b7d1b..3dfdd29 100644
--- a/tests/WarmwassererwaermerModulstrukturTest.php
+++ b/tests/WarmwassererwaermerModulstrukturTest.php
@@ -23,6 +23,11 @@ final class WarmwassererwaermerModulstrukturTest extends TestCase
             JSON_THROW_ON_ERROR
         );
         self::assertSame('VerbraucherWarmwassererwaermer', $metadaten['name']);
+        self::assertSame('Enelix', $metadaten['vendor']);
+        self::assertSame(
+            ['Verbraucher Warmwassererwaermer', 'Wassererwaermer'],
+            $metadaten['aliases']
+        );
         self::assertSame(3, $metadaten['type']);
         self::assertMatchesRegularExpression('/^\{[0-9A-F-]{36}\}$/', $metadaten['id']);
     }