diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 0740b2e1..f0e7ecca 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -756,12 +756,12 @@ selinux_relabel_file (OstreeSysroot                 *sysroot,
     goto out;
 
   g_ptr_array_add (path_parts, (char*)prefix);
-  g_ptr_array_add (path_parts, (char*)gs_file_get_basename_cached (path));
+  g_ptr_array_add (path_parts, (char*)g_file_info_get_name (file_info));
   if (!relabel_one_path (sysroot, sepolicy, path, file_info, path_parts,
                          cancellable, error))
     {
       g_prefix_error (error, "Relabeling /%s/%s: ", prefix,
-                      gs_file_get_basename_cached (path));
+                      g_file_info_get_name (file_info));
       goto out;
     }
 
diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index 6541a321..a9da4504 100644
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -358,7 +358,7 @@ ot_gfile_replace_contents_fsync (GFile          *path,
 {
   gboolean ret = FALSE;
   int parent_dfd;
-  const char *target_basename = gs_file_get_basename_cached (path);
+  const char *target_basename = glnx_basename (gs_file_get_path_cached (path));
   g_autoptr(GFile) parent = NULL;
 
   parent = g_file_get_parent (path);
@@ -447,7 +447,7 @@ ot_util_ensure_directory_and_fsync (GFile         *dir,
 {
   gboolean ret = FALSE;
   int parentfd = -1;
-  const char *basename = gs_file_get_basename_cached (dir);
+  const char *basename = glnx_basename (gs_file_get_path_cached (dir));
   g_autoptr(GFile) parent = g_file_get_parent (dir);
   
  again: