diff --git a/android_world/env/setup_device/apps.py b/android_world/env/setup_device/apps.py
index 25cc859..a219c01 100644
--- a/android_world/env/setup_device/apps.py
+++ b/android_world/env/setup_device/apps.py
@@ -492,7 +492,7 @@ class RecipeApp(AppSetup):
   """Class for setting up Broccoli Recipe app."""
 
   apk_names = ("com.flauschcode.broccoli_1020600.apk",)
-  app_name = "broccoli"
+  app_name = "broccoli app"
 
   @classmethod
   def setup(cls, env: interface.AsyncEnv) -> None:
@@ -593,7 +593,7 @@ class OpenTracksApp(AppSetup):
   """Class for setting up OpenTracks app."""
 
   apk_names = ("de.dennisguse.opentracks_5705.apk",)
-  app_name = "activity tracker"
+  app_name = "open tracks sports tracker"
 
   @classmethod
   def setup(cls, env: interface.AsyncEnv) -> None:
diff --git a/android_world/env/setup_device/setup.py b/android_world/env/setup_device/setup.py
index 90595bb..4b1517f 100644
--- a/android_world/env/setup_device/setup.py
+++ b/android_world/env/setup_device/setup.py
@@ -63,6 +63,11 @@
 )
 
 
+def get_app_mapping(app_name: str) -> Type[apps.AppSetup]:
+  mapping = {app.app_name: app for app in _APPS}
+  return mapping[app_name]
+
+
 def download_and_install_apk(
     apk: str, raw_env: env_interface.AndroidEnvInterface
 ) -> None: