diff --git a/lib/error.js b/lib/error.js
index 9d1ecacb9..819299681 100644
--- a/lib/error.js
+++ b/lib/error.js
@@ -10,7 +10,8 @@ Object.keys(NodeGit.Error.CODE).forEach((key) => {
   Object.defineProperty(NodeGit.Error.CODE, `GITERR_${key}`, {
     get: util.deprecate(
       () => NodeGit.Error.CODE[key],
-      `Use NodeGit.Error.CODE.${key} instead.`
+      `Use NodeGit.Error.CODE.${key} instead of ` +
+      `NodeGit.Error.CODE.GETERR_${key}.`
     )
   });
 });
diff --git a/lib/index.js b/lib/index.js
index 3426b1030..ad37cea78 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -41,7 +41,8 @@ Object.keys(NodeGit.Index.CAPABILITY).forEach((key) => {
   Object.defineProperty(NodeGit.Index.CAP, key, {
     get: util.deprecate(
       () => NodeGit.Index.CAPABILITY[key],
-      `Use NodeGit.Index.CAPABILITY.${key} instead.`
+      `Use NodeGit.Index.CAPABILITY.${key} instead of ` +
+      `NodeGit.Index.CAP.${key}.`
     )
   });
 });
@@ -50,13 +51,15 @@ NodeGit.Enums.INDXENTRY_FLAG = {};
 Object.defineProperty(NodeGit.Enums.INDXENTRY_FLAG, "IDXENTRY_EXTENDED", {
   get: util.deprecate(
     () => NodeGit.Index.ENTRY_FLAG.ENTRY_EXTENDED,
-    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_EXTENDED instead."
+    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_EXTENDED instead of " +
+    "NodeGit.Enums.INDXENTRY_FLAG.IDXENTRY_EXTENDED."
   )
 });
 Object.defineProperty(NodeGit.Enums.INDXENTRY_FLAG, "IDXENTRY_VALID", {
   get: util.deprecate(
     () => NodeGit.Index.ENTRY_FLAG.ENTRY_VALID,
-    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_VALID instead."
+    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_VALID instead of " +
+    "NodeGit.Enums.INDXENTRY_FLAG.IDXENTRY_VALID."
   )
 });
 
@@ -72,7 +75,8 @@ Object.keys(EXTENDED_FLAGS_MAP).forEach((key) => {
   Object.defineProperty(NodeGit.Enums.IDXENTRY_EXTENDED_FLAG, key, {
     get: util.deprecate(
       () => NodeGit.Index.ENTRY_EXTENDED_FLAG[newKey],
-      `Use NodeGit.Index.ENTRY_EXTENDED_FLAG.${newKey} instead.`
+      `Use NodeGit.Index.ENTRY_EXTENDED_FLAG.${newKey} instead of ` +
+      `NodeGit.Enums.IDXENTRY_EXTENDED_FLAG.${key}.`
     )
   });
 });
diff --git a/lib/object.js b/lib/object.js
index 8e65660d9..680aebd12 100644
--- a/lib/object.js
+++ b/lib/object.js
@@ -40,6 +40,6 @@ Obj.prototype.isTree = function() {
 Object.defineProperty(Obj.TYPE, "BAD", {
   get: util.deprecate(
     () => Obj.TYPE.INVALID,
-    "Use NodeGit.Object.TYPE.INVALID instead."
+    "Use NodeGit.Object.TYPE.INVALID instead of NodeGit.Object.TYPE.BAD."
   )
 });
diff --git a/lib/reference.js b/lib/reference.js
index af859c3cc..af3e00621 100644
--- a/lib/reference.js
+++ b/lib/reference.js
@@ -190,14 +190,14 @@ Reference.updateTerminal = function (
 Object.defineProperty(NodeGit.Reference.TYPE, "OID", {
   get: util.deprecate(
     () => NodeGit.Reference.TYPE.DIRECT,
-    "Use NodeGit.Reference.TYPE.DIRECT instead."
+    "Use NodeGit.Reference.TYPE.DIRECT instead of NodeGit.Reference.TYPE.OID."
   )
 });
 
 Object.defineProperty(NodeGit.Reference.TYPE, "LISTALL", {
   get: util.deprecate(
     () => NodeGit.Reference.TYPE.ALL,
-    "Use NodeGit.Reference.TYPE.ALL instead."
+    "Use NodeGit.Reference.TYPE.ALL instead of NodeGit.Reference.TYPE.LISTALL."
   )
 });
 
@@ -206,7 +206,8 @@ Object.keys(NodeGit.Reference.FORMAT).forEach((key) => {
   Object.defineProperty(NodeGit.Reference.NORMALIZE, `REF_FORMAT_${key}`, {
     get: util.deprecate(
       () => NodeGit.Reference.FORMAT[key],
-      `Use NodeGit.Reference.FORMAT.${key} instead.`
+      `Use NodeGit.Reference.FORMAT.${key} instead of ` +
+      `NodeGit.Reference.NORMALIZE.REF_FORMAT_${key}.`
     )
   });
 });