diff --git a/gitoxide-core/src/repository/clean.rs b/gitoxide-core/src/repository/clean.rs
index 0a05d4c0e7d..740a0d7f34f 100644
--- a/gitoxide-core/src/repository/clean.rs
+++ b/gitoxide-core/src/repository/clean.rs
@@ -188,7 +188,7 @@ pub(crate) mod function {
             }
 
             match disk_kind {
-                Kind::NonFile => {
+                Kind::Untrackable => {
                     if debug {
                         writeln!(err, "DBG: skipped non-file at '{}'", entry.rela_path).ok();
                     }
@@ -265,7 +265,7 @@ pub(crate) mod function {
                     "WOULD remove"
                 },
                 suffix = match disk_kind {
-                    Kind::NonFile => unreachable!("always skipped earlier"),
+                    Kind::Untrackable => unreachable!("always skipped earlier"),
                     Kind::Directory if entry.property == Some(gix::dir::entry::Property::EmptyDirectory) => {
                         " empty"
                     }
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 24a220e5a90..3711151ec7f 100644
--- a/gix-status/src/index_as_worktree_with_renames/mod.rs
+++ b/gix-status/src/index_as_worktree_with_renames/mod.rs
@@ -388,7 +388,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
-                if entry.disk_kind != Some(gix_dir::entry::Kind::NonFile) {
+                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();
                 }
@@ -469,7 +469,7 @@ pub(super) mod function {
                     ModificationOrDirwalkEntry::Modification(c) => c.entry.mode.to_tree_entry_mode(),
                     ModificationOrDirwalkEntry::DirwalkEntry { entry, .. } => entry.disk_kind.map(|kind| {
                         match kind {
-                            Kind::NonFile => {
+                            Kind::Untrackable => {
                                 // Trees are never tracked for rewrites, so we 'pretend'.
                                 gix_object::tree::EntryKind::Tree
                             }
@@ -507,7 +507,7 @@ pub(super) mod function {
             };
 
             Ok(match kind {
-                Kind::NonFile => {
+                Kind::Untrackable => {
                     // Go along with unreadable files, they are passed along without rename tracking.
                     return Ok(object_hash.null());
                 }