diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/actual.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/actual.js
index 30d1bb3d089f..3b538fe704ea 100644
--- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/actual.js
+++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/actual.js
@@ -1,4 +1,4 @@
-// T6809
+// #3861
 function t(x = "default", { a, b }, ...args) {
   console.log(x, a, b, args);
 }
diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js
index f68a4b6002a1..bb85d2a92b63 100644
--- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js
+++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js
@@ -1,4 +1,4 @@
-// T6809
+// #3861
 function t() {
   var x = arguments.length <= 0 || arguments[0] === undefined ? "default" : arguments[0];
   var _ref = arguments[1];
diff --git a/packages/babel-traverse/src/path/context.js b/packages/babel-traverse/src/path/context.js
index 360f17c684fa..6710171c578e 100644
--- a/packages/babel-traverse/src/path/context.js
+++ b/packages/babel-traverse/src/path/context.js
@@ -212,7 +212,7 @@ export function requeue(pathToQueue = this) {
   if (pathToQueue.removed) return;
 
   // TODO(loganfsmyth): This should be switched back to queue in parent contexts
-  // automatically once T2892 and T7160 have been resolved. See T7166.
+  // automatically once #2892 and #4135 have been resolved. See #4140.
   // let contexts = this._getQueueContexts();
   let contexts = this.contexts;
 
diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js
index 6465207ebfa7..cb4568240c6f 100644
--- a/packages/babel-traverse/src/path/modification.js
+++ b/packages/babel-traverse/src/path/modification.js
@@ -50,7 +50,7 @@ export function _containerInsert(from, nodes) {
 
       // While this path may have a context, there is currently no guarantee that the context
       // will be the active context, because `popContext` may leave a final context in place.
-      // We should remove this `if` and always push once T7171 has been resolved.
+      // We should remove this `if` and always push once #4145 has been resolved.
       if (this.context.queue) path.pushContext(this.context);
       paths.push(path);
     } else {