diff --git a/mappings.json b/mappings.json
index f423615..d0e82de 100644
--- a/mappings.json
+++ b/mappings.json
@@ -881,12 +881,32 @@
     "global": "Ember.String.htmlSafe",
     "module": "@ember/string",
     "export": "htmlSafe",
+    "deprecated": true,
+    "replacement": {
+      "module": "@ember/template",
+      "export": "htmlSafe"
+    }
+  },
+  {
+    "global": "Ember.String.htmlSafe",
+    "module": "@ember/template",
+    "export": "htmlSafe",
     "deprecated": false
   },
   {
     "global": "Ember.String.isHTMLSafe",
     "module": "@ember/string",
     "export": "isHTMLSafe",
+    "deprecated": true,
+    "replacement": {
+      "module": "@ember/template",
+      "export": "isHTMLSafe"
+    }
+  },
+  {
+    "global": "Ember.String.isHTMLSafe",
+    "module": "@ember/template",
+    "export": "isHTMLSafe",
     "deprecated": false
   },
   {