Merge lp:~alan-griffiths/mir/refactor-frontend-cleanup into lp:~mir-team/mir/trunk

[Alan Griffiths]

frontend, shell, logging, tests: refactoring to clarify roles in frontend and dependencies on shell

frontend, shell, logging, tests: refactoring to clarify roles in frontend and dependencies on shell

This is most of the the refactoring discussed on mir-devel - but leaves out the last bit about surfaces::ProxySurface as that conflicts with stuff Daniel is trying to land.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/mir-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/84/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/84/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/83/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Proper use of "using namespace ..." would prevent us from constantly having large diffs of namespace refactoring. I am regularly seeing proposals that change "abc::Something" into "def::Something" in many locations.

This not only creates large diffs but you still have the problem of abbreviated namespace aliases being incomprehensible to most people: msh, mf, etc.

[Alexandros Frantzis (afrantzis)]

grep -R session_store src/ include/ tests/ uncovers some remaining pending renames.

The most interesting is at tests/acceptance-tests/test_focus_management_api.cpp line 158, where we are definining a new method ("override" anyone? ;)), and have essentially nullified that particular test.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> grep -R session_store src/ include/ tests/ uncovers some remaining pending
> renames.
>
> The most interesting is at tests/acceptance-
> tests/test_focus_management_api.cpp line 158, where we are definining a new
> method ("override" anyone? ;)), and have essentially nullified that particular
> test.

How did I miss all those?!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/mir-ci/94/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/95/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/95/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/94/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Kevin DuBois (kdub)]

looks good to me too

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/42/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Sorry. Space issues on the builder. Should be fixed -> reapproving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-03-07 08:04:05 +0000
+++ examples/render_surfaces.cpp	2013-03-15 13:09:22 +0000
@@ -48,7 +48,7 @@
 namespace mc=mir::compositor;
 namespace ml=mir::logging;
 namespace ms=mir::surfaces;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 namespace geom=mir::geometry;
 namespace mt=mir::tools;
 
@@ -233,7 +233,7 @@
         const float angular_step = 2.0 * M_PI / num_moveables;
 
         std::shared_ptr<ms::Surface> s = surface_stack->create_surface(
-            msh::a_surface().of_size({geom::Width{surface_size}, geom::Height{surface_size}})
+            mf::a_surface().of_size({geom::Width{surface_size}, geom::Height{surface_size}})
                            .of_pixel_format(buffer_allocator->supported_pixel_formats()[0])
                            .of_buffer_usage(mc::BufferUsage::hardware)
             ).lock();

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-03-08 07:20:43 +0000
+++ include/server/mir/default_server_configuration.h	2013-03-15 13:09:22 +0000
@@ -38,14 +38,15 @@
 }
 namespace frontend
 {
+class Shell;
 class Communicator;
 class ProtobufIpcFactory;
-class ApplicationMediatorReport;
+class SessionMediatorReport;
 }
 
 namespace shell
 {
-class SessionStore;
+class SessionManager;
 class SurfaceFactory;
 }
 namespace surfaces
@@ -93,9 +94,9 @@
     virtual std::shared_ptr<compositor::RenderView> the_render_view();
 
     virtual std::shared_ptr<frontend::Communicator> the_communicator();
-    virtual std::shared_ptr<frontend::ApplicationMediatorReport> the_application_mediator_report();
+    virtual std::shared_ptr<frontend::SessionMediatorReport> the_session_mediator_report();
 
-    virtual std::shared_ptr<shell::SessionStore> the_session_store();
+    virtual std::shared_ptr<frontend::Shell> the_frontend_shell();
     virtual std::shared_ptr<shell::SurfaceFactory> the_surface_factory();
 
     virtual std::shared_ptr<surfaces::BufferBundleFactory> the_buffer_bundle_factory();
@@ -110,7 +111,7 @@
     virtual std::shared_ptr<options::Option> the_options() const;
 
     CachedPtr<frontend::Communicator> communicator;
-    CachedPtr<shell::SessionStore> session_store;
+    CachedPtr<frontend::Shell> session_manager;
     CachedPtr<input::InputManager>    input_manager;
     CachedPtr<graphics::Platform>     graphics_platform;
     CachedPtr<graphics::BufferInitializer> buffer_initializer;
@@ -118,7 +119,7 @@
     CachedPtr<graphics::Display>      display;
 
     CachedPtr<frontend::ProtobufIpcFactory>  ipc_factory;
-    CachedPtr<frontend::ApplicationMediatorReport> application_mediator_report;
+    CachedPtr<frontend::SessionMediatorReport> session_mediator_report;
     CachedPtr<compositor::BufferAllocationStrategy> buffer_allocation_strategy;
     CachedPtr<graphics::Renderer> renderer;
     CachedPtr<compositor::BufferBundleManager> buffer_bundle_manager;
@@ -133,7 +134,7 @@
 
     // the communications interface to use
     virtual std::shared_ptr<frontend::ProtobufIpcFactory> the_ipc_factory(
-        std::shared_ptr<shell::SessionStore> const& session_store,
+        std::shared_ptr<frontend::Shell> const& shell,
         std::shared_ptr<graphics::ViewableArea> const& display,
         std::shared_ptr<compositor::GraphicBufferAllocator> const& allocator);
 

=== renamed file 'include/server/mir/shell/session.h' => 'include/server/mir/frontend/session.h'
--- include/server/mir/shell/session.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/session.h	2013-03-15 13:09:22 +0000
@@ -16,10 +16,10 @@
  * Authored By: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_SHELL_SESSION_H_
-#define MIR_SHELL_SESSION_H_
+#ifndef MIR_FRONTEND_SESSION_H_
+#define MIR_FRONTEND_SESSION_H_
 
-#include "mir/shell/surface_id.h"
+#include "mir/frontend/surface_id.h"
 
 #include <mutex>
 #include <atomic>
