diff --git a/lua/nvim-tree/actions/node/system-open.lua b/lua/nvim-tree/actions/node/system-open.lua
index 37a63115..9cc11c49 100644
--- a/lua/nvim-tree/actions/node/system-open.lua
+++ b/lua/nvim-tree/actions/node/system-open.lua
@@ -64,7 +64,7 @@ function M.fn(node)
   M.open(node)
 end
 
--- TODO always use native once 0.10 is the minimum neovim version
+-- TODO #2430 always use native once 0.10 is the minimum neovim version
 function M.setup(opts)
   M.config = {}
   M.config.system_open = opts.system_open or {}
diff --git a/lua/nvim-tree/explorer/live-filter.lua b/lua/nvim-tree/explorer/live-filter.lua
index ca772b34..02cfda1c 100644
--- a/lua/nvim-tree/explorer/live-filter.lua
+++ b/lua/nvim-tree/explorer/live-filter.lua
@@ -92,7 +92,7 @@ function LiveFilter:apply_filter(node_)
     return
   end
 
-  -- TODO(kiyan): this iterator cannot yet be refactored with the Iterator module
+  -- this iterator cannot yet be refactored with the Iterator module
   -- since the node mapper is based on its children
   local function iterate(node)
     local filtered_nodes = 0
diff --git a/lua/nvim-tree/git/init.lua b/lua/nvim-tree/git/init.lua
index b963cfd7..9e828bd8 100644
--- a/lua/nvim-tree/git/init.lua
+++ b/lua/nvim-tree/git/init.lua
@@ -118,7 +118,7 @@ function M.reload_project(toplevel, path, callback)
       callback()
     end)
   else
-    -- TODO use callback once async/await is available
+    -- TODO #1974 use callback once async/await is available
     local git_status = Runner.run(opts)
     reload_git_status(toplevel, path, project, git_status)
   end
diff --git a/lua/nvim-tree/node/init.lua b/lua/nvim-tree/node/init.lua
index 5a1f5e2c..d5e78678 100644
--- a/lua/nvim-tree/node/init.lua
+++ b/lua/nvim-tree/node/init.lua
@@ -269,7 +269,7 @@ function BaseNode:group_empty_folders()
   local is_root = not self.parent
   local child_folder_only = self:has_one_child_folder() and self.nodes[1]
   if self.explorer.opts.renderer.group_empty and not is_root and child_folder_only then
-    ---@cast self DirectoryNode -- TODO move this to the class
+    ---@cast self DirectoryNode -- TODO #2886 move this to the class
     self.group_next = child_folder_only
     local ns = child_folder_only:group_empty_folders()
     self.nodes = ns or {}
@@ -292,7 +292,7 @@ end
 function BaseNode:expand_or_collapse(toggle_group)
   toggle_group = toggle_group or false
   if self.has_children then
-    ---@cast self DirectoryNode -- TODO move this to the class
+    ---@cast self DirectoryNode -- TODO #2886 move this to the class
     self.has_children = false
   end