diff --git a/gitoxide-core/src/repository/clean.rs b/gitoxide-core/src/repository/clean.rs
index 740a0d7f34f..8ccc8a90dfb 100644
--- a/gitoxide-core/src/repository/clean.rs
+++ b/gitoxide-core/src/repository/clean.rs
@@ -190,7 +190,7 @@ pub(crate) mod function {
             match disk_kind {
                 Kind::Untrackable => {
                     if debug {
-                        writeln!(err, "DBG: skipped non-file at '{}'", entry.rela_path).ok();
+                        writeln!(err, "DBG: skipped untrackable entry at '{}'", entry.rela_path).ok();
                     }
                     continue;
                 }
diff --git a/gix-dir/tests/dir/walk.rs b/gix-dir/tests/dir/walk.rs
index a7c5074cb9c..a6e34b257af 100644
--- a/gix-dir/tests/dir/walk.rs
+++ b/gix-dir/tests/dir/walk.rs
@@ -69,7 +69,7 @@ fn one_top_level_fifo() {
     assert_eq!(
         entries,
         &[entry("top", Untracked, Untrackable),],
-        "Non-files are like normal files, but with a different state"
+        "Untrackable entries are like normal files, but with a different state"
     );
 }
 
@@ -107,7 +107,7 @@ fn fifo_in_traversal() {
             entry("file", Untracked, File),
             entry("top", Untracked, Untrackable),
         ],
-        "Non-files only differ by their disk-kind"
+        "Untrackable entries only differ by their disk-kind"
     );
 }
 
diff --git a/gix-status/src/index_as_worktree_with_renames/mod.rs b/gix-status/src/index_as_worktree_with_renames/mod.rs
index 3711151ec7f..ea62d825ee6 100644
--- a/gix-status/src/index_as_worktree_with_renames/mod.rs
+++ b/gix-status/src/index_as_worktree_with_renames/mod.rs
@@ -387,7 +387,7 @@ pub(super) mod function {
 
         impl<T, U> gix_dir::walk::Delegate for Delegate<'_, '_, T, U> {
             fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option<Status>) -> Action {
-                // Status never shows untracked non-files
+                // Status never shows untracked entries of untrackable type
                 if entry.disk_kind != Some(gix_dir::entry::Kind::Untrackable) {
                     let entry = entry.to_owned();
                     self.tx.send(Event::DirEntry(entry, collapsed_directory_status)).ok();