@@ -29,11 +29,10 @@
 namespace mir
 {
 
-/// Management of client application shell
-namespace shell
+namespace frontend
 {
 class Surface;
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 
 class Session
 {
@@ -59,4 +58,4 @@
 }
 }
 
-#endif // MIR_SHELL_SESSION_H_
+#endif // MIR_FRONTEND_SESSION_H_

=== renamed file 'include/server/mir/shell/session_container.h' => 'include/server/mir/frontend/session_container.h'
--- include/server/mir/shell/session_container.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/session_container.h	2013-03-15 13:09:22 +0000
@@ -25,9 +25,13 @@
 
 namespace mir
 {
+namespace frontend
+{
+class Session;
+}
+
 namespace shell
 {
-class Session;
 
 class SessionContainer
 {
@@ -35,16 +39,16 @@
     SessionContainer();
     ~SessionContainer();
 
-    virtual void insert_session(std::shared_ptr<Session> const& session);
-    virtual void remove_session(std::shared_ptr<Session> const& session);
+    virtual void insert_session(std::shared_ptr<frontend::Session> const& session);
+    virtual void remove_session(std::shared_ptr<frontend::Session> const& session);
 
-    void for_each(std::function<void(std::shared_ptr<Session> const&)> f) const;
+    void for_each(std::function<void(std::shared_ptr<frontend::Session> const&)> f) const;
 
 private:
     SessionContainer(const SessionContainer&) = delete;
     SessionContainer& operator=(const SessionContainer&) = delete;
 
-    std::vector<std::shared_ptr<Session>> apps;
+    std::vector<std::shared_ptr<frontend::Session>> apps;
     mutable std::mutex guard;
 };
 

=== renamed file 'include/server/mir/frontend/application_mediator.h' => 'include/server/mir/frontend/session_mediator.h'
--- include/server/mir/frontend/application_mediator.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/session_mediator.h	2013-03-15 13:09:22 +0000
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef MIR_FRONTEND_APPLICATION_MEDIATOR_H_
-#define MIR_FRONTEND_APPLICATION_MEDIATOR_H_
+#ifndef MIR_FRONTEND_SESSION_MEDIATOR_H_
+#define MIR_FRONTEND_SESSION_MEDIATOR_H_
 
 #include "mir_protobuf.pb.h"
 
@@ -38,30 +38,27 @@
 class GraphicBufferAllocator;
 }
 
-namespace shell
-{
-class SessionStore;
-class Session;
-}
 
 /// Frontend interface. Mediates the interaction between client
-/// applications and the core of the mir system.
+/// processes and the core of the mir system.
 namespace frontend
 {
+class Shell;
+class Session;
 class ResourceCache;
-class ApplicationMediatorReport;
+class SessionMediatorReport;
 
-// ApplicationMediator relays requests from the client into the server process.
-class ApplicationMediator : public mir::protobuf::DisplayServer
+// SessionMediator relays requests from the client process into the server.
+class SessionMediator : public mir::protobuf::DisplayServer
 {
 public:
 
-    ApplicationMediator(
-        std::shared_ptr<shell::SessionStore> const& session_store,
+    SessionMediator(
+        std::shared_ptr<Shell> const& shell,
         std::shared_ptr<graphics::Platform> const& graphics_platform,
         std::shared_ptr<graphics::ViewableArea> const& viewable_area,
         std::shared_ptr<compositor::GraphicBufferAllocator> const& buffer_allocator,
-        std::shared_ptr<ApplicationMediatorReport> const& report,
+        std::shared_ptr<SessionMediatorReport> const& report,
         std::shared_ptr<ResourceCache> const& resource_cache);
 
     /* Platform independent requests */
@@ -104,7 +101,7 @@
                         google::protobuf::Closure* done);
 
 private:
-    std::shared_ptr<shell::SessionStore> const session_store;
+    std::shared_ptr<Shell> const shell;
     std::shared_ptr<graphics::Platform> const graphics_platform;
 
     // TODO this is a dubious dependency - to get display_info (is there only one?)
@@ -112,14 +109,14 @@
     // TODO this is a dubious dependency - to get supported_pixel_formats
     std::shared_ptr<compositor::GraphicBufferAllocator> const buffer_allocator;
 
-    std::shared_ptr<ApplicationMediatorReport> const report;
+    std::shared_ptr<SessionMediatorReport> const report;
     std::shared_ptr<ResourceCache> const resource_cache;
 
-    std::shared_ptr<shell::Session> application_session;
+    std::shared_ptr<Session> session;
 };
 
 }
 }
 
 
-#endif /* MIR_FRONTEND_APPLICATION_MEDIATOR_H_ */
+#endif /* MIR_FRONTEND_SESSION_MEDIATOR_H_ */

=== renamed file 'include/server/mir/frontend/application_mediator_report.h' => 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/application_mediator_report.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2013-03-15 13:09:22 +0000
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef MIR_FRONTEND_APPLICATION_MEDIATOR_REPORT_H_
-#define MIR_FRONTEND_APPLICATION_MEDIATOR_REPORT_H_
+#ifndef MIR_FRONTEND_SESSION_MEDIATOR_REPORT_H_
+#define MIR_FRONTEND_SESSION_MEDIATOR_REPORT_H_
 
 #include <string>
 
@@ -27,43 +27,43 @@
 namespace frontend
 {
 // Interface for monitoring application activity
-class ApplicationMediatorReport
+class SessionMediatorReport
 {
 public:
-    virtual void application_connect_called(std::string const& app_name) = 0;
-
-    virtual void application_create_surface_called(std::string const& app_name) = 0;
-
-    virtual void application_next_buffer_called(std::string const& app_name) = 0;
-
-    virtual void application_release_surface_called(std::string const& app_name) = 0;
-
-    virtual void application_disconnect_called(std::string const& app_name) = 0;
-
-    virtual void application_drm_auth_magic_called(std::string const& app_name) = 0;
-
-    virtual void application_error(
+    virtual void session_connect_called(std::string const& app_name) = 0;
+
+    virtual void session_create_surface_called(std::string const& app_name) = 0;
+
+    virtual void session_next_buffer_called(std::string const& app_name) = 0;
+
+    virtual void session_release_surface_called(std::string const& app_name) = 0;
+
+    virtual void session_disconnect_called(std::string const& app_name) = 0;
+
+    virtual void session_drm_auth_magic_called(std::string const& app_name) = 0;
+
+    virtual void session_error(
         std::string const& app_name,
         char const* method,
         std::string const& what) = 0;
 };
 
 // Do-nothing implementation to satisfy dependencies
-class NullApplicationMediatorReport : public ApplicationMediatorReport
+class NullSessionMediatorReport : public SessionMediatorReport
 {
-    virtual void application_connect_called(std::string const& app_name);
-
-    virtual void application_create_surface_called(std::string const& app_name);
-
-    virtual void application_next_buffer_called(std::string const& app_name);
-
-    virtual void application_release_surface_called(std::string const& app_name);
-
-    virtual void application_disconnect_called(std::string const& app_name);
-
-    virtual void application_drm_auth_magic_called(std::string const& app_name);
-
-    virtual void application_error(
+    virtual void session_connect_called(std::string const& app_name);
+
+    virtual void session_create_surface_called(std::string const& app_name);
+
+    virtual void session_next_buffer_called(std::string const& app_name);
+
+    virtual void session_release_surface_called(std::string const& app_name);
+
+    virtual void session_disconnect_called(std::string const& app_name);
+
+    virtual void session_drm_auth_magic_called(std::string const& app_name);
+
+    virtual void session_error(
         std::string const& app_name,
         char const* method,
         std::string const& what);
@@ -72,4 +72,4 @@
 }
 
 
-#endif /* MIR_FRONTEND_APPLICATION_MEDIATOR_REPORT_H_ */
+#endif /* MIR_FRONTEND_SESSION_MEDIATOR_REPORT_H_ */

=== renamed file 'include/server/mir/shell/session_store.h' => 'include/server/mir/frontend/shell.h'
--- include/server/mir/shell/session_store.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/shell.h	2013-03-15 13:09:22 +0000
@@ -16,23 +16,23 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#ifndef MIR_SHELL_SESSION_STORE_H_
-#define MIR_SHELL_SESSION_STORE_H_
+#ifndef MIR_FRONTEND_SHELL_H_
+#define MIR_FRONTEND_SHELL_H_
 
 #include <memory>
 
 namespace mir
 {
 
-namespace shell
+namespace frontend
 {
 
 class Session;
 
-class SessionStore
+class Shell
 {
 public:
-    virtual ~SessionStore() {}
+    virtual ~Shell() {}
 
     virtual std::shared_ptr<Session> open_session(std::string const& name) = 0;
     virtual void close_session(std::shared_ptr<Session> const& session)  = 0;
@@ -43,12 +43,12 @@
     virtual void shutdown() = 0;
 
 protected:
-    SessionStore() = default;
-    SessionStore(const SessionStore&) = delete;
-    SessionStore& operator=(const SessionStore&) = delete;
+    Shell() = default;
+    Shell(const Shell&) = delete;
+    Shell& operator=(const Shell&) = delete;
 };
 
 }
 }
 
-#endif // MIR_SHELL_SESSION_STORE_H_
+#endif // MIR_FRONTEND_SHELL_H_

=== renamed file 'include/server/mir/shell/surface.h' => 'include/server/mir/frontend/surface.h'
--- include/server/mir/shell/surface.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/surface.h	2013-03-15 13:09:22 +0000
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef MIR_SHELL_SURFACE_H_
-#define MIR_SHELL_SURFACE_H_
+#ifndef MIR_FRONTEND_SURFACE_H_
+#define MIR_FRONTEND_SURFACE_H_
 
 #include "mir/geometry/pixel_format.h"
 #include "mir/geometry/point.h"
@@ -33,7 +33,7 @@
 class Buffer;
 }
 
-namespace shell
+namespace frontend
 {
 
 class Surface
@@ -65,4 +65,4 @@
 }
 
 
-#endif /* MIR_SHELL_SURFACE_H_ */
+#endif /* MIR_FRONTEND_SURFACE_H_ */

=== renamed file 'include/server/mir/shell/surface_id.h' => 'include/server/mir/frontend/surface_id.h'
--- include/server/mir/shell/surface_id.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/frontend/surface_id.h	2013-03-15 13:09:22 +0000
@@ -16,17 +16,17 @@
  * Authored By: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_SHELL_SURFACE_ID_H_
-#define MIR_SHELL_SURFACE_ID_H_
+#ifndef MIR_FRONTEND_SURFACE_ID_H_
+#define MIR_FRONTEND_SURFACE_ID_H_
 
 #include "mir/int_wrapper.h"
 
 namespace mir
 {
-namespace shell
+namespace frontend
 {
 typedef IntWrapper<IntWrapperTypeTag::SessionsSurfaceId> SurfaceId;
 }
 } // namespace mir
 
-#endif // MIR_SHELL_SURFACE_ID_H
+#endif // MIR_FRONTEND_SURFACE_ID_H_

=== renamed file 'include/server/mir/logging/application_mediator_report.h' => 'include/server/mir/logging/session_mediator_report.h'
--- include/server/mir/logging/application_mediator_report.h	2013-03-04 16:02:02 +0000
+++ include/server/mir/logging/session_mediator_report.h	2013-03-15 13:09:22 +0000
@@ -17,10 +17,10 @@
  */
 
 
-#ifndef MIR_LOGGING_APPLICATION_MEDIATOR_REPORT_H_
-#define MIR_LOGGING_APPLICATION_MEDIATOR_REPORT_H_
+#ifndef MIR_LOGGING_SESSION_MEDIATOR_REPORT_H_
+#define MIR_LOGGING_SESSION_MEDIATOR_REPORT_H_
 
-#include "mir/frontend/application_mediator_report.h"
+#include "mir/frontend/session_mediator_report.h"
 
 #include <memory>
 
@@ -30,24 +30,24 @@
 {
 class Logger;
 
-class ApplicationMediatorReport : public frontend::ApplicationMediatorReport
+class SessionMediatorReport : public frontend::SessionMediatorReport
 {
 public:
-    ApplicationMediatorReport(std::shared_ptr<Logger> const& log);
-
-    virtual void application_connect_called(std::string const& app_name);
-
-    virtual void application_create_surface_called(std::string const& app_name);
-
-    virtual void application_next_buffer_called(std::string const& app_name);
-
-    virtual void application_release_surface_called(std::string const& app_name);
-
-    virtual void application_disconnect_called(std::string const& app_name);
-
-    virtual void application_drm_auth_magic_called(std::string const& app_name);
-
-    virtual void application_error(
+    SessionMediatorReport(std::shared_ptr<Logger> const& log);
+
+    virtual void session_connect_called(std::string const& app_name);
+
+    virtual void session_create_surface_called(std::string const& app_name);
+
+    virtual void session_next_buffer_called(std::string const& app_name);
+
+    virtual void session_release_surface_called(std::string const& app_name);
+
+    virtual void session_disconnect_called(std::string const& app_name);
+
+    virtual void session_drm_auth_magic_called(std::string const& app_name);
+
+    virtual void session_error(
         std::string const& app_name,
         char const* method,
         std::string const& what);
@@ -60,4 +60,4 @@
 }
 
 
-#endif /* MIR_LOGGING_APPLICATION_MEDIATOR_REPORT_H_ */
+#endif /* MIR_LOGGING_SESSION_MEDIATOR_REPORT_H_ */

=== modified file 'include/server/mir/server_configuration.h'
--- include/server/mir/server_configuration.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/server_configuration.h	2013-03-15 13:09:22 +0000
@@ -29,11 +29,7 @@
 namespace frontend
 {
 class Communicator;
-}
-
-namespace shell
-{
-class SessionStore;
+class Shell;
 }
 namespace graphics
 {
@@ -49,7 +45,7 @@
 {
 public:
     virtual std::shared_ptr<frontend::Communicator> the_communicator() = 0;
-    virtual std::shared_ptr<shell::SessionStore> the_session_store() = 0;
+    virtual std::shared_ptr<frontend::Shell> the_frontend_shell() = 0;
     virtual std::shared_ptr<graphics::Display> the_display() = 0;
     virtual std::shared_ptr<compositor::Drawer> the_drawer() = 0;
     virtual std::shared_ptr<input::InputManager> the_input_manager() = 0;

=== modified file 'include/server/mir/shell/application_session.h'
--- include/server/mir/shell/application_session.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/application_session.h	2013-03-15 13:09:22 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SHELL_APPLICATION_SESSION_H_
 #define MIR_SHELL_APPLICATION_SESSION_H_
 
-#include "mir/shell/session.h"
+#include "mir/frontend/session.h"
 
 #include <map>
 
@@ -30,15 +30,15 @@
 {
 class SurfaceFactory;
 
-class ApplicationSession : public Session
+class ApplicationSession : public frontend::Session
 {
 public:
     explicit ApplicationSession(std::shared_ptr<SurfaceFactory> const& surface_factory, std::string const& session_name);
     ~ApplicationSession();
 
-    SurfaceId create_surface(SurfaceCreationParameters const& params);
-    void destroy_surface(SurfaceId surface);
-    std::shared_ptr<Surface> get_surface(SurfaceId surface) const;
+    frontend::SurfaceId create_surface(frontend::SurfaceCreationParameters const& params);
+    void destroy_surface(frontend::SurfaceId surface);
+    std::shared_ptr<frontend::Surface> get_surface(frontend::SurfaceId surface) const;
 
     std::string name();
     void shutdown();
@@ -54,12 +54,12 @@
     std::shared_ptr<SurfaceFactory> const surface_factory;
     std::string const session_name;
 
-    SurfaceId next_id();
+    frontend::SurfaceId next_id();
 
     std::atomic<int> next_surface_id;
 
-    typedef std::map<SurfaceId, std::shared_ptr<Surface>> Surfaces;
-    Surfaces::const_iterator checked_find(SurfaceId id) const;
+    typedef std::map<frontend::SurfaceId, std::shared_ptr<frontend::Surface>> Surfaces;
+    Surfaces::const_iterator checked_find(frontend::SurfaceId id) const;
     std::mutex mutable surfaces_mutex;
     Surfaces surfaces;
 };

=== modified file 'include/server/mir/shell/consuming_placement_strategy.h'
--- include/server/mir/shell/consuming_placement_strategy.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/consuming_placement_strategy.h	2013-03-15 13:09:22 +0000
@@ -38,7 +38,7 @@
     explicit ConsumingPlacementStrategy(std::shared_ptr<graphics::ViewableArea> const& display_area);
     virtual ~ConsumingPlacementStrategy() {}
 
-    virtual SurfaceCreationParameters place(SurfaceCreationParameters const& request_parameters);
+    virtual frontend::SurfaceCreationParameters place(frontend::SurfaceCreationParameters const& request_parameters);
 
 protected:
     ConsumingPlacementStrategy(ConsumingPlacementStrategy const&) = delete;

=== modified file 'include/server/mir/shell/focus_sequence.h'
--- include/server/mir/shell/focus_sequence.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/focus_sequence.h	2013-03-15 13:09:22 +0000
@@ -23,18 +23,22 @@
 
 namespace mir
 {
+namespace frontend
+{
+class Session;
+}
+
 namespace shell
 {
-class Session;
 
 class FocusSequence
 {
 public:
     virtual ~FocusSequence() {}
 
-    virtual std::shared_ptr<Session> successor_of(std::shared_ptr<Session> const& focused_app) const = 0;
-    virtual std::shared_ptr<Session> predecessor_of(std::shared_ptr<Session> const& focused_app) const = 0;
-    virtual std::shared_ptr<Session> default_focus() const = 0;
+    virtual std::shared_ptr<frontend::Session> successor_of(std::shared_ptr<frontend::Session> const& focused_app) const = 0;
+    virtual std::shared_ptr<frontend::Session> predecessor_of(std::shared_ptr<frontend::Session> const& focused_app) const = 0;
+    virtual std::shared_ptr<frontend::Session> default_focus() const = 0;
 
 protected:
     FocusSequence() = default;

=== modified file 'include/server/mir/shell/focus_setter.h'
--- include/server/mir/shell/focus_setter.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/focus_setter.h	2013-03-15 13:09:22 +0000
@@ -23,16 +23,20 @@
 
 namespace mir
 {
+namespace frontend
+{
+class Session;
+}
+
 namespace shell
 {
-class Session;
 
 class FocusSetter
 {
 public:
     virtual ~FocusSetter() {}
 
-    virtual void set_focus_to(std::shared_ptr<Session> const& new_focus) = 0;
+    virtual void set_focus_to(std::shared_ptr<frontend::Session> const& new_focus) = 0;
 
 protected:
     FocusSetter() = default;

=== modified file 'include/server/mir/shell/organising_surface_factory.h'
--- include/server/mir/shell/organising_surface_factory.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/organising_surface_factory.h	2013-03-15 13:09:22 +0000
@@ -35,8 +35,8 @@
     OrganisingSurfaceFactory(std::shared_ptr<SurfaceFactory> const& underlying_factory,
                              std::shared_ptr<PlacementStrategy> const& placement_strategy);
     virtual ~OrganisingSurfaceFactory();
-    
-    std::shared_ptr<Surface> create_surface(SurfaceCreationParameters const& params);
+
+    std::shared_ptr<frontend::Surface> create_surface(frontend::SurfaceCreationParameters const& params);
 
 protected:
     OrganisingSurfaceFactory(OrganisingSurfaceFactory const&) = delete;

=== modified file 'include/server/mir/shell/placement_strategy.h'
--- include/server/mir/shell/placement_strategy.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/placement_strategy.h	2013-03-15 13:09:22 +0000
@@ -21,9 +21,13 @@
 
 namespace mir
 {
+namespace frontend
+{
+struct SurfaceCreationParameters;
+}
+
 namespace shell
 {
-class SurfaceCreationParameters;
 
 class PlacementStrategy
 {
@@ -31,7 +35,7 @@
     virtual ~PlacementStrategy() {}
     // TODO: It is strange to work in terms of SurfaceCreationParameters here,
     // perhaps a new interface is needed.
-    virtual SurfaceCreationParameters place(SurfaceCreationParameters const& request_parameters) = 0;
+    virtual frontend::SurfaceCreationParameters place(frontend::SurfaceCreationParameters const& request_parameters) = 0;
 
 
 protected:

=== modified file 'include/server/mir/shell/registration_order_focus_sequence.h'
--- include/server/mir/shell/registration_order_focus_sequence.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/registration_order_focus_sequence.h	2013-03-15 13:09:22 +0000
@@ -33,9 +33,9 @@
     explicit RegistrationOrderFocusSequence(std::shared_ptr<SessionContainer> const& session_container);
     virtual ~RegistrationOrderFocusSequence() {}
 
-    std::shared_ptr<Session> successor_of(std::shared_ptr<Session> const& focused_app) const;
-    std::shared_ptr<Session> predecessor_of(std::shared_ptr<Session> const& focused_app) const;
-    std::shared_ptr<Session> default_focus() const;
+    std::shared_ptr<frontend::Session> successor_of(std::shared_ptr<frontend::Session> const& focused_app) const;
+    std::shared_ptr<frontend::Session> predecessor_of(std::shared_ptr<frontend::Session> const& focused_app) const;
+    std::shared_ptr<frontend::Session> default_focus() const;
 
 protected:
     RegistrationOrderFocusSequence(const RegistrationOrderFocusSequence&) = delete;

=== modified file 'include/server/mir/shell/session_manager.h'
--- include/server/mir/shell/session_manager.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/session_manager.h	2013-03-15 13:09:22 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SHELL_APPLICATION_MANAGER_H_
 #define MIR_SHELL_APPLICATION_MANAGER_H_
 
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 
 #include <mutex>
 #include <memory>
@@ -28,15 +28,15 @@
 namespace mir
 {
 
+/// Management of sessions and surfaces
 namespace shell
 {
 class SurfaceFactory;
-class Session;
 class SessionContainer;
 class FocusSequence;
 class FocusSetter;
 
-class SessionManager : public SessionStore
+class SessionManager : public frontend::Shell
 {
 public:
     explicit SessionManager(std::shared_ptr<SurfaceFactory> const& surface_factory,
@@ -45,11 +45,11 @@
                             std::shared_ptr<FocusSetter> const& focus_setter);
     virtual ~SessionManager();
 
-    virtual std::shared_ptr<Session> open_session(std::string const& name);
-    virtual void close_session(std::shared_ptr<Session> const& session);
+    virtual std::shared_ptr<frontend::Session> open_session(std::string const& name);
+    virtual void close_session(std::shared_ptr<frontend::Session> const& session);
     virtual void shutdown();
 
-    virtual void tag_session_with_lightdm_id(std::shared_ptr<Session> const& session, int id);
+    virtual void tag_session_with_lightdm_id(std::shared_ptr<frontend::Session> const& session, int id);
     virtual void focus_session_with_lightdm_id(int id);
 
     void focus_next();
@@ -65,11 +65,11 @@
     std::shared_ptr<FocusSetter> const focus_setter;
 
     std::mutex mutex;
-    std::weak_ptr<Session> focus_application;
-    typedef std::vector<std::pair<int, std::shared_ptr<Session>>> Tags;
+    std::weak_ptr<frontend::Session> focus_application;
+    typedef std::vector<std::pair<int, std::shared_ptr<frontend::Session>>> Tags;
     Tags tags;
 
-    void set_focus_to(std::shared_ptr<Session> const& next_focus);
+    void set_focus_to(std::shared_ptr<frontend::Session> const& next_focus);
 };
 
 }

=== modified file 'include/server/mir/shell/single_visibility_focus_mechanism.h'
--- include/server/mir/shell/single_visibility_focus_mechanism.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/single_visibility_focus_mechanism.h	2013-03-15 13:09:22 +0000
@@ -24,10 +24,13 @@
 
 namespace mir
 {
+namespace frontend
+{
+class Session;
+}
 
 namespace shell
 {
-class Session;
 class SessionContainer;
 
 class SingleVisibilityFocusMechanism : public FocusSetter
@@ -36,7 +39,7 @@
     explicit SingleVisibilityFocusMechanism(std::shared_ptr<SessionContainer> const& app_container);
     virtual ~SingleVisibilityFocusMechanism() {}
 
-    void set_focus_to(std::shared_ptr<Session> const& new_focus);
+    void set_focus_to(std::shared_ptr<frontend::Session> const& new_focus);
 
 protected:
     SingleVisibilityFocusMechanism(const SingleVisibilityFocusMechanism&) = delete;

=== modified file 'include/server/mir/shell/surface_creation_parameters.h'
--- include/server/mir/shell/surface_creation_parameters.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/surface_creation_parameters.h	2013-03-15 13:09:22 +0000
@@ -27,7 +27,7 @@
 
 namespace mir
 {
-namespace shell
+namespace frontend
 {
 
 struct SurfaceCreationParameters

=== modified file 'include/server/mir/shell/surface_factory.h'
--- include/server/mir/shell/surface_factory.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/shell/surface_factory.h	2013-03-15 13:09:22 +0000
@@ -23,18 +23,20 @@
 
 namespace mir
 {
+namespace frontend
+{
+struct SurfaceCreationParameters;
+class Surface;
+}
 
 namespace shell
 {
-class SurfaceCreationParameters;
-class Surface;
-
 class SurfaceFactory
 {
 public:
     virtual ~SurfaceFactory() {}
 
-    virtual std::shared_ptr<Surface> create_surface(const SurfaceCreationParameters& params) = 0;
+    virtual std::shared_ptr<frontend::Surface> create_surface(const frontend::SurfaceCreationParameters& params) = 0;
 
 protected:
     SurfaceFactory() = default;

=== modified file 'include/server/mir/surfaces/surface_controller.h'
--- include/server/mir/surfaces/surface_controller.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/surfaces/surface_controller.h	2013-03-15 13:09:22 +0000
@@ -30,8 +30,6 @@
 /// classes) and controller (SurfaceController) elements of an MVC design.
 namespace surfaces
 {
-
-class Surface;
 class SurfaceStackModel;
 
 class SurfaceController : public shell::SurfaceFactory
@@ -40,7 +38,7 @@
     explicit SurfaceController(std::shared_ptr<SurfaceStackModel> const& surface_stack);
     virtual ~SurfaceController() {}
 
-    std::shared_ptr<shell::Surface> create_surface(const shell::SurfaceCreationParameters& params);
+    std::shared_ptr<frontend::Surface> create_surface(const frontend::SurfaceCreationParameters& params);
 
 protected:
     SurfaceController(const SurfaceController&) = delete;

=== modified file 'include/server/mir/surfaces/surface_stack.h'
--- include/server/mir/surfaces/surface_stack.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/surfaces/surface_stack.h	2013-03-15 13:09:22 +0000
@@ -35,7 +35,7 @@
 class OperatorForRenderables;
 }
 
-namespace shell
+namespace frontend
 {
 class SurfaceCreationParameters;
 }
@@ -55,7 +55,7 @@
     virtual void for_each_if(compositor::FilterForRenderables &filter, compositor::OperatorForRenderables &renderable_operator);
 
     // From SurfaceStackModel
-    virtual std::weak_ptr<Surface> create_surface(const shell::SurfaceCreationParameters& params);
+    virtual std::weak_ptr<Surface> create_surface(const frontend::SurfaceCreationParameters& params);
 
     virtual void destroy_surface(std::weak_ptr<Surface> const& surface);
 

=== modified file 'include/server/mir/surfaces/surface_stack_model.h'
--- include/server/mir/surfaces/surface_stack_model.h	2013-03-07 08:04:05 +0000
+++ include/server/mir/surfaces/surface_stack_model.h	2013-03-15 13:09:22 +0000
@@ -23,7 +23,7 @@
 
 namespace mir
 {
-namespace shell
+namespace frontend
 {
 class SurfaceCreationParameters;
 }
@@ -38,7 +38,7 @@
 public:
     virtual ~SurfaceStackModel() {}
 
-    virtual std::weak_ptr<Surface> create_surface(const shell::SurfaceCreationParameters& params) = 0;
+    virtual std::weak_ptr<Surface> create_surface(const frontend::SurfaceCreationParameters& params) = 0;
 
     virtual void destroy_surface(std::weak_ptr<Surface> const& surface) = 0;
 

=== modified file 'include/test/mir_test_cucumber/session_management_context.h'
--- include/test/mir_test_cucumber/session_management_context.h	2013-03-07 08:04:05 +0000
+++ include/test/mir_test_cucumber/session_management_context.h	2013-03-15 13:09:22 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/server_configuration.h"
 #include "mir/geometry/rectangle.h"
-#include "mir/shell/surface_id.h"
+#include "mir/frontend/surface_id.h"
 
 #include <string>
 #include <map>
@@ -32,9 +32,9 @@
 {
 class ServerConfiguration;
 
-namespace shell
+namespace frontend
 {
-class SessionStore;
+class Shell;
 class Session;
 }
 namespace graphics
@@ -68,10 +68,10 @@
     SessionManagementContext& operator=(SessionManagementContext const&) = delete;
 
 private:
-    std::map<std::string, std::tuple<std::shared_ptr<shell::Session>, shell::SurfaceId>> open_windows;
+    std::map<std::string, std::tuple<std::shared_ptr<frontend::Session>, frontend::SurfaceId>> open_windows;
 
     std::shared_ptr<SizedDisplay> view_area;
-    std::shared_ptr<shell::SessionStore> session_store;
+    std::shared_ptr<frontend::Shell> shell;
 };
 
 }

=== modified file 'include/test/mir_test_doubles/mock_session.h'
--- include/test/mir_test_doubles/mock_session.h	2013-03-11 20:18:11 +0000
+++ include/test/mir_test_doubles/mock_session.h	2013-03-15 13:09:22 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_SESSION_H_
 #define MIR_TEST_DOUBLES_MOCK_SESSION_H_
 
-#include "mir/shell/session.h"
+#include "mir/frontend/session.h"
 
 #include <gmock/gmock.h>
 
@@ -30,11 +30,11 @@
 namespace doubles
 {
 
-struct MockSession : public shell::Session
+struct MockSession : public frontend::Session
 {
-    MOCK_METHOD1(create_surface, shell::SurfaceId(shell::SurfaceCreationParameters const&));
-    MOCK_METHOD1(destroy_surface, void(shell::SurfaceId));
-    MOCK_CONST_METHOD1(get_surface, std::shared_ptr<shell::Surface>(shell::SurfaceId));
+    MOCK_METHOD1(create_surface, frontend::SurfaceId(frontend::SurfaceCreationParameters const&));
+    MOCK_METHOD1(destroy_surface, void(frontend::SurfaceId));
+    MOCK_CONST_METHOD1(get_surface, std::shared_ptr<frontend::Surface>(frontend::SurfaceId));
     
     MOCK_METHOD0(name, std::string());
     MOCK_METHOD0(shutdown, void());

=== renamed file 'include/test/mir_test_doubles/mock_session_store.h' => 'include/test/mir_test_doubles/mock_shell.h'
--- include/test/mir_test_doubles/mock_session_store.h	2013-03-07 23:14:15 +0000
+++ include/test/mir_test_doubles/mock_shell.h	2013-03-15 13:09:22 +0000
@@ -16,10 +16,10 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_TEST_DOUBLES_MOCK_SESSION_STORE_H_
-#define MIR_TEST_DOUBLES_MOCK_SESSION_STORE_H_
+#ifndef MIR_TEST_DOUBLES_SHELL_H_
+#define MIR_TEST_DOUBLES_SHELL_H_
 
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 
 #include <gmock/gmock.h>
 
@@ -30,12 +30,12 @@
 namespace doubles
 {
 
-struct MockSessionStore : public shell::SessionStore
+struct MockShell : public frontend::Shell
 {
-    MOCK_METHOD1(open_session, std::shared_ptr<shell::Session>(std::string const&));
-    MOCK_METHOD1(close_session, void(std::shared_ptr<shell::Session> const&));
+    MOCK_METHOD1(open_session, std::shared_ptr<frontend::Session>(std::string const&));
+    MOCK_METHOD1(close_session, void(std::shared_ptr<frontend::Session> const&));
 
-    MOCK_METHOD2(tag_session_with_lightdm_id, void(std::shared_ptr<shell::Session> const&, int));
+    MOCK_METHOD2(tag_session_with_lightdm_id, void(std::shared_ptr<frontend::Session> const&, int));
     MOCK_METHOD1(focus_session_with_lightdm_id, void(int));
 
     MOCK_METHOD0(shutdown, void());
@@ -45,4 +45,4 @@
 }
 } // namespace mir
 
-#endif // MIR_TEST_DOUBLES_MOCK_SESSION_STORE_H_
+#endif // MIR_TEST_DOUBLES_SHELL_H_

=== modified file 'include/test/mir_test_doubles/mock_surface.h'
--- include/test/mir_test_doubles/mock_surface.h	2013-03-11 20:18:11 +0000
+++ include/test/mir_test_doubles/mock_surface.h	2013-03-15 13:09:22 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_H_
 #define MIR_TEST_DOUBLES_MOCK_SURFACE_H_
 
-#include "mir/shell/surface.h"
+#include "mir/frontend/surface.h"
 
 #include <memory>
 
@@ -30,7 +30,7 @@
 namespace doubles
 {
 
-struct MockSurface : public shell::Surface
+struct MockSurface : public frontend::Surface
 {
     MOCK_METHOD0(hide, void());
     MOCK_METHOD0(show, void());

=== modified file 'include/test/mir_test_doubles/mock_surface_factory.h'
--- include/test/mir_test_doubles/mock_surface_factory.h	2013-03-07 08:04:05 +0000
+++ include/test/mir_test_doubles/mock_surface_factory.h	2013-03-15 13:09:22 +0000
@@ -33,7 +33,7 @@
 
 struct MockSurfaceFactory : public shell::SurfaceFactory
 {
-    MOCK_METHOD1(create_surface, std::shared_ptr<shell::Surface>(const shell::SurfaceCreationParameters&));
+    MOCK_METHOD1(create_surface, std::shared_ptr<frontend::Surface>(const frontend::SurfaceCreationParameters&));
 };
 
 }

=== modified file 'include/test/mir_test_doubles/stub_session.h'
--- include/test/mir_test_doubles/stub_session.h	2013-03-11 20:12:42 +0000
+++ include/test/mir_test_doubles/stub_session.h	2013-03-15 13:09:22 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_STUB_SESSION_H_
 #define MIR_TEST_DOUBLES_STUB_SESSION_H_
 
-#include "mir/shell/session.h"
+#include "mir/frontend/session.h"
 
 namespace mir
 {
@@ -28,18 +28,18 @@
 namespace doubles
 {
 
-struct StubSession : public shell::Session
+struct StubSession : public frontend::Session
 {
-    shell::SurfaceId create_surface(shell::SurfaceCreationParameters const& /* params */)
-    {
-        return shell::SurfaceId{0};
-    }
-    void destroy_surface(shell::SurfaceId /* surface */)
-    {
-    }
-    std::shared_ptr<shell::Surface> get_surface(shell::SurfaceId /* surface */) const
-    {
-        return std::shared_ptr<shell::Surface>();
+    frontend::SurfaceId create_surface(frontend::SurfaceCreationParameters const& /* params */)
+    {
+        return frontend::SurfaceId{0};
+    }
+    void destroy_surface(frontend::SurfaceId /* surface */)
+    {
+    }
+    std::shared_ptr<frontend::Surface> get_surface(frontend::SurfaceId /* surface */) const
+    {
+        return std::shared_ptr<frontend::Surface>();
     }
     std::string name()
     {

=== renamed file 'include/test/mir_test_doubles/stub_session_store.h' => 'include/test/mir_test_doubles/stub_shell.h'
--- include/test/mir_test_doubles/stub_session_store.h	2013-03-11 20:12:42 +0000
+++ include/test/mir_test_doubles/stub_shell.h	2013-03-15 13:09:22 +0000
@@ -16,10 +16,10 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_TEST_DOUBLES_STUB_SESSION_STORE_H_
-#define MIR_TEST_DOUBLES_STUB_SESSION_STORE_H_
+#ifndef MIR_TEST_DOUBLES_STUB_SHELL_H_
+#define MIR_TEST_DOUBLES_STUB_SHELL_H_
 
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 #include "mir_test_doubles/stub_session.h"
 
 namespace mir
@@ -29,16 +29,16 @@
 namespace doubles
 {
 
-class StubSessionStore : public shell::SessionStore
+class StubShell : public frontend::Shell
 {
-    std::shared_ptr<shell::Session> open_session(std::string const& /* name */)
+    std::shared_ptr<frontend::Session> open_session(std::string const& /* name */)
     {
         return std::make_shared<StubSession>();
     }
-    void close_session(std::shared_ptr<shell::Session> const& /* session */)
+    void close_session(std::shared_ptr<frontend::Session> const& /* session */)
     {
     }
-    void tag_session_with_lightdm_id(std::shared_ptr<shell::Session> const& /* session */, int /* id */)
+    void tag_session_with_lightdm_id(std::shared_ptr<frontend::Session> const& /* session */, int /* id */)
     {
     }
     void focus_session_with_lightdm_id(int /* id */)
@@ -53,4 +53,4 @@
 }
 } // namespace mir
 
-#endif // MIR_TEST_DOUBLES_STUB_SESSION_STORE_H_
+#endif // MIR_TEST_DOUBLES_STUB_SHELL_H_

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-03-13 07:41:46 +0000
+++ src/server/default_server_configuration.cpp	2013-03-15 13:09:22 +0000
@@ -25,13 +25,13 @@
 #include "mir/compositor/compositor.h"
 #include "mir/compositor/swapper_factory.h"
 #include "mir/frontend/protobuf_ipc_factory.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/frontend/application_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session_mediator.h"
 #include "mir/frontend/resource_cache.h"
 #include "mir/shell/session_manager.h"
 #include "mir/shell/registration_order_focus_sequence.h"
 #include "mir/shell/single_visibility_focus_mechanism.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/consuming_placement_strategy.h"
 #include "mir/shell/organising_surface_factory.h"
 #include "mir/graphics/display.h"
@@ -43,7 +43,7 @@
 #include "mir/input/input_manager.h"
 #include "mir/logging/logger.h"
 #include "mir/logging/dumb_console_logger.h"
-#include "mir/logging/application_mediator_report.h"
+#include "mir/logging/session_mediator_report.h"
 #include "mir/logging/display_report.h"
 #include "mir/surfaces/surface_controller.h"
 #include "mir/surfaces/surface_stack.h"
@@ -68,12 +68,12 @@
 {
 public:
     explicit DefaultIpcFactory(
-        std::shared_ptr<msh::SessionStore> const& session_store,
-        std::shared_ptr<mf::ApplicationMediatorReport> const& report,
+        std::shared_ptr<mf::Shell> const& shell,
+        std::shared_ptr<mf::SessionMediatorReport> const& report,
         std::shared_ptr<mg::Platform> const& graphics_platform,
         std::shared_ptr<mg::ViewableArea> const& graphics_display,
         std::shared_ptr<mc::GraphicBufferAllocator> const& buffer_allocator) :
-        session_store(session_store),
+        shell(shell),
         report(report),
         cache(std::make_shared<mf::ResourceCache>()),
         graphics_platform(graphics_platform),
@@ -83,8 +83,8 @@
     }
 
 private:
-    std::shared_ptr<msh::SessionStore> session_store;
-    std::shared_ptr<mf::ApplicationMediatorReport> const report;
+    std::shared_ptr<mf::Shell> shell;
+    std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const cache;
     std::shared_ptr<mg::Platform> const graphics_platform;
     std::shared_ptr<mg::ViewableArea> const graphics_display;
@@ -92,8 +92,8 @@
 
     virtual std::shared_ptr<mir::protobuf::DisplayServer> make_ipc_server()
     {
-        return std::make_shared<mf::ApplicationMediator>(
-            session_store,
+        return std::make_shared<mf::SessionMediator>(
+            shell,
             graphics_platform,
             graphics_display,
             buffer_allocator,
@@ -245,11 +245,11 @@
         });
 }
 
-std::shared_ptr<msh::SessionStore>
-mir::DefaultServerConfiguration::the_session_store()
+std::shared_ptr<mf::Shell>
+mir::DefaultServerConfiguration::the_frontend_shell()
 {
-    return session_store(
-        [this]() -> std::shared_ptr<msh::SessionStore>
+    return session_manager(
+        [this]() -> std::shared_ptr<msh::SessionManager>
         {
             auto session_container = std::make_shared<msh::SessionContainer>();
             auto focus_mechanism = std::make_shared<msh::SingleVisibilityFocusMechanism>(session_container);
@@ -356,7 +356,7 @@
 
 std::shared_ptr<mir::frontend::ProtobufIpcFactory>
 mir::DefaultServerConfiguration::the_ipc_factory(
-    std::shared_ptr<msh::SessionStore> const& session_store,
+    std::shared_ptr<mf::Shell> const& shell,
     std::shared_ptr<mg::ViewableArea> const& display,
     std::shared_ptr<mc::GraphicBufferAllocator> const& allocator)
 {
@@ -364,26 +364,26 @@
         [&]()
         {
             return std::make_shared<DefaultIpcFactory>(
-                session_store,
-                the_application_mediator_report(),
+                shell,
+                the_session_mediator_report(),
                 the_graphics_platform(),
                 display, allocator);
         });
 }
 
-std::shared_ptr<mf::ApplicationMediatorReport>
-mir::DefaultServerConfiguration::the_application_mediator_report()
+std::shared_ptr<mf::SessionMediatorReport>
+mir::DefaultServerConfiguration::the_session_mediator_report()
 {
-    return application_mediator_report(
-        [this]() -> std::shared_ptr<mf::ApplicationMediatorReport>
+    return session_mediator_report(
+        [this]() -> std::shared_ptr<mf::SessionMediatorReport>
         {
             if (the_options()->get(log_app_mediator, false))
             {
-                return std::make_shared<ml::ApplicationMediatorReport>(the_logger());
+                return std::make_shared<ml::SessionMediatorReport>(the_logger());
             }
             else
             {
-                return std::make_shared<mf::NullApplicationMediatorReport>();
+                return std::make_shared<mf::NullSessionMediatorReport>();
             }
         });
 }

=== modified file 'src/server/display_server.cpp'
--- src/server/display_server.cpp	2013-03-13 07:41:46 +0000
+++ src/server/display_server.cpp	2013-03-15 13:09:22 +0000
@@ -22,7 +22,7 @@
 #include "mir/server_configuration.h"
 
 #include "mir/compositor/drawer.h"
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 #include "mir/frontend/communicator.h"
 #include "mir/graphics/display.h"
 #include "mir/input/input_manager.h"
@@ -40,7 +40,7 @@
     Private(ServerConfiguration& config)
         : display{config.the_display()},
           compositor{config.the_drawer()},
-          session_store{config.the_session_store()},
+          shell{config.the_frontend_shell()},
           communicator{config.the_communicator()},
           input_manager{config.the_input_manager()},
           exit(false)
@@ -49,7 +49,7 @@
 
     std::shared_ptr<mg::Display> display;
     std::shared_ptr<mc::Drawer> compositor;
-    std::shared_ptr<shell::SessionStore> session_store;
+    std::shared_ptr<frontend::Shell> shell;
     std::shared_ptr<mf::Communicator> communicator;
     std::shared_ptr<mi::InputManager> input_manager;
     std::mutex exit_guard;
@@ -64,7 +64,7 @@
 
 mir::DisplayServer::~DisplayServer()
 {
-    p->session_store->shutdown();
+    p->shell->shutdown();
 }
 
 void mir::DisplayServer::run()

=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/frontend/CMakeLists.txt	2013-03-15 13:09:22 +0000
@@ -1,10 +1,11 @@
 set(
   FRONTEND_SOURCES
 
-  application_mediator.cpp
-  null_application_mediator_report.cpp
+  session_mediator.cpp
+  null_session_mediator_report.cpp
   protobuf_message_processor.cpp
   null_message_processor.cpp
+  surface_creation_parameters.cpp
 
   resource_cache.cpp
   ${PROTO_HDRS}
@@ -25,10 +26,10 @@
 endif()
 
 if (MIR_PLATFORM STREQUAL "android")
-  list(APPEND FRONTEND_SOURCES application_mediator_android.cpp)
+  list(APPEND FRONTEND_SOURCES session_mediator_android.cpp)
 elseif (MIR_PLATFORM STREQUAL "gbm")
   include_directories(${DRM_INCLUDE_DIRS})
-  list(APPEND FRONTEND_SOURCES application_mediator_gbm.cpp)
+  list(APPEND FRONTEND_SOURCES session_mediator_gbm.cpp)
 endif()
 
 # TODO replace this frig with an RTTI enabled binder library

=== modified file 'src/server/frontend/make_protobuf_binder_communicator.cpp'
--- src/server/frontend/make_protobuf_binder_communicator.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/make_protobuf_binder_communicator.cpp	2013-03-15 13:09:22 +0000
@@ -32,7 +32,7 @@
             auto const threads = the_options()->get("ipc-thread-pool", 10);
             return std::make_shared<mf::ProtobufBinderCommunicator>(
                 the_socket_file(),
-                the_ipc_factory(the_session_store(), the_viewable_area(), the_buffer_allocator()));
+                the_ipc_factory(the_frontend_shell(), the_viewable_area(), the_buffer_allocator()));
         });
 
 }

=== modified file 'src/server/frontend/make_protobuf_socket_communicator.cpp'
--- src/server/frontend/make_protobuf_socket_communicator.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/make_protobuf_socket_communicator.cpp	2013-03-15 13:09:22 +0000
@@ -33,7 +33,7 @@
             auto const threads = the_options()->get("ipc-thread-pool", 10);
             return std::make_shared<mf::ProtobufSocketCommunicator>(
                 the_socket_file(),
-                the_ipc_factory(the_session_store(), the_viewable_area(), the_buffer_allocator()),
+                the_ipc_factory(the_frontend_shell(), the_viewable_area(), the_buffer_allocator()),
                 threads);
         });
 }

=== renamed file 'src/server/frontend/null_application_mediator_report.cpp' => 'src/server/frontend/null_session_mediator_report.cpp'
--- src/server/frontend/null_application_mediator_report.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/null_session_mediator_report.cpp	2013-03-15 13:09:22 +0000
@@ -16,33 +16,33 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/application_mediator_report.h"
-
-void mir::frontend::NullApplicationMediatorReport::application_connect_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_create_surface_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_next_buffer_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_release_surface_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_disconnect_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_drm_auth_magic_called(std::string const&)
-{
-}
-
-void mir::frontend::NullApplicationMediatorReport::application_error(
+#include "mir/frontend/session_mediator_report.h"
+
+void mir::frontend::NullSessionMediatorReport::session_connect_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_create_surface_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_next_buffer_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_release_surface_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_disconnect_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_drm_auth_magic_called(std::string const&)
+{
+}
+
+void mir::frontend::NullSessionMediatorReport::session_error(
         std::string const&,
         char const* ,
         std::string const& )

=== renamed file 'src/server/frontend/application_mediator.cpp' => 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/application_mediator.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/session_mediator.cpp	2013-03-15 13:09:22 +0000
@@ -16,11 +16,11 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/application_mediator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/shell/session_store.h"
-#include "mir/shell/session.h"
-#include "mir/shell/surface.h"
+#include "mir/frontend/session_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/shell.h"
+#include "mir/frontend/session.h"
+#include "mir/frontend/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/frontend/resource_cache.h"
 
@@ -35,14 +35,14 @@
 #include "mir/graphics/platform_ipc_package.h"
 #include <boost/throw_exception.hpp>
 
-mir::frontend::ApplicationMediator::ApplicationMediator(
-    std::shared_ptr<shell::SessionStore> const& session_store,
+mir::frontend::SessionMediator::SessionMediator(
+    std::shared_ptr<frontend::Shell> const& shell,
     std::shared_ptr<graphics::Platform> const & graphics_platform,
     std::shared_ptr<graphics::ViewableArea> const& viewable_area,
     std::shared_ptr<compositor::GraphicBufferAllocator> const& buffer_allocator,
-    std::shared_ptr<ApplicationMediatorReport> const& report,
+    std::shared_ptr<SessionMediatorReport> const& report,
     std::shared_ptr<ResourceCache> const& resource_cache) :
-    session_store(session_store),
+    shell(shell),
     graphics_platform(graphics_platform),
     viewable_area(viewable_area),
     buffer_allocator(buffer_allocator),
@@ -51,15 +51,15 @@
 {
 }
 
-void mir::frontend::ApplicationMediator::connect(
+void mir::frontend::SessionMediator::connect(
     ::google::protobuf::RpcController*,
     const ::mir::protobuf::ConnectParameters* request,
     ::mir::protobuf::Connection* response,
     ::google::protobuf::Closure* done)
 {
-    report->application_connect_called(request->application_name());
+    report->session_connect_called(request->application_name());
 
-    application_session = session_store->open_session(request->application_name());
+    session = shell->open_session(request->application_name());
 
     auto ipc_package = graphics_platform->get_ipc_package();
     auto platform = response->mutable_platform();
@@ -82,24 +82,24 @@
     resource_cache->save_resource(response, ipc_package);
 
     if (request->has_lightdm_id())
-        session_store->tag_session_with_lightdm_id(application_session, request->lightdm_id());
+        shell->tag_session_with_lightdm_id(session, request->lightdm_id());
 
     done->Run();
 }
 
-void mir::frontend::ApplicationMediator::create_surface(
+void mir::frontend::SessionMediator::create_surface(
     google::protobuf::RpcController* /*controller*/,
     const mir::protobuf::SurfaceParameters* request,
     mir::protobuf::Surface* response,
     google::protobuf::Closure* done)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_create_surface_called(application_session->name());
+    report->session_create_surface_called(session->name());
 
-    auto const id = application_session->create_surface(
-        shell::SurfaceCreationParameters()
+    auto const id = session->create_surface(
+        SurfaceCreationParameters()
         .of_name(request->surface_name())
         .of_size(request->width(), request->height())
         .of_buffer_usage(static_cast<compositor::BufferUsage>(request->buffer_usage()))
@@ -107,7 +107,7 @@
         );
 
     {
-        auto surface = application_session->get_surface(id);
+        auto surface = session->get_surface(id);
         response->mutable_id()->set_value(id.as_value());
         response->set_width(surface->size().width.as_uint32_t());
         response->set_height(surface->size().height.as_uint32_t());
@@ -138,20 +138,18 @@
     done->Run();
 }
 
-void mir::frontend::ApplicationMediator::next_buffer(
+void mir::frontend::SessionMediator::next_buffer(
     ::google::protobuf::RpcController* /*controller*/,
     ::mir::protobuf::SurfaceId const* request,
     ::mir::protobuf::Buffer* response,
     ::google::protobuf::Closure* done)
 {
-    using shell::SurfaceId;
-
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_next_buffer_called(application_session->name());
+    report->session_next_buffer_called(session->name());
 
-    auto surface = application_session->get_surface(SurfaceId(request->value()));
+    auto surface = session->get_surface(SurfaceId(request->value()));
 
     surface->advance_client_buffer();
     auto const& buffer_resource = surface->client_buffer();
@@ -171,51 +169,51 @@
     done->Run();
 }
 
-void mir::frontend::ApplicationMediator::select_focus_by_lightdm_id(
+void mir::frontend::SessionMediator::select_focus_by_lightdm_id(
     google::protobuf::RpcController*,// controller,
     mir::protobuf::LightdmId const* request,
     mir::protobuf::Void*,// response,
     google::protobuf::Closure* done)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    session_store->focus_session_with_lightdm_id(request->value());
+    shell->focus_session_with_lightdm_id(request->value());
 
     done->Run();
 }
 
-void mir::frontend::ApplicationMediator::release_surface(
+void mir::frontend::SessionMediator::release_surface(
     google::protobuf::RpcController* /*controller*/,
     const mir::protobuf::SurfaceId* request,
     mir::protobuf::Void*,
     google::protobuf::Closure* done)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_release_surface_called(application_session->name());
-
-    auto const id = shell::SurfaceId(request->value());
-
-    application_session->destroy_surface(id);
+    report->session_release_surface_called(session->name());
+
+    auto const id = SurfaceId(request->value());
+
+    session->destroy_surface(id);
 
     done->Run();
 }
 
-void mir::frontend::ApplicationMediator::disconnect(
+void mir::frontend::SessionMediator::disconnect(
     google::protobuf::RpcController* /*controller*/,
     const mir::protobuf::Void* /*request*/,
     mir::protobuf::Void* /*response*/,
     google::protobuf::Closure* done)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_disconnect_called(application_session->name());
+    report->session_disconnect_called(session->name());
 
-    session_store->close_session(application_session);
-    application_session.reset();
+    shell->close_session(session);
+    session.reset();
 
     done->Run();
 }

=== renamed file 'src/server/frontend/application_mediator_android.cpp' => 'src/server/frontend/session_mediator_android.cpp'
--- src/server/frontend/application_mediator_android.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/session_mediator_android.cpp	2013-03-15 13:09:22 +0000
@@ -16,23 +16,23 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "mir/frontend/application_mediator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session.h"
 #include <boost/throw_exception.hpp>
 
 #include <stdexcept>
 
-void mir::frontend::ApplicationMediator::drm_auth_magic(
+void mir::frontend::SessionMediator::drm_auth_magic(
     google::protobuf::RpcController* /*controller*/,
     const mir::protobuf::DRMMagic* /*request*/,
     mir::protobuf::DRMAuthMagicStatus* /*response*/,
     google::protobuf::Closure* /*done*/)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_drm_auth_magic_called(application_session->name());
+    report->session_drm_auth_magic_called(session->name());
 
     BOOST_THROW_EXCEPTION(std::logic_error("drm_auth_magic request not supported by the Android platform"));
 }

=== renamed file 'src/server/frontend/application_mediator_gbm.cpp' => 'src/server/frontend/session_mediator_gbm.cpp'
--- src/server/frontend/application_mediator_gbm.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/session_mediator_gbm.cpp	2013-03-15 13:09:22 +0000
@@ -16,9 +16,9 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "mir/frontend/application_mediator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session.h"
 #include "mir/graphics/drm_authenticator.h"
 #include "mir/graphics/platform.h"
 
@@ -30,16 +30,16 @@
 
 namespace mg = mir::graphics;
 
-void mir::frontend::ApplicationMediator::drm_auth_magic(
+void mir::frontend::SessionMediator::drm_auth_magic(
     google::protobuf::RpcController* /*controller*/,
     const mir::protobuf::DRMMagic* request,
     mir::protobuf::DRMAuthMagicStatus* response,
     google::protobuf::Closure* done)
 {
-    if (application_session.get() == nullptr)
+    if (session.get() == nullptr)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
 
-    report->application_drm_auth_magic_called(application_session->name());
+    report->session_drm_auth_magic_called(session->name());
 
     auto const magic = static_cast<drm_magic_t>(request->magic());
     auto authenticator = std::dynamic_pointer_cast<mg::DRMAuthenticator>(graphics_platform);

=== renamed file 'src/server/shell/surface_creation_parameters.cpp' => 'src/server/frontend/surface_creation_parameters.cpp'
--- src/server/shell/surface_creation_parameters.cpp	2013-03-07 08:04:05 +0000
+++ src/server/frontend/surface_creation_parameters.cpp	2013-03-15 13:09:22 +0000
@@ -19,23 +19,23 @@
 #include "mir/shell/surface_creation_parameters.h"
 
 namespace mc = mir::compositor;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 namespace geom = mir::geometry;
 
-msh::SurfaceCreationParameters::SurfaceCreationParameters()
+mf::SurfaceCreationParameters::SurfaceCreationParameters()
     : name(), size(), buffer_usage(mc::BufferUsage::undefined),
       pixel_format(geom::PixelFormat::invalid)
 {
 }
 
-msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_name(std::string const& new_name)
+mf::SurfaceCreationParameters& mf::SurfaceCreationParameters::of_name(std::string const& new_name)
 {
     name = new_name;
     return *this;
 }
 
 
-msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_size(
+mf::SurfaceCreationParameters& mf::SurfaceCreationParameters::of_size(
         geometry::Size new_size)
 {
     size = new_size;
@@ -43,14 +43,14 @@
     return *this;
 }
 
-msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_size(
+mf::SurfaceCreationParameters& mf::SurfaceCreationParameters::of_size(
     geometry::Width::ValueType width,
     geometry::Height::ValueType height)
 {
     return of_size(geometry::Size(geometry::Width(width), geometry::Height(height)));
 }
 
-msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_buffer_usage(
+mf::SurfaceCreationParameters& mf::SurfaceCreationParameters::of_buffer_usage(
         mc::BufferUsage new_buffer_usage)
 {
     buffer_usage = new_buffer_usage;
@@ -58,7 +58,7 @@
     return *this;
 }
 
-msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_pixel_format(
+mf::SurfaceCreationParameters& mf::SurfaceCreationParameters::of_pixel_format(
     geom::PixelFormat new_pixel_format)
 {
     pixel_format = new_pixel_format;
@@ -66,23 +66,23 @@
     return *this;
 }
 
-bool msh::operator==(
+bool mf::operator==(
     const SurfaceCreationParameters& lhs,
-    const msh::SurfaceCreationParameters& rhs)
+    const mf::SurfaceCreationParameters& rhs)
 {
     return lhs.size == rhs.size &&
            lhs.buffer_usage == rhs.buffer_usage &&
            lhs.pixel_format == rhs.pixel_format;
 }
 
-bool msh::operator!=(
+bool mf::operator!=(
     const SurfaceCreationParameters& lhs,
-    const msh::SurfaceCreationParameters& rhs)
+    const mf::SurfaceCreationParameters& rhs)
 {
     return !(lhs == rhs);
 }
 
-msh::SurfaceCreationParameters msh::a_surface()
+mf::SurfaceCreationParameters mf::a_surface()
 {
     return SurfaceCreationParameters();
 }

=== modified file 'src/server/logging/CMakeLists.txt'
--- src/server/logging/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/logging/CMakeLists.txt	2013-03-15 13:09:22 +0000
@@ -2,7 +2,7 @@
   LOGGING_SOURCES
 
   dumb_console_logger.cpp
-  application_mediator_report.cpp
+  session_mediator_report.cpp
   display_report.cpp
 )
 

=== renamed file 'src/server/logging/application_mediator_report.cpp' => 'src/server/logging/session_mediator_report.cpp'
--- src/server/logging/application_mediator_report.cpp	2013-03-04 16:02:02 +0000
+++ src/server/logging/session_mediator_report.cpp	2013-03-15 13:09:22 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/logging/application_mediator_report.h"
+#include "mir/logging/session_mediator_report.h"
 
 #include "mir/logging/logger.h"
 
@@ -28,45 +28,45 @@
 namespace ml = mir::logging;
 
 
-ml::ApplicationMediatorReport::ApplicationMediatorReport(std::shared_ptr<Logger> const& log) :
+ml::SessionMediatorReport::SessionMediatorReport(std::shared_ptr<Logger> const& log) :
     log(log)
 {
 }
 
-void ml::ApplicationMediatorReport::application_connect_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_connect(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_create_surface_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_create_surface(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_next_buffer_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_next_buffer_called(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_release_surface_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_release_surface_called(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_disconnect_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_disconnect_called(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_drm_auth_magic_called(std::string const& app_name)
-{
-    log->log<Logger::informational>("application_drm_auth_magic_called(\"" + app_name + "\")", component);
-}
-
-void ml::ApplicationMediatorReport::application_error(
+void ml::SessionMediatorReport::session_connect_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_connect(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_create_surface_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_create_surface(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_next_buffer_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_next_buffer_called(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_release_surface_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_release_surface_called(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_disconnect_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_disconnect_called(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_drm_auth_magic_called(std::string const& app_name)
+{
+    log->log<Logger::informational>("session_drm_auth_magic_called(\"" + app_name + "\")", component);
+}
+
+void ml::SessionMediatorReport::session_error(
         std::string const& app_name,
         char const* method,
         std::string const& what)
 {
-    log->log<Logger::error>(std::string(method) + " - application_error(\"" + app_name + "\"):\n" + what, component);
+    log->log<Logger::error>(std::string(method) + " - session_error(\"" + app_name + "\"):\n" + what, component);
 }

=== modified file 'src/server/shell/CMakeLists.txt'
--- src/server/shell/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/shell/CMakeLists.txt	2013-03-15 13:09:22 +0000
@@ -8,7 +8,6 @@
   single_visibility_focus_mechanism.cpp
   consuming_placement_strategy.cpp
   organising_surface_factory.cpp
-  surface_creation_parameters.cpp
 )
 
 add_library(

=== modified file 'src/server/shell/application_session.cpp'
--- src/server/shell/application_session.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/application_session.cpp	2013-03-15 13:09:22 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/shell/application_session.h"
-#include "mir/shell/surface.h"
+#include "mir/frontend/surface.h"
 
 #include "mir/surfaces/surface_controller.h"
 
@@ -28,6 +28,7 @@
 #include <cassert>
 #include <algorithm>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 
@@ -50,12 +51,12 @@
     }
 }
 
-msh::SurfaceId msh::ApplicationSession::next_id()
+mf::SurfaceId msh::ApplicationSession::next_id()
 {
-    return SurfaceId(next_surface_id.fetch_add(1));
+    return mf::SurfaceId(next_surface_id.fetch_add(1));
 }
 
-msh::SurfaceId msh::ApplicationSession::create_surface(const SurfaceCreationParameters& params)
+mf::SurfaceId msh::ApplicationSession::create_surface(const mf::SurfaceCreationParameters& params)
 {
     auto surf = surface_factory->create_surface(params);
     auto const id = next_id();
@@ -65,7 +66,7 @@
     return id;
 }
 
-msh::ApplicationSession::Surfaces::const_iterator msh::ApplicationSession::checked_find(SurfaceId id) const
+msh::ApplicationSession::Surfaces::const_iterator msh::ApplicationSession::checked_find(mf::SurfaceId id) const
 {
     auto p = surfaces.find(id);
     if (p == surfaces.end())
@@ -75,14 +76,14 @@
     return p;
 }
 
-std::shared_ptr<msh::Surface> msh::ApplicationSession::get_surface(msh::SurfaceId id) const
+std::shared_ptr<mf::Surface> msh::ApplicationSession::get_surface(mf::SurfaceId id) const
 {
     std::unique_lock<std::mutex> lock(surfaces_mutex);
 
     return checked_find(id)->second;
 }
 
-void msh::ApplicationSession::destroy_surface(msh::SurfaceId id)
+void msh::ApplicationSession::destroy_surface(mf::SurfaceId id)
 {
     std::unique_lock<std::mutex> lock(surfaces_mutex);
     auto p = checked_find(id);

=== modified file 'src/server/shell/consuming_placement_strategy.cpp'
--- src/server/shell/consuming_placement_strategy.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/consuming_placement_strategy.cpp	2013-03-15 13:09:22 +0000
@@ -22,6 +22,7 @@
 
 #include <algorithm>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace mg = mir::graphics;
 namespace geom = mir::geometry;
@@ -31,7 +32,7 @@
 {
 }
 
-msh::SurfaceCreationParameters msh::ConsumingPlacementStrategy::place(msh::SurfaceCreationParameters const& request_parameters)
+mf::SurfaceCreationParameters msh::ConsumingPlacementStrategy::place(mf::SurfaceCreationParameters const& request_parameters)
 {
     // We would like to try to fill placement requests
     auto placed_parameters = request_parameters;

=== modified file 'src/server/shell/organising_surface_factory.cpp'
--- src/server/shell/organising_surface_factory.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/organising_surface_factory.cpp	2013-03-15 13:09:22 +0000
@@ -20,6 +20,7 @@
 #include "mir/shell/placement_strategy.h"
 #include "mir/shell/surface_creation_parameters.h"
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 msh::OrganisingSurfaceFactory::OrganisingSurfaceFactory(std::shared_ptr<msh::SurfaceFactory> const& underlying_factory,
@@ -33,7 +34,7 @@
 {
 }
 
-std::shared_ptr<msh::Surface> msh::OrganisingSurfaceFactory::create_surface(const msh::SurfaceCreationParameters& params)
+std::shared_ptr<mf::Surface> msh::OrganisingSurfaceFactory::create_surface(const mf::SurfaceCreationParameters& params)
 {
     auto placed_params = placement_strategy->place(params);
 

=== modified file 'src/server/shell/registration_order_focus_sequence.cpp'
--- src/server/shell/registration_order_focus_sequence.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/registration_order_focus_sequence.cpp	2013-03-15 13:09:22 +0000
@@ -17,8 +17,8 @@
  */
 
 #include "mir/shell/registration_order_focus_sequence.h"
-#include "mir/shell/session.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session.h"
+#include "mir/frontend/session_container.h"
 
 #include <boost/throw_exception.hpp>
 
@@ -28,6 +28,7 @@
 #include <stdexcept>
 
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 msh::RegistrationOrderFocusSequence::RegistrationOrderFocusSequence(std::shared_ptr<msh::SessionContainer> const& app_container) :
@@ -36,13 +37,13 @@
 
 }
 
-std::shared_ptr<msh::Session> msh::RegistrationOrderFocusSequence::successor_of(std::shared_ptr<msh::Session> const& focused_app) const
+std::shared_ptr<mf::Session> msh::RegistrationOrderFocusSequence::successor_of(std::shared_ptr<mf::Session> const& focused_app) const
 {
-    std::shared_ptr<msh::Session> result, first;
+    std::shared_ptr<mf::Session> result, first;
     bool found{false};
 
     session_container->for_each(
-        [&](std::shared_ptr<msh::Session> const& session)
+        [&](std::shared_ptr<mf::Session> const& session)
          {
              if (!first)
              {
@@ -72,13 +73,13 @@
     }
 }
 
-std::shared_ptr<msh::Session> msh::RegistrationOrderFocusSequence::predecessor_of(std::shared_ptr<msh::Session> const& focused_app) const
+std::shared_ptr<mf::Session> msh::RegistrationOrderFocusSequence::predecessor_of(std::shared_ptr<mf::Session> const& focused_app) const
 {
-    std::shared_ptr<msh::Session> result, last;
+    std::shared_ptr<mf::Session> result, last;
     bool found{false};
 
     session_container->for_each(
-        [&](std::shared_ptr<msh::Session> const& session)
+        [&](std::shared_ptr<mf::Session> const& session)
         {
             last = session;
             if (focused_app == session)
@@ -105,12 +106,12 @@
     }
 }
 
-std::shared_ptr<msh::Session> msh::RegistrationOrderFocusSequence::default_focus() const
+std::shared_ptr<mf::Session> msh::RegistrationOrderFocusSequence::default_focus() const
 {
-    std::shared_ptr<msh::Session> result;
+    std::shared_ptr<mf::Session> result;
 
     session_container->for_each(
-        [&](std::shared_ptr<msh::Session> const& session)
+        [&](std::shared_ptr<mf::Session> const& session)
         {
             result = session;
         });

=== modified file 'src/server/shell/session_container.cpp'
--- src/server/shell/session_container.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/session_container.cpp	2013-03-15 13:09:22 +0000
@@ -16,8 +16,8 @@
  * Authored By: Robert Carr <[e-mail]>
  */
 
-#include "mir/shell/session_container.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session_container.h"
+#include "mir/frontend/session.h"
 
 #include <boost/throw_exception.hpp>
 
@@ -27,6 +27,7 @@
 #include <stdexcept>
 
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 msh::SessionContainer::SessionContainer()
@@ -38,7 +39,7 @@
 {
 }
 
-void msh::SessionContainer::insert_session(std::shared_ptr<msh::Session> const& session)
+void msh::SessionContainer::insert_session(std::shared_ptr<mf::Session> const& session)
 {
     std::unique_lock<std::mutex> lk(guard);
     auto name = session->name();
@@ -46,7 +47,7 @@
     apps.push_back(session);
 }
 
-void msh::SessionContainer::remove_session(std::shared_ptr<msh::Session> const& session)
+void msh::SessionContainer::remove_session(std::shared_ptr<mf::Session> const& session)
 {
     std::unique_lock<std::mutex> lk(guard);
 
@@ -61,7 +62,7 @@
     }
 }
 
-void msh::SessionContainer::for_each(std::function<void(std::shared_ptr<Session> const&)> f) const
+void msh::SessionContainer::for_each(std::function<void(std::shared_ptr<mf::Session> const&)> f) const
 {
     std::unique_lock<std::mutex> lk(guard);
 

=== modified file 'src/server/shell/session_manager.cpp'
--- src/server/shell/session_manager.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/session_manager.cpp	2013-03-15 13:09:22 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/shell/session_manager.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/shell/focus_sequence.h"
 #include "mir/shell/focus_setter.h"
@@ -27,6 +27,7 @@
 #include <cassert>
 #include <algorithm>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 msh::SessionManager::SessionManager(
@@ -49,7 +50,7 @@
 {
 }
 
-std::shared_ptr<msh::Session> msh::SessionManager::open_session(std::string const& name)
+std::shared_ptr<mf::Session> msh::SessionManager::open_session(std::string const& name)
 {
     auto new_session = std::make_shared<msh::ApplicationSession>(surface_factory, name);
 
@@ -64,13 +65,13 @@
     return new_session;
 }
 
-inline void msh::SessionManager::set_focus_to(std::shared_ptr<Session> const& next_focus)
+inline void msh::SessionManager::set_focus_to(std::shared_ptr<mf::Session> const& next_focus)
 {
     focus_application = next_focus;
     focus_setter->set_focus_to(next_focus);
 }
 
-void msh::SessionManager::close_session(std::shared_ptr<msh::Session> const& session)
+void msh::SessionManager::close_session(std::shared_ptr<mf::Session> const& session)
 {
     std::unique_lock<std::mutex> lock(mutex);
 
@@ -102,13 +103,13 @@
 
 void msh::SessionManager::shutdown()
 {
-    app_container->for_each([](std::shared_ptr<Session> const& session)
+    app_container->for_each([](std::shared_ptr<mf::Session> const& session)
     {
         session->shutdown();
     });
 }
 
-void msh::SessionManager::tag_session_with_lightdm_id(std::shared_ptr<Session> const& session, int id)
+void msh::SessionManager::tag_session_with_lightdm_id(std::shared_ptr<mf::Session> const& session, int id)
 {
     std::unique_lock<std::mutex> lock(mutex);
     typedef Tags::value_type Pair;

=== modified file 'src/server/shell/single_visibility_focus_mechanism.cpp'
--- src/server/shell/single_visibility_focus_mechanism.cpp	2013-03-07 08:04:05 +0000
+++ src/server/shell/single_visibility_focus_mechanism.cpp	2013-03-15 13:09:22 +0000
@@ -16,10 +16,11 @@
  * Authored By: Robert Carr <[e-mail]>
  */
 
-#include "mir/shell/session_container.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session_container.h"
+#include "mir/frontend/session.h"
 #include "mir/shell/single_visibility_focus_mechanism.h"
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 msh::SingleVisibilityFocusMechanism::SingleVisibilityFocusMechanism(std::shared_ptr<msh::SessionContainer> const& app_container) :
@@ -27,10 +28,10 @@
 {
 }
 
-void msh::SingleVisibilityFocusMechanism::set_focus_to(std::shared_ptr<msh::Session> const& focus_session)
+void msh::SingleVisibilityFocusMechanism::set_focus_to(std::shared_ptr<mf::Session> const& focus_session)
 {
     app_container->for_each(
-        [&](std::shared_ptr<msh::Session> const& session) {
+        [&](std::shared_ptr<mf::Session> const& session) {
         if (session == focus_session)
         {
             session->show();

=== modified file 'src/server/surfaces/proxy_surface.cpp'
--- src/server/surfaces/proxy_surface.cpp	2013-03-07 08:04:05 +0000
+++ src/server/surfaces/proxy_surface.cpp	2013-03-15 13:09:22 +0000
@@ -112,7 +112,7 @@
 
 ms::ProxySurface::ProxySurface(
         SurfaceStackModel* const surface_stack_,
-        shell::SurfaceCreationParameters const& params) :
+        frontend::SurfaceCreationParameters const& params) :
     BasicProxySurface(surface_stack_->create_surface(params)),
     surface_stack(surface_stack_)
 {

=== modified file 'src/server/surfaces/proxy_surface.h'
--- src/server/surfaces/proxy_surface.h	2013-03-07 08:04:05 +0000
+++ src/server/surfaces/proxy_surface.h	2013-03-15 13:09:22 +0000
@@ -20,21 +20,21 @@
 #ifndef PROXY_SURFACE_H_
 #define PROXY_SURFACE_H_
 
-#include "mir/shell/surface.h"
+#include "mir/frontend/surface.h"
 #include "mir/surfaces/surface.h"
 
 namespace mir
 {
-namespace shell
+namespace frontend
 {
-class SurfaceCreationParameters;
+struct SurfaceCreationParameters;
 }
 
 namespace surfaces
 {
 class SurfaceStackModel;
 
-class BasicProxySurface : public shell::Surface
+class BasicProxySurface : public frontend::Surface
 {
 public:
 
@@ -68,7 +68,7 @@
 public:
     ProxySurface(
         SurfaceStackModel* const surface_stack_,
-        shell::SurfaceCreationParameters const& params);
+        frontend::SurfaceCreationParameters const& params);
 
     void destroy();
 

=== modified file 'src/server/surfaces/surface_controller.cpp'
--- src/server/surfaces/surface_controller.cpp	2013-03-07 08:04:05 +0000
+++ src/server/surfaces/surface_controller.cpp	2013-03-15 13:09:22 +0000
@@ -17,23 +17,22 @@
  */
 
 #include "mir/surfaces/surface_controller.h"
-#include "mir/surfaces/surface.h"
 #include "mir/surfaces/surface_stack_model.h"
-#include "mir/shell/surface.h"
+#include "mir/frontend/surface.h"
 
 #include "proxy_surface.h"
 
 #include <cassert>
 
 namespace ms = mir::surfaces;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 
 ms::SurfaceController::SurfaceController(std::shared_ptr<SurfaceStackModel> const& surface_stack) : surface_stack(surface_stack)
 {
     assert(surface_stack);
 }
 
-std::shared_ptr<msh::Surface> ms::SurfaceController::create_surface(const msh::SurfaceCreationParameters& params)
+std::shared_ptr<mf::Surface> ms::SurfaceController::create_surface(const mf::SurfaceCreationParameters& params)
 {
     return std::make_shared<ProxySurface>(surface_stack.get(), params);
 }

=== modified file 'src/server/surfaces/surface_stack.cpp'
--- src/server/surfaces/surface_stack.cpp	2013-03-07 08:04:05 +0000
+++ src/server/surfaces/surface_stack.cpp	2013-03-15 13:09:22 +0000
@@ -51,7 +51,7 @@
 }
 
 
-std::weak_ptr<ms::Surface> ms::SurfaceStack::create_surface(const shell::SurfaceCreationParameters& params)
+std::weak_ptr<ms::Surface> ms::SurfaceStack::create_surface(const frontend::SurfaceCreationParameters& params)
 {
     std::lock_guard<std::mutex> lg(guard);
 

=== modified file 'tests/acceptance-tests/test_focus_management_api.cpp'
--- tests/acceptance-tests/test_focus_management_api.cpp	2013-03-07 08:04:05 +0000
+++ tests/acceptance-tests/test_focus_management_api.cpp	2013-03-15 13:09:22 +0000
@@ -18,7 +18,7 @@
 
 #include "mir_toolkit/mir_client_library_lightdm.h"
 
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 
 #include "mir_test_doubles/mock_display.h"
 #include "mir_test_framework/display_server_test_fixture.h"
@@ -30,6 +30,7 @@
 #include <thread>
 #include <fcntl.h>
 
+namespace mf = mir::frontend;
 namespace mg = mir::graphics;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -119,33 +120,33 @@
     }
 };
 
-class MockSessionStore : public shell::SessionStore
+class MockShell : public frontend::Shell
 {
 public:
-    MockSessionStore(std::shared_ptr<SessionStore> const& impl) :
+    MockShell(std::shared_ptr<Shell> const& impl) :
         impl(impl)
     {
         using namespace testing;
-        using shell::SessionStore;
-        ON_CALL(*this, open_session(_)).WillByDefault(Invoke(impl.get(), &SessionStore::open_session));
-        ON_CALL(*this, close_session(_)).WillByDefault(Invoke(impl.get(), &SessionStore::close_session));
-
-        ON_CALL(*this, tag_session_with_lightdm_id(_, _)).WillByDefault(Invoke(impl.get(), &SessionStore::tag_session_with_lightdm_id));
-        ON_CALL(*this, focus_session_with_lightdm_id(_)).WillByDefault(Invoke(impl.get(), &SessionStore::focus_session_with_lightdm_id));
-
-        ON_CALL(*this, shutdown()).WillByDefault(Invoke(impl.get(), &SessionStore::shutdown));
+        using frontend::Shell;
+        ON_CALL(*this, open_session(_)).WillByDefault(Invoke(impl.get(), &Shell::open_session));
+        ON_CALL(*this, close_session(_)).WillByDefault(Invoke(impl.get(), &Shell::close_session));
+
+        ON_CALL(*this, tag_session_with_lightdm_id(_, _)).WillByDefault(Invoke(impl.get(), &Shell::tag_session_with_lightdm_id));
+        ON_CALL(*this, focus_session_with_lightdm_id(_)).WillByDefault(Invoke(impl.get(), &Shell::focus_session_with_lightdm_id));
+
+        ON_CALL(*this, shutdown()).WillByDefault(Invoke(impl.get(), &Shell::shutdown));
     }
 
-    MOCK_METHOD1(open_session, std::shared_ptr<shell::Session> (std::string const& name));
-    MOCK_METHOD1(close_session, void (std::shared_ptr<shell::Session> const& session));
+    MOCK_METHOD1(open_session, std::shared_ptr<mf::Session> (std::string const& name));
+    MOCK_METHOD1(close_session, void (std::shared_ptr<mf::Session> const& session));
 
-    MOCK_METHOD2(tag_session_with_lightdm_id, void (std::shared_ptr<shell::Session> const& session, int id));
+    MOCK_METHOD2(tag_session_with_lightdm_id, void (std::shared_ptr<mf::Session> const& session, int id));
     MOCK_METHOD1(focus_session_with_lightdm_id, void (int id));
 
     MOCK_METHOD0(shutdown, void ());
 
 private:
-    std::shared_ptr<shell::SessionStore> const impl;
+    std::shared_ptr<frontend::Shell> const impl;
 };
 }
 
@@ -153,33 +154,33 @@
 {
     struct ServerConfig : TestingServerConfiguration
     {
-        std::shared_ptr<shell::SessionStore>
-        the_session_store()
+        std::shared_ptr<frontend::Shell>
+        the_frontend_shell() override
         {
-            return session_store(
-                [this]() -> std::shared_ptr<shell::SessionStore>
+            return session_manager(
+                [this]() -> std::shared_ptr<frontend::Shell>
                 {
                     using namespace ::testing;
 
-                    auto const& mock_session_store = std::make_shared<MockSessionStore>(
-                        DefaultServerConfiguration::the_session_store());
+                    auto const& mock_shell = std::make_shared<MockShell>(
+                        DefaultServerConfiguration::the_frontend_shell());
 
                     {
                         using namespace testing;
                         InSequence setup;
-                        EXPECT_CALL(*mock_session_store, open_session(_)).Times(2);
-                        EXPECT_CALL(*mock_session_store, close_session(_)).Times(2);
-                        EXPECT_CALL(*mock_session_store, shutdown());
+                        EXPECT_CALL(*mock_shell, open_session(_)).Times(2);
+                        EXPECT_CALL(*mock_shell, close_session(_)).Times(2);
+                        EXPECT_CALL(*mock_shell, shutdown());
                     }
                     {
                         using namespace testing;
                         InSequence test;
 
-                        EXPECT_CALL(*mock_session_store, tag_session_with_lightdm_id(_, _));
-                        EXPECT_CALL(*mock_session_store, focus_session_with_lightdm_id(_));
+                        EXPECT_CALL(*mock_shell, tag_session_with_lightdm_id(_, _));
+                        EXPECT_CALL(*mock_shell, focus_session_with_lightdm_id(_));
                     }
 
-                    return mock_session_store;
+                    return mock_shell;
                 });
         }
     } server_config;

=== modified file 'tests/behavior-tests/session_management_context.cpp'
--- tests/behavior-tests/session_management_context.cpp	2013-03-13 07:41:46 +0000
+++ tests/behavior-tests/session_management_context.cpp	2013-03-15 13:09:22 +0000
@@ -18,17 +18,18 @@
 
 #include "mir_test_cucumber/session_management_context.h"
 
-#include "mir/shell/surface.h"
+#include "mir/frontend/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session.h"
 #include "mir/shell/registration_order_focus_sequence.h"
 #include "mir/shell/single_visibility_focus_mechanism.h"
-#include "mir/shell/session_container.h"
-#include "mir/shell/session_store.h"
+#include "mir/frontend/session_container.h"
+#include "mir/frontend/shell.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/graphics/display.h"
 #include "mir/default_server_configuration.h"
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 
 namespace mg = mir::graphics;
@@ -51,7 +52,7 @@
 static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(),
                                                                  default_view_size};
 
-struct DummySurface : public msh::Surface
+struct DummySurface : public mf::Surface
 {
     explicit DummySurface() {}
     virtual ~DummySurface() {}
@@ -98,7 +99,7 @@
     {
     }
 
-    std::shared_ptr<msh::Surface> create_surface(const msh::SurfaceCreationParameters& params)
+    std::shared_ptr<mf::Surface> create_surface(const mf::SurfaceCreationParameters& params)
     {
         auto name = params.name;
         return std::make_shared<SizedDummySurface>(params.size);
@@ -156,21 +157,21 @@
 
 mtc::SessionManagementContext::SessionManagementContext() :
     view_area(std::make_shared<mtc::SizedDisplay>()),
-    session_store(server_configuration.the_session_store())
+    shell(server_configuration.the_frontend_shell())
 {
 }
 
 mtc::SessionManagementContext::SessionManagementContext(ServerConfiguration& server_configuration) :
     view_area(std::make_shared<mtc::SizedDisplay>()),
-    session_store(server_configuration.the_session_store())
+    shell(server_configuration.the_frontend_shell())
 {
 }
 
 // TODO: This will be less awkward with the ApplicationWindow class.
 bool mtc::SessionManagementContext::open_window_consuming(std::string const& window_name)
 {
-    auto const params = msh::a_surface().of_name(window_name);
-    auto session = session_store->open_session(window_name);
+    auto const params = mf::a_surface().of_name(window_name);
+    auto session = shell->open_session(window_name);
     auto const surface_id = session->create_surface(params);
 
     open_windows[window_name] = std::make_tuple(session, surface_id);
@@ -181,8 +182,8 @@
 bool mtc::SessionManagementContext::open_window_with_size(std::string const& window_name,
                                                           geom::Size const& size)
 {
-    auto const params = msh::a_surface().of_name(window_name).of_size(size);
-    auto session = session_store->open_session(window_name);
+    auto const params = mf::a_surface().of_name(window_name).of_size(size);
+    auto session = shell->open_session(window_name);
     auto const surface_id = session->create_surface(params);
 
     open_windows[window_name] = std::make_tuple(session, surface_id);

=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
--- tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-13 07:41:46 +0000
+++ tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-15 13:09:22 +0000
@@ -18,14 +18,14 @@
 
 #include "mir_test_cucumber/session_management_context.h"
 #include "mir/server_configuration.h"
-#include "mir/shell/session_store.h"
-#include "mir/shell/session.h"
-#include "mir/shell/surface.h"
+#include "mir/frontend/shell.h"
+#include "mir/frontend/session.h"
+#include "mir/frontend/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/graphics/viewable_area.h"
 
 #include "mir_test_doubles/mock_session.h"
-#include "mir_test_doubles/mock_session_store.h"
+#include "mir_test_doubles/mock_shell.h"
 #include "mir_test/fake_shared.h"
 
 #include <gtest/gtest.h>
@@ -35,7 +35,6 @@
 namespace mc = mir::compositor;
 namespace mf = mir::frontend;
 namespace mi = mir::input;
-namespace msh = mir::shell;
 namespace geom = mir::geometry;
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
@@ -47,13 +46,13 @@
 struct MockServerConfiguration : public mir::ServerConfiguration
 {
     MOCK_METHOD0(the_communicator, std::shared_ptr<mf::Communicator>());
-    MOCK_METHOD0(the_session_store, std::shared_ptr<msh::SessionStore>());
+    MOCK_METHOD0(the_frontend_shell, std::shared_ptr<mf::Shell>());
     MOCK_METHOD0(the_input_manager, std::shared_ptr<mi::InputManager>());
     MOCK_METHOD0(the_display, std::shared_ptr<mg::Display>());
     MOCK_METHOD0(the_drawer, std::shared_ptr<mc::Drawer>());
 };
 
-struct MockSurface : public msh::Surface
+struct MockSurface : public mf::Surface
 {
     MOCK_METHOD0(hide, void());
     MOCK_METHOD0(show, void());
@@ -94,15 +93,15 @@
     {
         using namespace ::testing;
 
-        EXPECT_CALL(server_configuration, the_session_store()).Times(1)
-            .WillOnce(Return(mt::fake_shared<msh::SessionStore>(session_store)));
+        EXPECT_CALL(server_configuration, the_frontend_shell()).Times(1)
+            .WillOnce(Return(mt::fake_shared<mf::Shell>(shell)));
         ctx = std::make_shared<mtc::SessionManagementContext>(server_configuration);
     }
     MockServerConfiguration server_configuration;
-    mtd::MockSessionStore session_store;
+    mtd::MockShell shell;
     std::shared_ptr<mtc::SessionManagementContext> ctx;
 
-    static msh::SurfaceId const test_surface_id;
+    static mf::SurfaceId const test_surface_id;
     static std::string const test_window_name;
     static geom::Size const test_window_size;
 };
@@ -113,8 +112,8 @@
     {
         using namespace ::testing;
 
-        EXPECT_CALL(server_configuration, the_session_store()).Times(1)
-            .WillOnce(Return(mt::fake_shared<msh::SessionStore>(session_store)));
+        EXPECT_CALL(server_configuration, the_frontend_shell()).Times(1)
+            .WillOnce(Return(mt::fake_shared<mf::Shell>(shell)));
         ctx = std::make_shared<mtc::SessionManagementContext>(server_configuration);
         viewable_area = ctx->get_view_area();
     }
@@ -122,21 +121,21 @@
     std::shared_ptr<mg::ViewableArea> viewable_area;
 };
 
-msh::SurfaceId const SessionManagementContextSetup::test_surface_id{1};
+mf::SurfaceId const SessionManagementContextSetup::test_surface_id{1};
 std::string const SessionManagementContextSetup::test_window_name{"John"};
 geom::Size const SessionManagementContextSetup::test_window_size{geom::Width{100},
                                                                  geom::Height{100}};
 } // namespace
 
-TEST(SessionManagementContext, constructs_session_store_from_server_configuration)
+TEST(SessionManagementContext, constructs_shell_from_server_configuration)
 {
     using namespace ::testing;
 
     MockServerConfiguration server_configuration;
-    mtd::MockSessionStore session_store;
+    mtd::MockShell shell;
     
-    EXPECT_CALL(server_configuration, the_session_store()).Times(1)
-        .WillOnce(Return(mt::fake_shared<msh::SessionStore>(session_store)));
+    EXPECT_CALL(server_configuration, the_frontend_shell()).Times(1)
+        .WillOnce(Return(mt::fake_shared<mf::Shell>(shell)));
 
     mtc::SessionManagementContext ctx(server_configuration);
 }
@@ -147,8 +146,8 @@
 
     mtd::MockSession session;
 
-    EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)
-        .WillOnce(Return(mt::fake_shared<msh::Session>(session)));
+    EXPECT_CALL(shell, open_session(test_window_name)).Times(1)
+        .WillOnce(Return(mt::fake_shared<mf::Session>(session)));
 
     // As consuming mode is the default, omiting geometry is sufficient to request it.
     EXPECT_CALL(session, create_surface(NamedWindowWithNoGeometry(test_window_name))).Times(1)
@@ -163,8 +162,8 @@
     
     mtd::MockSession session;
 
-    EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)
-        .WillOnce(Return(mt::fake_shared<msh::Session>(session)));
+    EXPECT_CALL(shell, open_session(test_window_name)).Times(1)
+        .WillOnce(Return(mt::fake_shared<mf::Session>(session)));
 
     EXPECT_CALL(session, create_surface(NamedWindowWithGeometry(test_window_name, test_window_size))).Times(1)
         .WillOnce(Return(test_surface_id));
@@ -179,8 +178,8 @@
     mtd::MockSession session;
     MockSurface surface;
 
-    EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)
-        .WillOnce(Return(mt::fake_shared<msh::Session>(session)));
+    EXPECT_CALL(shell, open_session(test_window_name)).Times(1)
+        .WillOnce(Return(mt::fake_shared<mf::Session>(session)));
 
     EXPECT_CALL(session, create_surface(NamedWindowWithGeometry(test_window_name, test_window_size))).Times(1)
         .WillOnce(Return(test_surface_id));
@@ -188,7 +187,7 @@
     EXPECT_TRUE(ctx->open_window_with_size(test_window_name, test_window_size));
     
     EXPECT_CALL(session, get_surface(test_surface_id)).Times(1)
-        .WillOnce(Return(mt::fake_shared<msh::Surface>(surface)));
+        .WillOnce(Return(mt::fake_shared<mf::Surface>(surface)));
     EXPECT_CALL(surface, size()).Times(1).WillOnce(Return(test_window_size));
     
     EXPECT_EQ(test_window_size, ctx->get_window_size(test_window_name));

=== modified file 'tests/integration-tests/frontend/test_application_mediator_report.cpp'
--- tests/integration-tests/frontend/test_application_mediator_report.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/frontend/test_application_mediator_report.cpp	2013-03-15 13:09:22 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/frontend/application_mediator_report.h"
+#include "mir/frontend/session_mediator_report.h"
 
 #include "mir_test_framework/display_server_test_fixture.h"
 #include "mir_test/test_protobuf_client.h"
@@ -31,31 +31,31 @@
 
 namespace
 {
-struct MockApplicationMediatorReport : mf::NullApplicationMediatorReport
+struct MockApplicationMediatorReport : mf::NullSessionMediatorReport
 {
     MockApplicationMediatorReport()
     {
-        EXPECT_CALL(*this, application_connect_called(testing::_)).
-            Times(testing::AtLeast(0));
-
-        EXPECT_CALL(*this, application_create_surface_called(testing::_)).
-            Times(testing::AtLeast(0));
-
-        EXPECT_CALL(*this, application_next_buffer_called(testing::_)).
-            Times(testing::AtLeast(0));
-
-        EXPECT_CALL(*this, application_release_surface_called(testing::_)).
-            Times(testing::AtLeast(0));
-
-        EXPECT_CALL(*this, application_disconnect_called(testing::_)).
+        EXPECT_CALL(*this, session_connect_called(testing::_)).
+            Times(testing::AtLeast(0));
+
+        EXPECT_CALL(*this, session_create_surface_called(testing::_)).
+            Times(testing::AtLeast(0));
+
+        EXPECT_CALL(*this, session_next_buffer_called(testing::_)).
+            Times(testing::AtLeast(0));
+
+        EXPECT_CALL(*this, session_release_surface_called(testing::_)).
+            Times(testing::AtLeast(0));
+
+        EXPECT_CALL(*this, session_disconnect_called(testing::_)).
             Times(testing::AtLeast(0));
     }
 
-    MOCK_METHOD1(application_connect_called, void (std::string const&));
-    MOCK_METHOD1(application_create_surface_called, void (std::string const&));
-    MOCK_METHOD1(application_next_buffer_called, void (std::string const&));
-    MOCK_METHOD1(application_release_surface_called, void (std::string const&));
-    MOCK_METHOD1(application_disconnect_called, void (std::string const&));
+    MOCK_METHOD1(session_connect_called, void (std::string const&));
+    MOCK_METHOD1(session_create_surface_called, void (std::string const&));
+    MOCK_METHOD1(session_next_buffer_called, void (std::string const&));
+    MOCK_METHOD1(session_release_surface_called, void (std::string const&));
+    MOCK_METHOD1(session_disconnect_called, void (std::string const&));
 };
 
 const int rpc_timeout_ms{100000};
@@ -63,16 +63,16 @@
 typedef BespokeDisplayServerTestFixture ApplicationMediatorReport;
 }
 
-TEST_F(ApplicationMediatorReport, application_connect_called)
+TEST_F(ApplicationMediatorReport, session_connect_called)
 {
     struct Server : TestingServerConfiguration
     {
-        std::shared_ptr<mf::ApplicationMediatorReport>
+        std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
             auto result = std::make_shared<MockApplicationMediatorReport>();
 
-            EXPECT_CALL(*result, application_connect_called(testing::_)).
+            EXPECT_CALL(*result, session_connect_called(testing::_)).
                 Times(1);
 
             return result;
@@ -104,16 +104,16 @@
     launch_client_process(client_process);
 }
 
-TEST_F(ApplicationMediatorReport, application_create_surface_called)
+TEST_F(ApplicationMediatorReport, session_create_surface_called)
 {
     struct Server : TestingServerConfiguration
     {
-        std::shared_ptr<mf::ApplicationMediatorReport>
+        std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
             auto result = std::make_shared<MockApplicationMediatorReport>();
 
-            EXPECT_CALL(*result, application_create_surface_called(testing::_)).
+            EXPECT_CALL(*result, session_create_surface_called(testing::_)).
                 Times(1);
 
             return result;
@@ -155,16 +155,16 @@
     launch_client_process(client_process);
 }
 
-TEST_F(ApplicationMediatorReport, application_next_buffer_called)
+TEST_F(ApplicationMediatorReport, session_next_buffer_called)
 {
     struct Server : TestingServerConfiguration
     {
-        std::shared_ptr<mf::ApplicationMediatorReport>
+        std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
             auto result = std::make_shared<MockApplicationMediatorReport>();
 
-            EXPECT_CALL(*result, application_next_buffer_called(testing::_)).
+            EXPECT_CALL(*result, session_next_buffer_called(testing::_)).
                 Times(1);
 
             return result;
@@ -212,16 +212,16 @@
     launch_client_process(client_process);
 }
 
-TEST_F(ApplicationMediatorReport, application_release_surface_called)
+TEST_F(ApplicationMediatorReport, session_release_surface_called)
 {
     struct Server : TestingServerConfiguration
     {
-        std::shared_ptr<mf::ApplicationMediatorReport>
+        std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
             auto result = std::make_shared<MockApplicationMediatorReport>();
 
-            EXPECT_CALL(*result, application_release_surface_called(testing::_)).
+            EXPECT_CALL(*result, session_release_surface_called(testing::_)).
                 Times(1);
 
             return result;
@@ -278,16 +278,16 @@
     launch_client_process(client_process);
 }
 
-TEST_F(ApplicationMediatorReport, application_disconnect_called)
+TEST_F(ApplicationMediatorReport, session_disconnect_called)
 {
     struct Server : TestingServerConfiguration
     {
-        std::shared_ptr<mf::ApplicationMediatorReport>
+        std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
             auto result = std::make_shared<MockApplicationMediatorReport>();
 
-            EXPECT_CALL(*result, application_disconnect_called(testing::_)).
+            EXPECT_CALL(*result, session_disconnect_called(testing::_)).
                 Times(1);
 
             return result;

=== modified file 'tests/integration-tests/frontend/test_session_manager.cpp'
--- tests/integration-tests/frontend/test_session_manager.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/frontend/test_session_manager.cpp	2013-03-15 13:09:22 +0000
@@ -25,7 +25,7 @@
 #include "mir/shell/focus_sequence.h"
 #include "mir/shell/focus_setter.h"
 #include "mir/shell/registration_order_focus_sequence.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/surface_creation_parameters.h"
 
 #include <gmock/gmock.h>
@@ -35,6 +35,7 @@
 #include "mir_test_doubles/mock_surface_factory.h"
 
 namespace mc = mir::compositor;
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 namespace mt = mir::test;
@@ -45,7 +46,7 @@
 
 struct MockFocusSetter: public msh::FocusSetter
 {
-  MOCK_METHOD1(set_focus_to, void(std::shared_ptr<msh::Session> const&));
+  MOCK_METHOD1(set_focus_to, void(std::shared_ptr<mf::Session> const&));
 };
 
 }
@@ -57,7 +58,7 @@
     std::shared_ptr<msh::SessionContainer> container(new msh::SessionContainer());
     msh::RegistrationOrderFocusSequence sequence(container);
     MockFocusSetter focus_changer;
-    std::shared_ptr<msh::Session> new_session;
+    std::shared_ptr<mf::Session> new_session;
 
     msh::SessionManager session_manager(
             mt::fake_shared(surface_factory),
@@ -90,7 +91,7 @@
     std::shared_ptr<msh::SessionContainer> model(new msh::SessionContainer());
     msh::RegistrationOrderFocusSequence sequence(model);
     MockFocusSetter focus_changer;
-    std::shared_ptr<msh::Session> new_session;
+    std::shared_ptr<mf::Session> new_session;
 
     msh::SessionManager session_manager(
         mt::fake_shared(surface_factory),

=== modified file 'tests/integration-tests/test_error_reporting.cpp'
--- tests/integration-tests/test_error_reporting.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/test_error_reporting.cpp	2013-03-15 13:09:22 +0000
@@ -240,7 +240,7 @@
     struct ServerConfig : TestingServerConfiguration
     {
         std::shared_ptr<mf::ProtobufIpcFactory> the_ipc_factory(
-            std::shared_ptr<mir::shell::SessionStore> const&,
+            std::shared_ptr<mir::frontend::Shell> const&,
             std::shared_ptr<mg::ViewableArea> const&,
             std::shared_ptr<mc::GraphicBufferAllocator> const&)
 

=== modified file 'tests/unit-tests/frontend/CMakeLists.txt'
--- tests/unit-tests/frontend/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/frontend/CMakeLists.txt	2013-03-15 13:09:22 +0000
@@ -3,7 +3,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_surface_apis.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_reports_errors.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_resource_cache.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_application_mediator.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator.cpp
 )
 
 # TODO this test is a mess - something better is needed.
@@ -22,11 +22,11 @@
 
 if (MIR_PLATFORM STREQUAL "android")
   list(APPEND UNIT_TEST_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_application_mediator_android.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator_android.cpp
   )
 elseif (MIR_PLATFORM STREQUAL "gbm")
   list(APPEND UNIT_TEST_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_application_mediator_gbm.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator_gbm.cpp
   )
 endif()
 

=== renamed file 'tests/unit-tests/frontend/test_application_mediator.cpp' => 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_application_mediator.cpp	2013-03-13 07:41:46 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-03-15 13:09:22 +0000
@@ -19,8 +19,8 @@
 #include "mir/surfaces/buffer_bundle.h"
 #include "mir/compositor/buffer_ipc_package.h"
 #include "mir/compositor/graphic_buffer_allocator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/frontend/application_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session_mediator.h"
 #include "mir/frontend/resource_cache.h"
 #include "mir/shell/application_session.h"
 #include "mir/graphics/display.h"
@@ -28,7 +28,7 @@
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/surfaces/surface.h"
 #include "mir_test_doubles/null_display.h"
-#include "mir_test_doubles/mock_session_store.h"
+#include "mir_test_doubles/mock_shell.h"
 #include "mir_test_doubles/mock_surface.h"
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/stub_session.h"
@@ -69,7 +69,7 @@
         EXPECT_CALL(*mock_surface, advance_client_buffer()).Times(AnyNumber());
     }
 
-    std::shared_ptr<msh::Surface> get_surface(msh::SurfaceId /* surface */) const
+    std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId /* surface */) const
     {
         return mock_surface;
     }
@@ -117,50 +117,50 @@
 
 }
 
-struct ApplicationMediatorTest : public ::testing::Test
+struct SessionMediatorTest : public ::testing::Test
 {
-    ApplicationMediatorTest()
-        : session_store{std::make_shared<testing::NiceMock<mtd::MockSessionStore>>()},
+    SessionMediatorTest()
+        : shell{std::make_shared<testing::NiceMock<mtd::MockShell>>()},
           graphics_platform{std::make_shared<StubPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
           buffer_allocator{std::make_shared<testing::NiceMock<MockGraphicBufferAllocator>>()},
-          report{std::make_shared<mf::NullApplicationMediatorReport>()},
+          report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{session_store, graphics_platform, graphics_display,
+          mediator{shell, graphics_platform, graphics_display,
                    buffer_allocator, report, resource_cache},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
     {
         using namespace ::testing;
 
-        ON_CALL(*session_store, open_session(_)).WillByDefault(Return(std::make_shared<StubbedSession>()));
+        ON_CALL(*shell, open_session(_)).WillByDefault(Return(std::make_shared<StubbedSession>()));
     }
 
-    std::shared_ptr<testing::NiceMock<mtd::MockSessionStore>> const session_store;
+    std::shared_ptr<testing::NiceMock<mtd::MockShell>> const shell;
     std::shared_ptr<mg::Platform> const graphics_platform;
     std::shared_ptr<mg::Display> const graphics_display;
     std::shared_ptr<testing::NiceMock<MockGraphicBufferAllocator>> const buffer_allocator;
-    std::shared_ptr<mf::ApplicationMediatorReport> const report;
+    std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
-    mf::ApplicationMediator mediator;
+    mf::SessionMediator mediator;
 
     std::unique_ptr<google::protobuf::Closure> null_callback;
 };
 
 
-TEST_F(ApplicationMediatorTest, disconnect_releases_session)
+TEST_F(SessionMediatorTest, disconnect_releases_session)
 {
     using namespace ::testing;
 
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;
     
-    EXPECT_CALL(*session_store, close_session(_)).Times(1);
+    EXPECT_CALL(*shell, close_session(_)).Times(1);
 
     mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
     mediator.disconnect(nullptr, nullptr, nullptr, null_callback.get());
 }
 
-TEST_F(ApplicationMediatorTest, calling_methods_before_connect_throws)
+TEST_F(SessionMediatorTest, calling_methods_before_connect_throws)
 {
     EXPECT_THROW({
         mp::SurfaceParameters request;
@@ -194,7 +194,7 @@
     }, std::logic_error);
 }
 
-TEST_F(ApplicationMediatorTest, calling_methods_after_connect_works)
+TEST_F(SessionMediatorTest, calling_methods_after_connect_works)
 {
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;
@@ -222,7 +222,7 @@
     mediator.disconnect(nullptr, nullptr, nullptr, null_callback.get());
 }
 
-TEST_F(ApplicationMediatorTest, calling_methods_after_disconnect_throws)
+TEST_F(SessionMediatorTest, calling_methods_after_disconnect_throws)
 {
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;
@@ -263,7 +263,7 @@
     }, std::logic_error);
 }
 
-TEST_F(ApplicationMediatorTest, can_reconnect_after_disconnect)
+TEST_F(SessionMediatorTest, can_reconnect_after_disconnect)
 {
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;
@@ -275,7 +275,7 @@
     mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());
 }
 
-TEST_F(ApplicationMediatorTest, connect_queries_supported_pixel_formats)
+TEST_F(SessionMediatorTest, connect_queries_supported_pixel_formats)
 {
     using namespace testing;
 

=== renamed file 'tests/unit-tests/frontend/test_application_mediator_android.cpp' => 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_application_mediator_android.cpp	2013-03-12 16:44:21 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-03-15 13:09:22 +0000
@@ -17,11 +17,11 @@
  */
 
 #include "mir/compositor/graphic_buffer_allocator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/frontend/application_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session_mediator.h"
 #include "mir/frontend/resource_cache.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/platform.h"
@@ -29,7 +29,7 @@
 
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/mock_session.h"
-#include "mir_test_doubles/stub_session_store.h"
+#include "mir_test_doubles/stub_shell.h"
 
 #include <gtest/gtest.h>
 
@@ -82,33 +82,33 @@
 
 }
 
-struct ApplicationMediatorAndroidTest : public ::testing::Test
+struct SessionMediatorAndroidTest : public ::testing::Test
 {
-    ApplicationMediatorAndroidTest()
-        : session_store{std::make_shared<mtd::StubSessionStore>()},
+    SessionMediatorAndroidTest()
+        : shell{std::make_shared<mtd::StubShell>()},
           graphics_platform{std::make_shared<StubPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
           buffer_allocator{std::make_shared<StubGraphicBufferAllocator>()},
-          report{std::make_shared<mf::NullApplicationMediatorReport>()},
+          report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{session_store, graphics_platform, graphics_display,
+          mediator{shell, graphics_platform, graphics_display,
                    buffer_allocator, report, resource_cache},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
     {
     }
 
-    std::shared_ptr<mtd::StubSessionStore> const session_store;
+    std::shared_ptr<mtd::StubShell> const shell;
     std::shared_ptr<StubPlatform> const graphics_platform;
     std::shared_ptr<mg::Display> const graphics_display;
     std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
-    std::shared_ptr<mf::ApplicationMediatorReport> const report;
+    std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
-    mf::ApplicationMediator mediator;
+    mf::SessionMediator mediator;
 
     std::unique_ptr<google::protobuf::Closure> null_callback;
 };
 
-TEST_F(ApplicationMediatorAndroidTest, drm_auth_magic_throws)
+TEST_F(SessionMediatorAndroidTest, drm_auth_magic_throws)
 {
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;

=== renamed file 'tests/unit-tests/frontend/test_application_mediator_gbm.cpp' => 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
--- tests/unit-tests/frontend/test_application_mediator_gbm.cpp	2013-03-12 12:48:39 +0000
+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-03-15 13:09:22 +0000
@@ -17,11 +17,11 @@
  */
 
 #include "mir/compositor/graphic_buffer_allocator.h"
-#include "mir/frontend/application_mediator_report.h"
-#include "mir/frontend/application_mediator.h"
+#include "mir/frontend/session_mediator_report.h"
+#include "mir/frontend/session_mediator.h"
 #include "mir/frontend/resource_cache.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_store.h"
+#include "mir/frontend/shell.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/drm_authenticator.h"
@@ -33,7 +33,7 @@
 
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/mock_session.h"
-#include "mir_test_doubles/stub_session_store.h"
+#include "mir_test_doubles/stub_shell.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -87,33 +87,33 @@
 
 }
 
-struct ApplicationMediatorGBMTest : public ::testing::Test
+struct SessionMediatorGBMTest : public ::testing::Test
 {
-    ApplicationMediatorGBMTest()
-        : session_store{std::make_shared<mtd::StubSessionStore>()},
+    SessionMediatorGBMTest()
+        : shell{std::make_shared<mtd::StubShell>()},
           mock_platform{std::make_shared<MockAuthenticatingPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
           buffer_allocator{std::make_shared<StubGraphicBufferAllocator>()},
-          report{std::make_shared<mf::NullApplicationMediatorReport>()},
+          report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{session_store, mock_platform, graphics_display,
+          mediator{shell, mock_platform, graphics_display,
                    buffer_allocator, report, resource_cache},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
     {
     }
 
-    std::shared_ptr<mtd::StubSessionStore> const session_store;
+    std::shared_ptr<mtd::StubShell> const shell;
     std::shared_ptr<MockAuthenticatingPlatform> const mock_platform;
     std::shared_ptr<mg::Display> const graphics_display;
     std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
-    std::shared_ptr<mf::ApplicationMediatorReport> const report;
+    std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
-    mf::ApplicationMediator mediator;
+    mf::SessionMediator mediator;
 
     std::unique_ptr<google::protobuf::Closure> null_callback;
 };
 
-TEST_F(ApplicationMediatorGBMTest, drm_auth_magic_uses_drm_authenticator)
+TEST_F(SessionMediatorGBMTest, drm_auth_magic_uses_drm_authenticator)
 {
     mp::ConnectParameters connect_parameters;
     mp::Connection connection;
@@ -135,7 +135,7 @@
     EXPECT_EQ(no_error, status.status_code());
 }
 
-TEST_F(ApplicationMediatorGBMTest, drm_auth_magic_sets_status_code_on_error)
+TEST_F(SessionMediatorGBMTest, drm_auth_magic_sets_status_code_on_error)
 {
     using namespace testing;
 

=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
--- tests/unit-tests/shell/test_application_session.cpp	2013-03-13 07:41:46 +0000
+++ tests/unit-tests/shell/test_application_session.cpp	2013-03-15 13:09:22 +0000
@@ -29,6 +29,7 @@
 #include <gtest/gtest.h>
 
 namespace mc = mir::compositor;
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 namespace mt = mir::test;
@@ -47,7 +48,7 @@
 
     msh::ApplicationSession session(mt::fake_shared(surface_factory), "Foo");
 
-    msh::SurfaceCreationParameters params;
+    mf::SurfaceCreationParameters params;
     auto surf = session.create_surface(params);
 
     session.destroy_surface(surf);
@@ -73,7 +74,7 @@
         EXPECT_CALL(*mock_surface, destroy()).Times(1);
     }
 
-    msh::SurfaceCreationParameters params;
+    mf::SurfaceCreationParameters params;
     auto surf = app_session.create_surface(params);
 
     app_session.hide();
@@ -88,7 +89,7 @@
 
     mtd::MockSurfaceFactory surface_factory;
     msh::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo");
-    msh::SurfaceId invalid_surface_id = msh::SurfaceId{1};
+    mf::SurfaceId invalid_surface_id(1);
 
     EXPECT_THROW({
             app_session.get_surface(invalid_surface_id);
@@ -101,7 +102,7 @@
 
     mtd::MockSurfaceFactory surface_factory;
     msh::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo");
-    msh::SurfaceId invalid_surface_id = msh::SurfaceId{1};
+    mf::SurfaceId invalid_surface_id(1);
 
     EXPECT_THROW({
             app_session.destroy_surface(invalid_surface_id);

=== modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp'
--- tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-03-15 13:09:22 +0000
@@ -24,6 +24,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -55,7 +56,7 @@
     EXPECT_CALL(*viewable_area, view_area()).Times(1);
 
     msh::ConsumingPlacementStrategy placement_strategy(viewable_area);
-    msh::SurfaceCreationParameters input_params;
+    mf::SurfaceCreationParameters input_params;
     
     auto placed_params = placement_strategy.place(input_params);
     EXPECT_EQ(default_view_area.size.width.as_uint32_t(), placed_params.size.width.as_uint32_t());
@@ -71,7 +72,7 @@
     EXPECT_CALL(*viewable_area, view_area()).Times(1);
 
     msh::ConsumingPlacementStrategy placement_strategy(viewable_area);
-    msh::SurfaceCreationParameters input_params;
+    mf::SurfaceCreationParameters input_params;
     
     input_params.size = requested_size;
     
@@ -89,7 +90,7 @@
 
     EXPECT_CALL(*viewable_area, view_area()).Times(1);
     msh::ConsumingPlacementStrategy placement_strategy(viewable_area);
-    msh::SurfaceCreationParameters input_params;
+    mf::SurfaceCreationParameters input_params;
     
     input_params.size = unreasonable_size;
 

=== modified file 'tests/unit-tests/shell/test_organising_surface_factory.cpp'
--- tests/unit-tests/shell/test_organising_surface_factory.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/shell/test_organising_surface_factory.cpp	2013-03-15 13:09:22 +0000
@@ -25,6 +25,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -34,7 +35,7 @@
 
 struct MockPlacementStrategy : public msh::PlacementStrategy
 {
-    MOCK_METHOD1(place, msh::SurfaceCreationParameters(msh::SurfaceCreationParameters const&));
+    MOCK_METHOD1(place, mf::SurfaceCreationParameters(mf::SurfaceCreationParameters const&));
 };
 
 struct OrganisingSurfaceFactorySetup : public testing::Test
@@ -48,7 +49,7 @@
 
         placement_strategy = std::make_shared<MockPlacementStrategy>();
     }
-    std::shared_ptr<msh::Surface> null_surface;
+    std::shared_ptr<mf::Surface> null_surface;
     std::shared_ptr<mtd::MockSurfaceFactory> underlying_surface_factory;
     std::shared_ptr<MockPlacementStrategy> placement_strategy;
 };
@@ -63,9 +64,9 @@
     
     EXPECT_CALL(*underlying_surface_factory, create_surface(_)).Times(1);
     
-    auto params = msh::a_surface();
+    auto params = mf::a_surface();
     EXPECT_CALL(*placement_strategy, place(Ref(params))).Times(1)
-        .WillOnce(Return(msh::a_surface()));
+        .WillOnce(Return(mf::a_surface()));
 
     factory.create_surface(params);
 }
@@ -76,7 +77,7 @@
 
     msh::OrganisingSurfaceFactory factory(underlying_surface_factory, placement_strategy);
     
-    auto params = msh::a_surface();
+    auto params = mf::a_surface();
     auto placed_params = params;
     placed_params.size.width = geom::Width{100};
     

=== modified file 'tests/unit-tests/shell/test_registration_order_focus_sequence.cpp'
--- tests/unit-tests/shell/test_registration_order_focus_sequence.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/shell/test_registration_order_focus_sequence.cpp	2013-03-15 13:09:22 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/surfaces/buffer_bundle.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/registration_order_focus_sequence.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface.h"

=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
--- tests/unit-tests/shell/test_session_manager.cpp	2013-03-13 07:41:46 +0000
+++ tests/unit-tests/shell/test_session_manager.cpp	2013-03-15 13:09:22 +0000
@@ -18,8 +18,8 @@
 
 #include "mir/surfaces/buffer_bundle.h"
 #include "mir/shell/session_manager.h"
-#include "mir/shell/session_container.h"
-#include "mir/shell/session.h"
+#include "mir/frontend/session_container.h"
+#include "mir/frontend/session.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/shell/focus_sequence.h"
 #include "mir/shell/focus_setter.h"
@@ -35,6 +35,7 @@
 #include <gtest/gtest.h>
 
 namespace mc = mir::compositor;
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 namespace geom = mir::geometry;
@@ -46,22 +47,22 @@
 
 struct MockSessionContainer : public msh::SessionContainer
 {
-    MOCK_METHOD1(insert_session, void(std::shared_ptr<msh::Session> const&));
-    MOCK_METHOD1(remove_session, void(std::shared_ptr<msh::Session> const&));
+    MOCK_METHOD1(insert_session, void(std::shared_ptr<mf::Session> const&));
+    MOCK_METHOD1(remove_session, void(std::shared_ptr<mf::Session> const&));
     MOCK_METHOD0(lock, void());
     MOCK_METHOD0(unlock, void());
 };
 
 struct MockFocusSequence: public msh::FocusSequence
 {
-    MOCK_CONST_METHOD1(successor_of, std::shared_ptr<msh::Session>(std::shared_ptr<msh::Session> const&));
-    MOCK_CONST_METHOD1(predecessor_of, std::shared_ptr<msh::Session>(std::shared_ptr<msh::Session> const&));
-    MOCK_CONST_METHOD0(default_focus, std::shared_ptr<msh::Session>());
+    MOCK_CONST_METHOD1(successor_of, std::shared_ptr<mf::Session>(std::shared_ptr<mf::Session> const&));
+    MOCK_CONST_METHOD1(predecessor_of, std::shared_ptr<mf::Session>(std::shared_ptr<mf::Session> const&));
+    MOCK_CONST_METHOD0(default_focus, std::shared_ptr<mf::Session>());
 };
 
 struct MockFocusSetter: public msh::FocusSetter
 {
-    MOCK_METHOD1(set_focus_to, void(std::shared_ptr<msh::Session> const&));
+    MOCK_METHOD1(set_focus_to, void(std::shared_ptr<mf::Session> const&));
 };
 
 struct SessionManagerSetup : public testing::Test
@@ -91,9 +92,9 @@
     EXPECT_CALL(container, insert_session(_)).Times(1);
     EXPECT_CALL(container, remove_session(_)).Times(1);
     EXPECT_CALL(focus_setter, set_focus_to(_));
-    EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<msh::Session>())).Times(1);
+    EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<mf::Session>())).Times(1);
 
-    EXPECT_CALL(sequence, default_focus()).WillOnce(Return((std::shared_ptr<msh::Session>())));
+    EXPECT_CALL(sequence, default_focus()).WillOnce(Return((std::shared_ptr<mf::Session>())));
 
     auto session = session_manager.open_session("Visual Basic Studio");
     session_manager.close_session(session);
@@ -107,7 +108,7 @@
     std::shared_ptr<ms::BufferBundle> buffer_bundle(new mtd::NullBufferBundle());
     std::shared_ptr<ms::Surface> dummy_surface(
         std::make_shared<ms::Surface>(
-            msh::a_surface().name,
+            mf::a_surface().name,
             buffer_bundle));
     ON_CALL(surface_factory, create_surface(_)).WillByDefault(
         Return(std::make_shared<ms::BasicProxySurface>(dummy_surface)));
@@ -116,12 +117,12 @@
     EXPECT_CALL(container, remove_session(_)).Times(1);
 
     EXPECT_CALL(focus_setter, set_focus_to(_)).Times(1);
-    EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<msh::Session>())).Times(1);
+    EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<mf::Session>())).Times(1);
 
-    EXPECT_CALL(sequence, default_focus()).WillOnce(Return((std::shared_ptr<msh::Session>())));
+    EXPECT_CALL(sequence, default_focus()).WillOnce(Return((std::shared_ptr<mf::Session>())));
 
     auto session = session_manager.open_session("Visual Basic Studio");
-    session->create_surface(msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+    session->create_surface(mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     session_manager.close_session(session);
 }
@@ -129,7 +130,7 @@
 TEST_F(SessionManagerSetup, new_applications_receive_focus)
 {
     using namespace ::testing;
-    std::shared_ptr<msh::Session> new_session;
+    std::shared_ptr<mf::Session> new_session;
 
     EXPECT_CALL(container, insert_session(_)).Times(1);
     EXPECT_CALL(focus_setter, set_focus_to(_)).WillOnce(SaveArg<0>(&new_session));

=== modified file 'tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp'
--- tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp	2013-03-12 03:50:42 +0000
+++ tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp	2013-03-15 13:09:22 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/surfaces/buffer_bundle.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/registration_order_focus_sequence.h"
 #include "mir/shell/single_visibility_focus_mechanism.h"
 #include "mir/shell/surface_creation_parameters.h"

=== modified file 'tests/unit-tests/shell/test_the_session_container_implementation.cpp'
--- tests/unit-tests/shell/test_the_session_container_implementation.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/shell/test_the_session_container_implementation.cpp	2013-03-15 13:09:22 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/surfaces/buffer_bundle.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_container.h"
+#include "mir/frontend/session_container.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface.h"
 #include "mir_test_doubles/mock_buffer_bundle.h"
@@ -28,6 +28,7 @@
 #include <gtest/gtest.h>
 #include <string>
 
+namespace mf = mir::frontend;
 namespace msh = mir::shell;
 namespace mtd = mir::test::doubles;
 
@@ -44,7 +45,7 @@
     {
         MOCK_METHOD1(check_name, void (std::string const&));
 
-        void operator()(std::shared_ptr<msh::Session> const& session)
+        void operator()(std::shared_ptr<mf::Session> const& session)
         {
             check_name(session->name());
         }

=== modified file 'tests/unit-tests/surfaces/test_proxy_surface.cpp'
--- tests/unit-tests/surfaces/test_proxy_surface.cpp	2013-03-13 07:41:46 +0000
+++ tests/unit-tests/surfaces/test_proxy_surface.cpp	2013-03-15 13:09:22 +0000
@@ -30,7 +30,7 @@
 #include <gtest/gtest.h>
 
 namespace ms = mir::surfaces;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 namespace mc = mir::compositor;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -53,12 +53,12 @@
             WillByDefault(Invoke(this, &MockSurfaceStackModel::do_destroy_surface));
     }
 
-    MOCK_METHOD1(create_surface, std::weak_ptr<ms::Surface> (const msh::SurfaceCreationParameters&));
+    MOCK_METHOD1(create_surface, std::weak_ptr<ms::Surface> (const mf::SurfaceCreationParameters&));
 
     MOCK_METHOD1(destroy_surface, void (std::weak_ptr<ms::Surface> const&));
 
 private:
-    std::weak_ptr<ms::Surface> do_create_surface(const msh::SurfaceCreationParameters& params)
+    std::weak_ptr<ms::Surface> do_create_surface(const mf::SurfaceCreationParameters& params)
     {
         surface = std::make_shared<ms::Surface>(
             params.name,
@@ -78,7 +78,7 @@
 TEST(SurfaceProxy, creation_and_destruction)
 {
     MockSurfaceStackModel surface_stack;
-    msh::SurfaceCreationParameters params;
+    mf::SurfaceCreationParameters params;
 
     using namespace testing;
     InSequence sequence;
@@ -93,7 +93,7 @@
     using namespace testing;
 
     NiceMock<MockSurfaceStackModel> surface_stack;
-    msh::SurfaceCreationParameters params;
+    mf::SurfaceCreationParameters params;
 
     ms::ProxySurface test(&surface_stack, params);
 

=== modified file 'tests/unit-tests/surfaces/test_surface.cpp'
--- tests/unit-tests/surfaces/test_surface.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/surfaces/test_surface.cpp	2013-03-15 13:09:22 +0000
@@ -25,7 +25,7 @@
 #include <gtest/gtest.h>
 
 namespace ms = mir::surfaces;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 namespace mc = mir::compositor;
 namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
@@ -33,7 +33,7 @@
 TEST(SurfaceCreationParametersTest, default_creation_parameters)
 {
     using namespace geom;
-    msh::SurfaceCreationParameters params;
+    mf::SurfaceCreationParameters params;
 
     EXPECT_EQ(std::string(), params.name);
     EXPECT_EQ(Width(0), params.size.width);
@@ -41,7 +41,7 @@
     EXPECT_EQ(mc::BufferUsage::undefined, params.buffer_usage);
     EXPECT_EQ(geom::PixelFormat::invalid, params.pixel_format);
 
-    EXPECT_EQ(msh::a_surface(), params);
+    EXPECT_EQ(mf::a_surface(), params);
 }
 
 TEST(SurfaceCreationParametersTest, builder_mutators)
@@ -52,7 +52,7 @@
     geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
     std::string name{"surface"};
 
-    auto params = msh::a_surface().of_name(name)
+    auto params = mf::a_surface().of_name(name)
                                  .of_size(size)
                                  .of_buffer_usage(usage)
                                  .of_pixel_format(format);
@@ -70,12 +70,12 @@
     mc::BufferUsage const usage{mc::BufferUsage::hardware};
     geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
 
-    auto params0 = msh::a_surface().of_name("surface0")
+    auto params0 = mf::a_surface().of_name("surface0")
                                   .of_size(size)
                                   .of_buffer_usage(usage)
                                   .of_pixel_format(format);
 
-    auto params1 = msh::a_surface().of_name("surface1")
+    auto params1 = mf::a_surface().of_name("surface1")
                                   .of_size(size)
                                   .of_buffer_usage(usage)
                                   .of_pixel_format(format);
@@ -97,7 +97,7 @@
     std::vector<geom::PixelFormat> const formats{geom::PixelFormat::abgr_8888,
                                                  geom::PixelFormat::bgr_888};
 
-    std::vector<msh::SurfaceCreationParameters> params_vec;
+    std::vector<mf::SurfaceCreationParameters> params_vec;
 
     for (auto const& size : sizes)
     {
@@ -105,7 +105,7 @@
         {
             for (auto const& format : formats)
             {
-                auto cur_params = msh::a_surface().of_name("surface0")
+                auto cur_params = mf::a_surface().of_name("surface0")
                                                  .of_size(size)
                                                  .of_buffer_usage(usage)
                                                  .of_pixel_format(format);

=== modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp'
--- tests/unit-tests/surfaces/test_surface_stack.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/surfaces/test_surface_stack.cpp	2013-03-15 13:09:22 +0000
@@ -40,7 +40,7 @@
 namespace mc = mir::compositor;
 namespace mg = mir::graphics;
 namespace ms = mir::surfaces;
-namespace msh = mir::shell;
+namespace mf = mir::frontend;
 namespace geom = mir::geometry;
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
@@ -125,7 +125,7 @@
 
     ms::SurfaceStack stack(mt::fake_shared(buffer_bundle_factory));
     std::weak_ptr<ms::Surface> surface = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     stack.destroy_surface(surface);
 }
@@ -172,11 +172,11 @@
     ms::SurfaceStack stack(mt::fake_shared(buffer_bundle_factory));
 
     auto surface1 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface2 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface3 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     mtd::MockSurfaceRenderer renderer;
     MockFilterForRenderables filter;
@@ -210,11 +210,11 @@
     ms::SurfaceStack stack(mt::fake_shared(buffer_bundle_factory));
 
     auto surface1 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface2 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface3 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     mtd::MockSurfaceRenderer renderer;
     MockFilterForRenderables filter;
@@ -248,11 +248,11 @@
     ms::SurfaceStack stack(mt::fake_shared(buffer_bundle_factory));
 
     auto surface1 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface2 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
     auto surface3 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
+        mf::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     mtd::MockSurfaceRenderer renderer;
     MockFilterForRenderables filter;
@@ -295,7 +295,7 @@
 
     ms::SurfaceStack stack(mt::fake_shared(buffer_bundle_factory));
     std::weak_ptr<ms::Surface> surface = stack.create_surface(
-        msh::a_surface().of_size(size).of_buffer_usage(usage).of_pixel_format(format));
+        mf::a_surface().of_size(size).of_buffer_usage(usage).of_pixel_format(format));
 
     stack.destroy_surface(surface);
 }