diff --git a/content_handler/app.cc b/content_handler/app.cc
index 77ac58dfb6faa5245490684d9aa1a0a1b765cda3..cd734e161a3501ecdf6fde85914bb74babb74f12 100644
--- a/content_handler/app.cc
+++ b/content_handler/app.cc
@@ -26,7 +26,7 @@ void QuitMessageLoop() {
 }  // namespace
 
 App::App() {
-  context_ = modular::ApplicationContext::CreateFromStartupInfo();
+  context_ = app::ApplicationContext::CreateFromStartupInfo();
 
   tracing::InitializeTracer(context_.get(), {});
 
@@ -52,8 +52,8 @@ App::App() {
   blink::SetFontProvider(
       context_->ConnectToEnvironmentService<fonts::FontProvider>());
 
-  context_->outgoing_services()->AddService<modular::ApplicationRunner>(
-      [this](fidl::InterfaceRequest<modular::ApplicationRunner> request) {
+  context_->outgoing_services()->AddService<app::ApplicationRunner>(
+      [this](fidl::InterfaceRequest<app::ApplicationRunner> request) {
         runner_bindings_.AddBinding(this, std::move(request));
       });
 }
@@ -64,9 +64,9 @@ App::~App() {
 }
 
 void App::StartApplication(
-    modular::ApplicationPackagePtr application,
-    modular::ApplicationStartupInfoPtr startup_info,
-    fidl::InterfaceRequest<modular::ApplicationController> controller) {
+    app::ApplicationPackagePtr application,
+    app::ApplicationStartupInfoPtr startup_info,
+    fidl::InterfaceRequest<app::ApplicationController> controller) {
   std::unique_ptr<ApplicationControllerImpl> impl =
       std::make_unique<ApplicationControllerImpl>(this, std::move(application),
                                                   std::move(startup_info),
diff --git a/content_handler/app.h b/content_handler/app.h
index 2514991d30b31139e44a174bc39ca44ce5492f6c..9b72c164491b72b1f8f87fe89181e9237c30fafe 100644
--- a/content_handler/app.h
+++ b/content_handler/app.h
@@ -16,25 +16,25 @@
 
 namespace flutter_runner {
 
-class App : public modular::ApplicationRunner {
+class App : public app::ApplicationRunner {
  public:
   App();
   ~App();
 
-  // |modular::ApplicationRunner| implementation:
+  // |app::ApplicationRunner| implementation:
 
-  void StartApplication(modular::ApplicationPackagePtr application,
-                        modular::ApplicationStartupInfoPtr startup_info,
-                        fidl::InterfaceRequest<modular::ApplicationController>
+  void StartApplication(app::ApplicationPackagePtr application,
+                        app::ApplicationStartupInfoPtr startup_info,
+                        fidl::InterfaceRequest<app::ApplicationController>
                             controller) override;
 
   void Destroy(ApplicationControllerImpl* controller);
 
  private:
-  std::unique_ptr<modular::ApplicationContext> context_;
+  std::unique_ptr<app::ApplicationContext> context_;
   std::unique_ptr<Thread> gpu_thread_;
   std::unique_ptr<Thread> io_thread_;
-  fidl::BindingSet<modular::ApplicationRunner> runner_bindings_;
+  fidl::BindingSet<app::ApplicationRunner> runner_bindings_;
   std::unordered_map<ApplicationControllerImpl*,
                      std::unique_ptr<ApplicationControllerImpl>>
       controllers_;
diff --git a/content_handler/application_controller_impl.cc b/content_handler/application_controller_impl.cc
index 7120aaf023af625795335b9dbbcf3a6c21cf57d1..fbf5fb67397bbf2418f517a8e77f4588c5f4bb35 100644
--- a/content_handler/application_controller_impl.cc
+++ b/content_handler/application_controller_impl.cc
@@ -16,9 +16,9 @@ namespace flutter_runner {
 
 ApplicationControllerImpl::ApplicationControllerImpl(
     App* app,
-    modular::ApplicationPackagePtr application,
-    modular::ApplicationStartupInfoPtr startup_info,
-    fidl::InterfaceRequest<modular::ApplicationController> controller)
+    app::ApplicationPackagePtr application,
+    app::ApplicationStartupInfoPtr startup_info,
+    fidl::InterfaceRequest<app::ApplicationController> controller)
     : app_(app), binding_(this) {
   if (controller.is_pending()) {
     binding_.Bind(std::move(controller));
@@ -74,7 +74,7 @@ void ApplicationControllerImpl::ConnectToService(
 
 void ApplicationControllerImpl::CreateView(
     fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-    fidl::InterfaceRequest<modular::ServiceProvider> services) {
+    fidl::InterfaceRequest<app::ServiceProvider> services) {
   runtime_holder_->CreateView(url_, std::move(view_owner_request),
                               std::move(services));
 }
diff --git a/content_handler/application_controller_impl.h b/content_handler/application_controller_impl.h
index 24a30f4b8b586a69ffd06a793fe8c9b60e1a4544..7ad40b5424312fdd320b65164940e1be52d3d99b 100644
--- a/content_handler/application_controller_impl.h
+++ b/content_handler/application_controller_impl.h
@@ -19,24 +19,24 @@ namespace flutter_runner {
 class App;
 class RuntimeHolder;
 
-class ApplicationControllerImpl : public modular::ApplicationController,
-                                  public modular::ServiceProvider,
+class ApplicationControllerImpl : public app::ApplicationController,
+                                  public app::ServiceProvider,
                                   public mozart::ViewProvider {
  public:
   ApplicationControllerImpl(
       App* app,
-      modular::ApplicationPackagePtr application,
-      modular::ApplicationStartupInfoPtr startup_info,
-      fidl::InterfaceRequest<modular::ApplicationController> controller);
+      app::ApplicationPackagePtr application,
+      app::ApplicationStartupInfoPtr startup_info,
+      fidl::InterfaceRequest<app::ApplicationController> controller);
 
   ~ApplicationControllerImpl() override;
 
-  // |modular::ApplicationController| implementation
+  // |app::ApplicationController| implementation
 
   void Kill(const KillCallback& callback) override;
   void Detach() override;
 
-  // |modular::ServiceProvider| implementation
+  // |app::ServiceProvider| implementation
 
   void ConnectToService(const fidl::String& service_name,
                         mx::channel channel) override;
@@ -45,16 +45,16 @@ class ApplicationControllerImpl : public modular::ApplicationController,
 
   void CreateView(
       fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-      fidl::InterfaceRequest<modular::ServiceProvider> services) override;
+      fidl::InterfaceRequest<app::ServiceProvider> services) override;
 
  private:
   void StartRuntimeIfReady();
 
   App* app_;
-  fidl::Binding<modular::ApplicationController> binding_;
+  fidl::Binding<app::ApplicationController> binding_;
 
-  fidl::BindingSet<modular::ServiceProvider> service_provider_bindings_;
-  modular::ServiceProviderPtr dart_service_provider_;
+  fidl::BindingSet<app::ServiceProvider> service_provider_bindings_;
+  app::ServiceProviderPtr dart_service_provider_;
 
   fidl::BindingSet<mozart::ViewProvider> view_provider_bindings_;
 
diff --git a/content_handler/runtime_holder.cc b/content_handler/runtime_holder.cc
index 96b5ebcc32addd5535f7ef7a5d0c2af3560f273c..a8db5a6de31358214b36ede19c137b19121ac5ff 100644
--- a/content_handler/runtime_holder.cc
+++ b/content_handler/runtime_holder.cc
@@ -81,8 +81,8 @@ RuntimeHolder::~RuntimeHolder() {
 }
 
 void RuntimeHolder::Init(
-    fidl::InterfaceHandle<modular::ApplicationEnvironment> environment,
-    fidl::InterfaceRequest<modular::ServiceProvider> outgoing_services,
+    fidl::InterfaceHandle<app::ApplicationEnvironment> environment,
+    fidl::InterfaceRequest<app::ServiceProvider> outgoing_services,
     std::vector<char> bundle) {
   FTL_DCHECK(!rasterizer_);
   rasterizer_ = Rasterizer::Create();
@@ -99,7 +99,7 @@ void RuntimeHolder::Init(
 void RuntimeHolder::CreateView(
     const std::string& script_uri,
     fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-    fidl::InterfaceRequest<modular::ServiceProvider> services) {
+    fidl::InterfaceRequest<app::ServiceProvider> services) {
   if (view_listener_binding_.is_bound()) {
     // TODO(jeffbrown): Refactor this to support multiple view instances
     // sharing the same underlying root bundle (but with different runtimes).
@@ -119,7 +119,7 @@ void RuntimeHolder::CreateView(
                             std::move(view_owner_request),
                             std::move(view_listener), script_uri);
 
-  modular::ServiceProviderPtr view_services;
+  app::ServiceProviderPtr view_services;
   view_->GetServiceProvider(GetProxy(&view_services));
 
   // Listen for input events.
@@ -200,7 +200,7 @@ void RuntimeHolder::DidCreateMainIsolate(Dart_Isolate isolate) {
 }
 
 void RuntimeHolder::InitFidlInternal() {
-  fidl::InterfaceHandle<modular::ApplicationEnvironment> environment;
+  fidl::InterfaceHandle<app::ApplicationEnvironment> environment;
   environment_->Duplicate(GetProxy(&environment));
 
   Dart_Handle fidl_internal = Dart_LookupLibrary(ToDart("dart:fidl.internal"));
diff --git a/content_handler/runtime_holder.h b/content_handler/runtime_holder.h
index ff5002ef0899c9b9e4495855a40d32ca95c2a8d0..ba7026dcbd6435149369a39db44f15a83335829c 100644
--- a/content_handler/runtime_holder.h
+++ b/content_handler/runtime_holder.h
@@ -38,12 +38,12 @@ class RuntimeHolder : public blink::RuntimeDelegate,
   RuntimeHolder();
   ~RuntimeHolder();
 
-  void Init(fidl::InterfaceHandle<modular::ApplicationEnvironment> environment,
-            fidl::InterfaceRequest<modular::ServiceProvider> outgoing_services,
+  void Init(fidl::InterfaceHandle<app::ApplicationEnvironment> environment,
+            fidl::InterfaceRequest<app::ServiceProvider> outgoing_services,
             std::vector<char> bundle);
   void CreateView(const std::string& script_uri,
                   fidl::InterfaceRequest<mozart::ViewOwner> view_owner_request,
-                  fidl::InterfaceRequest<modular::ServiceProvider> services);
+                  fidl::InterfaceRequest<app::ServiceProvider> services);
 
  private:
   // |blink::RuntimeDelegate| implementation:
@@ -75,9 +75,9 @@ class RuntimeHolder : public blink::RuntimeDelegate,
   void OnFrameComplete();
   void Invalidate();
 
-  modular::ApplicationEnvironmentPtr environment_;
-  modular::ServiceProviderPtr environment_services_;
-  fidl::InterfaceRequest<modular::ServiceProvider> outgoing_services_;
+  app::ApplicationEnvironmentPtr environment_;
+  app::ServiceProviderPtr environment_services_;
+  fidl::InterfaceRequest<app::ServiceProvider> outgoing_services_;
 
   std::vector<char> root_bundle_data_;
   ftl::RefPtr<blink::ZipAssetStore> asset_store_;