diff --git a/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs b/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs
index ea20fa585f..e61b27e8d8 100644
--- a/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs
+++ b/eden/mononoke/commit_rewriting/backsyncer/src/tests.rs
@@ -510,7 +510,7 @@ async fn verify_mapping_and_all_wc(
 ) -> Result<(), Error> {
     let source_repo = commit_syncer.get_source_repo();
     let target_repo = commit_syncer.get_target_repo();
-    let mover = commit_syncer.get_mover(&ctx)?;
+    let mover = commit_syncer.get_current_mover_DEPRECATED(&ctx)?;
 
     verify_bookmarks(ctx.clone(), commit_syncer.clone()).await?;
 
@@ -589,7 +589,7 @@ async fn verify_bookmarks(
 ) -> Result<(), Error> {
     let source_repo = commit_syncer.get_source_repo();
     let target_repo = commit_syncer.get_target_repo();
-    let mover = commit_syncer.get_mover(&ctx)?;
+    let mover = commit_syncer.get_current_mover_DEPRECATED(&ctx)?;
     let bookmark_renamer = commit_syncer.get_bookmark_renamer(&ctx)?;
 
     let bookmarks = source_repo
diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/lib.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/lib.rs
index c75631c485..2bed2c2337 100644
--- a/eden/mononoke/commit_rewriting/cross_repo_sync/src/lib.rs
+++ b/eden/mononoke/commit_rewriting/cross_repo_sync/src/lib.rs
@@ -516,12 +516,16 @@ where
         &self.mapping
     }
 
-    pub fn get_mover(&self, ctx: &CoreContext) -> Result<Mover, Error> {
+    // TODO(stash): remove callers of this function
+    #[allow(non_snake_case)]
+    pub fn get_current_mover_DEPRECATED(&self, ctx: &CoreContext) -> Result<Mover, Error> {
         let (_, _, mover) = self.get_source_target_mover(ctx)?;
         Ok(mover)
     }
 
-    pub fn get_reverse_mover(&self, ctx: &CoreContext) -> Result<Mover, Error> {
+    // TODO(stash): remove callers of this function
+    #[allow(non_snake_case)]
+    pub fn get_current_reverse_mover_DEPRECATED(&self, ctx: &CoreContext) -> Result<Mover, Error> {
         let (source_repo, target_repo, version_name) = self.get_source_target_version(ctx)?;
 
         self.commit_sync_data_provider.get_reverse_mover(
diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs
index 78bedfba7c..c774c0fac4 100644
--- a/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs
+++ b/eden/mononoke/commit_rewriting/cross_repo_sync/src/validation.rs
@@ -55,8 +55,8 @@ pub async fn verify_working_copy<M: SyncedCommitMapping + Clone + 'static>(
         Target::ref_cast(target_repo),
         Source(source_hash),
         Target(target_hash),
-        &commit_syncer.get_mover(&ctx)?,
-        &commit_syncer.get_reverse_mover(&ctx)?,
+        &commit_syncer.get_current_mover_DEPRECATED(&ctx)?,
+        &commit_syncer.get_current_reverse_mover_DEPRECATED(&ctx)?,
     )
     .await
 }
diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/test_utils/lib.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/test_utils/lib.rs
index 43440a6690..1bfc0ae547 100644
--- a/eden/mononoke/commit_rewriting/cross_repo_sync/test_utils/lib.rs
+++ b/eden/mononoke/commit_rewriting/cross_repo_sync/test_utils/lib.rs
@@ -76,7 +76,7 @@ where
                 ctx.clone(),
                 source_bcs_mut,
                 &map,
-                commit_syncer.get_mover(&ctx)?,
+                commit_syncer.get_current_mover_DEPRECATED(&ctx)?,
                 source_repo.clone(),
             )
             .await
diff --git a/eden/mononoke/commit_rewriting/megarepo/tool/sync_diamond_merge.rs b/eden/mononoke/commit_rewriting/megarepo/tool/sync_diamond_merge.rs
index 05e45447fa..c011fcff14 100644
--- a/eden/mononoke/commit_rewriting/megarepo/tool/sync_diamond_merge.rs
+++ b/eden/mononoke/commit_rewriting/megarepo/tool/sync_diamond_merge.rs
@@ -219,7 +219,7 @@ async fn create_rewritten_merge_commit(
         ctx.clone(),
         merge_bcs,
         &remapped_parents,
-        syncers.small_to_large.get_mover(&ctx)?,
+        syncers.small_to_large.get_current_mover_DEPRECATED(&ctx)?,
         syncers.small_to_large.get_source_repo().clone(),
     )
     .await?;
@@ -262,7 +262,7 @@ async fn generate_additional_file_changes(
             BonsaiDiffFileChange::Changed(ref path, ..)
             | BonsaiDiffFileChange::ChangedReusedId(ref path, ..)
             | BonsaiDiffFileChange::Deleted(ref path) => {
-                let maybe_new_path = large_to_small.get_mover(&ctx)?(path)?;
+                let maybe_new_path = large_to_small.get_current_mover_DEPRECATED(&ctx)?(path)?;
                 if maybe_new_path.is_some() {
                     continue;
                 }
diff --git a/eden/mononoke/repo_import/src/main.rs b/eden/mononoke/repo_import/src/main.rs
index 05627aaa89..2dd5029047 100644
--- a/eden/mononoke/repo_import/src/main.rs
+++ b/eden/mononoke/repo_import/src/main.rs
@@ -921,7 +921,7 @@ async fn repo_import(
             maybe_call_sign: call_sign.clone(),
         });
 
-        movers.push(syncers.small_to_large.get_mover(&ctx)?);
+        movers.push(syncers.small_to_large.get_current_mover_DEPRECATED(&ctx)?);
         repo_import_setting = large_repo_import_setting;
         repo = large_repo;
         repo_config = large_repo_config;
diff --git a/eden/mononoke/repo_import/src/tests.rs b/eden/mononoke/repo_import/src/tests.rs
index 595519e551..a79b6c6c72 100644
--- a/eden/mononoke/repo_import/src/tests.rs
+++ b/eden/mononoke/repo_import/src/tests.rs
@@ -666,7 +666,7 @@ mod tests {
             DefaultAction::PrependPrefix(mp("dest_path_prefix")),
         )?;
         movers.push(importing_mover);
-        movers.push(syncers.small_to_large.get_mover(&ctx)?);
+        movers.push(syncers.small_to_large.get_current_mover_DEPRECATED(&ctx)?);
 
         let combined_mover: Mover = Arc::new(move |source_path: &MPath| {
             let mut mutable_path = source_path.clone();
@@ -817,7 +817,7 @@ mod tests {
             DefaultAction::PrependPrefix(mp("dest_path_prefix")),
         )?;
         movers.push(importing_mover);
-        movers.push(syncers.small_to_large.get_mover(&ctx)?);
+        movers.push(syncers.small_to_large.get_current_mover_DEPRECATED(&ctx)?);
 
         let combined_mover: Mover = Arc::new(move |source_path: &MPath| {
             let mut mutable_path = source_path.clone();