diff --git a/eden/mononoke/cmdlib/base_app/src/lib.rs b/eden/mononoke/cmdlib/base_app/src/lib.rs
index 599ec7874b..027fc7c919 100644
--- a/eden/mononoke/cmdlib/base_app/src/lib.rs
+++ b/eden/mononoke/cmdlib/base_app/src/lib.rs
@@ -24,7 +24,7 @@ pub trait BaseApp {
 /// Lower level version of mononoke_app::subcommands that allows changing the app
 #[macro_export]
 macro_rules! subcommands {
-     ( $( mod $command:ident; )* app = $app:ty ) => {
+     ( type App = $app:ty; $( mod $command:ident; )* ) => {
          $( mod $command; )*
 
          $crate::macro_export::assert_impl_all!($app: $crate::BaseApp);
diff --git a/eden/mononoke/cmdlib/mononoke_app/src/lib.rs b/eden/mononoke/cmdlib/mononoke_app/src/lib.rs
index 710ae733c2..2c2d157c74 100644
--- a/eden/mononoke/cmdlib/mononoke_app/src/lib.rs
+++ b/eden/mononoke/cmdlib/mononoke_app/src/lib.rs
@@ -59,6 +59,6 @@ pub mod macro_export {
 #[macro_export]
 macro_rules! subcommands {
     ( $( mod $command:ident; )* ) => {
-        $crate::macro_export::base_app::subcommands!{ $( mod $command; )* app = $crate::MononokeApp }
+        $crate::macro_export::base_app::subcommands!{ type App = $crate::MononokeApp; $( mod $command; )* }
     }
 }
diff --git a/eden/mononoke/scs/client_new/src/commands.rs b/eden/mononoke/scs/client_new/src/commands.rs
index 6cb780daf8..418c643eb0 100644
--- a/eden/mononoke/scs/client_new/src/commands.rs
+++ b/eden/mononoke/scs/client_new/src/commands.rs
@@ -8,6 +8,7 @@
 use crate::ScscApp;
 
 base_app::subcommands! {
+    type App = ScscApp;
     mod cat;
     mod repos;
     mod blame;
@@ -18,5 +19,4 @@ base_app::subcommands! {
     mod info;
     mod is_ancestor;
     mod list_bookmarks;
-    app = ScscApp
 }