diff --git a/evennia/contrib/base_systems/components/holder.py b/evennia/contrib/base_systems/components/holder.py
index 9ea0d69493..ef0be1a242 100644
--- a/evennia/contrib/base_systems/components/holder.py
+++ b/evennia/contrib/base_systems/components/holder.py
@@ -64,7 +64,7 @@ class ComponentHandler:
         """
         self._set_component(component)
         self.db_names.append(component.name)
-        self.host.tags.add(component.name, category="component")
+        self.host.tags.add(component.name, category="components")
         component.at_added(self.host)
 
     def add_default(self, name):
@@ -85,7 +85,7 @@ class ComponentHandler:
         new_component = component.default_create(self.host)
         self._set_component(new_component)
         self.db_names.append(name)
-        self.host.tags.add(name, category="component")
+        self.host.tags.add(name, category="components")
         new_component.at_added(self.host)
 
     def remove(self, component):
@@ -102,7 +102,7 @@ class ComponentHandler:
         if component_name in self._loaded_components:
             component.at_removed(self.host)
             self.db_names.remove(component_name)
-            self.host.tags.remove(component_name, category="component")
+            self.host.tags.remove(component_name, category="components")
             del self._loaded_components[component_name]
         else:
             message = f"Cannot remove {component_name} from {self.host.name} as it is not registered."
@@ -125,7 +125,7 @@ class ComponentHandler:
 
         instance.at_removed(self.host)
         self.db_names.remove(name)
-        self.host.tags.remove(name, category="component")
+        self.host.tags.remove(name, category="components")
         del self._loaded_components[name]
 
     def get(self, name):
@@ -226,7 +226,7 @@ class ComponentHolderMixin(object):
         """
         super().basetype_posthook_setup()
         for component_name in self.db.component_names:
-            self.tags.add(component_name, category="component")
+            self.tags.add(component_name, category="components")
 
     @property
     def components(self) -> ComponentHandler:
diff --git a/evennia/contrib/base_systems/components/tests.py b/evennia/contrib/base_systems/components/tests.py
index 7a9abd7382..080571e16e 100644
--- a/evennia/contrib/base_systems/components/tests.py
+++ b/evennia/contrib/base_systems/components/tests.py
@@ -118,26 +118,28 @@ class TestComponents(EvenniaTest):
         self.char1.components.add(rct)
         test_c = self.char1.components.get('test_c')
 
-        assert self.char1.tags.has(key="test_c", category="component")
+        assert self.char1.tags.has(key="test_c", category="components")
 
     def test_host_has_added_default_component_tags(self):
         self.char1.components.add_default("test_c")
         test_c = self.char1.components.get("test_c")
 
-        assert self.char1.tags.has(key="test_c", category="component")
+        assert self.char1.tags.has(key="test_c", category="components")
 
     def test_host_remove_component_tags(self):
         rct = RuntimeComponentTestC.create(self.char1)
         handler = self.char1.components
         handler.add(rct)
-        assert self.char1.tags.has(key="test_c", category="component")
+        assert self.char1.tags.has(key="test_c", category="components")
         handler.remove(rct)
-        assert not self.char1.tags.has(key="test_c", category="component")
+
+        assert not self.char1.tags.has(key="test_c", category="components")
 
     def test_host_remove_by_name_component_tags(self):
         rct = RuntimeComponentTestC.create(self.char1)
         handler = self.char1.components
         handler.add(rct)
-        assert self.char1.tags.has(key="test_c", category="component")
+        assert self.char1.tags.has(key="test_c", category="components")
         handler.remove_by_name("test_c")
-        assert not self.char1.tags.has(key="test_c", category="component")
\ No newline at end of file
+
+        assert not self.char1.tags.has(key="test_c", category="components")
\ No newline at end of file