diff --git a/entities/generic-entities.ent b/entities/generic-entities.ent
index 26088b5..eaf1ddd 100644
--- a/entities/generic-entities.ent
+++ b/entities/generic-entities.ent
@@ -190,7 +190,7 @@ use &deng;! -->
 <!ENTITY hpe                    "HPE">
 <!ENTITY ibm                    "IBM">
 <!ENTITY ms                     "Microsoft">
-<!ENTITY msreg                  "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>&ms;</trademark>">
+<!ENTITY msreg                  "&ms;*">
 <!ENTITY nvidia                 "NVIDIA">
 <!ENTITY rh                     "Red Hat">
 <!ENTITY redhat                 "&rh;">
@@ -201,9 +201,9 @@ use &deng;! -->
 
 <!ENTITY hana                   "&sap; HANA">
 <!ENTITY macos                  "macOS">
-<!ENTITY macosreg               "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>&macos;</trademark>">
+<!ENTITY macosreg               "&macos;*">
 <!ENTITY mswin                  "&ms; Windows">
-<!ENTITY mswinreg               "&msreg; <trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Windows</trademark>">
+<!ENTITY mswinreg               "&msreg; Windows*">
 <!ENTITY netware                "NetWare">
 <!ENTITY netweaver              "&sap; NetWeaver">
 <!ENTITY ostack                 "OpenStack">