diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
index fc835f76bf..fa16d6d734 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
@@ -195,7 +195,7 @@ public sealed partial class ChemistrySystem
         if (user != target)
         {
             // Create a pop-up for the target
-            var userName = Identity.Name(user, EntityManager);
+            var userName = Identity.Entity(user, EntityManager);
             _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
                 ("user", userName)), user, Filter.Entities(target));
 
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 4a1c8dcec5..cd8874c1c3 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -250,7 +250,7 @@ namespace Content.Server.Nutrition.EntitySystems
 
             if (forceDrink)
             {
-                var userName = Identity.Name(user, EntityManager);
+                var userName = Identity.Entity(user, EntityManager);
 
                 _popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)),
                     user, Filter.Entities(target));
@@ -335,8 +335,8 @@ namespace Content.Server.Nutrition.EntitySystems
 
             if (forceDrink)
             {
-                var targetName = Identity.Name(uid, EntityManager);
-                var userName = Identity.Name(args.User, EntityManager);
+                var targetName = Identity.Entity(uid, EntityManager);
+                var userName = Identity.Entity(args.User, EntityManager);
 
                 _popupSystem.PopupEntity(
                     Loc.GetString("drink-component-force-feed-success", ("user", userName)), uid, Filter.Entities(uid));
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 713cc2da4c..6718573e58 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -115,7 +115,7 @@ namespace Content.Server.Nutrition.EntitySystems
 
             if (forceFeed)
             {
-                var userName = Identity.Name(user, EntityManager);
+                var userName = Identity.Entity(user, EntityManager);
                 _popupSystem.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
                     user, Filter.Entities(target));
 
@@ -179,8 +179,8 @@ namespace Content.Server.Nutrition.EntitySystems
 
             if (forceFeed)
             {
-                var targetName = Identity.Name(uid, EntityManager);
-                var userName = Identity.Name(args.User, EntityManager);
+                var targetName = Identity.Entity(uid, EntityManager);
+                var userName = Identity.Entity(args.User, EntityManager);
                 _popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName)),
                     uid, Filter.Entities(uid));
 
diff --git a/Resources/Locale/en-US/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
index 9a1b1b3f78..d100fb2e6c 100644
--- a/Resources/Locale/en-US/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
@@ -15,9 +15,9 @@ drink-component-try-use-drink-had-enough = You can't drink more!
 drink-component-try-use-drink-cannot-drink-other = They can't drink anything!
 drink-component-try-use-drink-had-enough-other = They can't drink more!
 drink-component-try-use-drink-success-slurp = Slurp
-drink-component-force-feed = {$user} is trying to make you drink something!
-drink-component-force-feed-success = {$user} forced you to drink something!
-drink-component-force-feed-success-user = You successfully feed {$target}
+drink-component-force-feed = {CAPITALIZE(THE($user))} is trying to make you drink something!
+drink-component-force-feed-success = {CAPITALIZE(THE($user))} forced you to drink something!
+drink-component-force-feed-success-user = You successfully feed {THE($target)}
 
 
 drink-system-verb-drink = Drink
\ No newline at end of file
diff --git a/Resources/Locale/en-US/nutrition/components/food-component.ftl b/Resources/Locale/en-US/nutrition/components/food-component.ftl
index 48c595cb39..2497e83477 100644
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-component.ftl
@@ -20,6 +20,6 @@ food-system-verb-eat = Eat
 
 ## Force feeding
 
-food-system-force-feed = {$user} is trying feed you something!
-food-system-force-feed-success = {$user} forced you to eat something!
-food-system-force-feed-success-user = You successfully feed {$target}
+food-system-force-feed = {CAPITALIZE(THE($user))} is trying feed you something!
+food-system-force-feed-success = {CAPITALIZE(THE($user))} forced you to eat something!
+food-system-force-feed-success-user = You successfully feed {THE($target)}