diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 246a3412..e8c61ad5 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -546,7 +546,7 @@ checkout_deployment_tree (OstreeSysroot     *sysroot,
                           GError           **error)
 {
   gboolean ret = FALSE;
-  OstreeRepoCheckoutOptions checkout_opts = { 0, };
+  OstreeRepoCheckoutAtOptions checkout_opts = { 0, };
   const char *csum = ostree_deployment_get_csum (deployment);
   g_autofree char *checkout_target_name = NULL;
   g_autofree char *osdeploy_path = NULL;
@@ -571,9 +571,9 @@ checkout_deployment_tree (OstreeSysroot     *sysroot,
   if (!glnx_shutil_rm_rf_at (osdeploy_dfd, checkout_target_name, cancellable, error))
     goto out;
 
-  if (!ostree_repo_checkout_tree_at (repo, &checkout_opts, osdeploy_dfd,
-                                     checkout_target_name, csum,
-                                     cancellable, error))
+  if (!ostree_repo_checkout_at (repo, &checkout_opts, osdeploy_dfd,
+                                checkout_target_name, csum,
+                                cancellable, error))
     goto out;
 
   if (!glnx_opendirat (osdeploy_dfd, checkout_target_name, TRUE, &ret_fd, error))
diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index c6fdf1fc..21e568b2 100644
--- a/src/ostree/ot-builtin-checkout.c
+++ b/src/ostree/ot-builtin-checkout.c
@@ -84,12 +84,12 @@ process_one_checkout (OstreeRepo           *repo,
 
   /* This strange code structure is to preserve testing
    * coverage of both `ostree_repo_checkout_tree` and
-   * `ostree_repo_checkout_tree_at` until such time as we have a more
+   * `ostree_repo_checkout_at` until such time as we have a more
    * convenient infrastructure for testing C APIs with data.
    */
   if (opt_disable_cache || opt_whiteouts || opt_require_hardlinks)
     {
-      OstreeRepoCheckoutOptions options = { 0, };
+      OstreeRepoCheckoutAtOptions options = { 0, };
       
       if (opt_user_mode)
         options.mode = OSTREE_REPO_CHECKOUT_MODE_USER;
@@ -101,10 +101,10 @@ process_one_checkout (OstreeRepo           *repo,
         options.subpath = subpath;
       options.no_copy_fallback = opt_require_hardlinks;
 
-      if (!ostree_repo_checkout_tree_at (repo, &options,
-                                         AT_FDCWD, destination,
-                                         resolved_commit,
-                                         cancellable, error))
+      if (!ostree_repo_checkout_at (repo, &options,
+                                    AT_FDCWD, destination,
+                                    resolved_commit,
+                                    cancellable, error))
         goto out;
     }
   else