diff --git a/eid_api.lua b/eid_api.lua
index 68182ec8..8b3ead3c 100644
--- a/eid_api.lua
+++ b/eid_api.lua
@@ -547,7 +547,8 @@ function EID:getObjectName(Type, Variant, SubType)
 	elseif tableName == "dice" then
 		return EID:getDescriptionEntry("diceHeader").." ("..SubType..")"
 	elseif tableName == "custom" then
-		return name or Type.."."..Variant.."."..SubType
+		local xmlName = EID.XMLEntityNames[Type.."."..Variant] or EID.XMLEntityNames[Type.."."..Variant.."."..SubType]
+		return name or xmlName or Type.."."..Variant.."."..SubType
 	end
 	return Type.."."..Variant.."."..SubType
 end
@@ -641,15 +642,15 @@ function EID:replaceNameMarkupStrings(text)
 			end
 			name = EID:getObjectName(entityID[1], entityID[2], entityID[3])
 		elseif indicator == "C" then -- Collectible
-			name = EID:getObjectName(5, 100, id)
+			name = "{{Collectible"..id.."}}"..EID:getObjectName(5, 100, id)
 		elseif indicator == "T" then -- Trinket
-			name = EID:getObjectName(5, 350, id)
+			name = "{{Trinket"..id.."}}"..EID:getObjectName(5, 350, id)
 		elseif indicator == "P" then -- Pills
-			name = EID:getObjectName(5, 70, id)
+			name = "{{Pill"..id.."}}"..EID:getPillName(id, false)
 		elseif indicator == "K" then -- Card
-			name = EID:getObjectName(5, 300, id)
+			name = "{{Card"..id.."}}"..EID:getObjectName(5, 300, id)
 		end
-		text = string.gsub(text, word, name, 1)
+		text = string.gsub(text, word, "{{ColorYellow}}"..name.."{{CR}}", 1)
 	end
 	return text
 end
diff --git a/eid_debugging.lua b/eid_debugging.lua
index 5cdb4545..b24ff60e 100644
--- a/eid_debugging.lua
+++ b/eid_debugging.lua
@@ -161,7 +161,7 @@ EID.InlineIcons["Test"] = {"pickups", -1, 9, 9, -1, 0, dummySprite3}
 
 
 __eidItemDescriptions[3] = "{{Bomb}} Emote {{Key}} Test {{Test}}{{TestIcon}} {{ColorBlackBlink}}description {{SomeInvalidInnerStuff}} cool" -- 5.100.2 = Inner Eye
-__eidItemDescriptions[6] = "This item as Inline Icon {{Collectible6}}#And here are others {{Collectible69}} {{Collectible16}} {{Collectible323}} {{Collectible345}} {{Collectible223}}#And some trinket sprites {{Trinket12}} {{Trinket22}} {{Trinket1}} {{Trinket55}} {{Trinket100}} {{Trinket123}}#And some names {{NameC3}} {{NameT23}} {{Name5.100.231}}" -- 5.100.2 = Inner Eye
+__eidItemDescriptions[6] = "This item as Inline Icon {{Collectible6}}#And here are others {{Collectible69}} {{Collectible16}} {{Collectible323}} {{Collectible345}} {{Collectible223}}#And some trinket sprites {{Trinket12}} {{Trinket22}} {{Trinket1}} {{Trinket55}} {{Trinket100}} {{Trinket123}}#And some names {{NameC3}},{{NameT23}} test {{Name3.54.0}}" -- 5.100.2 = Inner Eye
 
 
 EID:addIgnoredEntity(5,100,10) -- Ignore "Halo of flies" collectible entity