diff --git a/src/common/guifacade.cpp b/src/common/guifacade.cpp
index 37ef2653a..0600e8386 100644
--- a/src/common/guifacade.cpp
+++ b/src/common/guifacade.cpp
@@ -44,7 +44,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
   
   using std::string;
   using std::unique_ptr;
@@ -212,4 +212,4 @@ namespace gui {
   }
   
   
-} // namespace gui
+} // namespace stage
diff --git a/src/common/notification-interface-proxy.cpp b/src/common/notification-interface-proxy.cpp
index d767bdb31..24a0c3508 100644
--- a/src/common/notification-interface-proxy.cpp
+++ b/src/common/notification-interface-proxy.cpp
@@ -35,7 +35,7 @@
 #include "include/gui-notification-facade.h"
 #include "include/interfaceproxy.hpp"
 
-namespace gui {
+namespace stage {
   /** static storage for the facade access front-end */
   lib::Depend<GuiNotification> GuiNotification::facade;
 }
diff --git a/src/common/ui-protocol.cpp b/src/common/ui-protocol.cpp
index 47d3e1d51..4f8674d55 100644
--- a/src/common/ui-protocol.cpp
+++ b/src/common/ui-protocol.cpp
@@ -29,7 +29,7 @@
 #include "include/ui-protocol.hpp"
 
 
-namespace gui {
+namespace stage {
   
   const Symbol META_kind{"kind"};
   
@@ -60,4 +60,4 @@ namespace gui {
   
   
   
-}// namespace gui
+}// namespace stage
diff --git a/src/include/dummy-player-facade.h b/src/include/dummy-player-facade.h
index 3f6ceb807..c6e21b70c 100644
--- a/src/include/dummy-player-facade.h
+++ b/src/include/dummy-player-facade.h
@@ -43,7 +43,7 @@
 
 
 
-namespace proc   {
+namespace steam   {
   namespace play {
     
     class ProcessImpl;
diff --git a/src/include/gui-notification-facade.h b/src/include/gui-notification-facade.h
index 01a540c30..15dab0d35 100644
--- a/src/include/gui-notification-facade.h
+++ b/src/include/gui-notification-facade.h
@@ -54,7 +54,7 @@ namespace lib {
     class GenNode;
     class MutationMessage;
 } }
-namespace gui {
+namespace stage {
   
   using std::string;
   using lib::diff::GenNode;
@@ -124,7 +124,7 @@ namespace gui {
   
   
   
-} // namespace gui
+} // namespace stage
 
 
 extern "C" {
diff --git a/src/include/play-facade.hpp b/src/include/play-facade.hpp
index 09925c289..886e9ecab 100644
--- a/src/include/play-facade.hpp
+++ b/src/include/play-facade.hpp
@@ -51,7 +51,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   class PlayProcess;
diff --git a/src/include/session-command-facade.h b/src/include/session-command-facade.h
index 282b3378e..bb7a255b5 100644
--- a/src/include/session-command-facade.h
+++ b/src/include/session-command-facade.h
@@ -58,7 +58,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::Symbol;
@@ -115,7 +115,7 @@ namespace control {
     
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 
 
 extern "C" {
diff --git a/src/include/ui-protocol.hpp b/src/include/ui-protocol.hpp
index 0bf92b497..17ebefaf7 100644
--- a/src/include/ui-protocol.hpp
+++ b/src/include/ui-protocol.hpp
@@ -62,7 +62,7 @@ namespace diff{
 namespace Glib {
 //class ustring;  /////////////////////////////TODO needed?
 }
-namespace gui {
+namespace stage {
   
 //using lib::Literal;
   using lib::Symbol;
@@ -96,5 +96,5 @@ namespace gui {
   extern const Symbol MARK_Message;
   
   
-}// namespace gui
+}// namespace stage
 #endif /*STAGE_INTERFACE_UI_PROTOCOL_H*/
diff --git a/src/lib/meta/trait.hpp b/src/lib/meta/trait.hpp
index 71b2d249b..ab396cc18 100644
--- a/src/lib/meta/trait.hpp
+++ b/src/lib/meta/trait.hpp
@@ -82,7 +82,7 @@ namespace lib{
     class TimeValue;
     class Duration;
 }}
-namespace proc {
+namespace steam {
 namespace mobject{
   template<class X, class B>  class Placement;
 }}
diff --git a/src/lib/wrapperptr.hpp b/src/lib/wrapperptr.hpp
index 0dd1f4e9d..2ede7aca8 100644
--- a/src/lib/wrapperptr.hpp
+++ b/src/lib/wrapperptr.hpp
@@ -40,7 +40,7 @@
 #include "lib/p.hpp"
 
 
-namespace proc {
+namespace steam {
   namespace asset   { class Asset; }
   namespace mobject { class MObject; }
   
diff --git a/src/stage/config-keys.cpp b/src/stage/config-keys.cpp
index 652e6c4e0..34046cc72 100644
--- a/src/stage/config-keys.cpp
+++ b/src/stage/config-keys.cpp
@@ -32,7 +32,7 @@
 
 #include "stage/config-keys.hpp"
 
-namespace gui {
+namespace stage {
   
   
   Literal KEY_TITLE      = "Lumiera.title";
@@ -47,4 +47,4 @@ namespace gui {
   
   
   
-}// namespace gui
+}// namespace stage
diff --git a/src/stage/config-keys.hpp b/src/stage/config-keys.hpp
index fd7cd7b04..1fa2de858 100644
--- a/src/stage/config-keys.hpp
+++ b/src/stage/config-keys.hpp
@@ -51,7 +51,7 @@
 
 
 
-namespace gui {
+namespace stage {
   
   using lib::Literal;
   using lumiera::Config;
@@ -67,5 +67,5 @@ namespace gui {
   extern Literal KEY_ICON_PATH;
   
   
-}// namespace gui
+}// namespace stage
 #endif /*STAGE_CONFIG_KEYS_H*/
diff --git a/src/stage/ctrl/actions.hpp b/src/stage/ctrl/actions.hpp
index 69df2257e..55719710c 100644
--- a/src/stage/ctrl/actions.hpp
+++ b/src/stage/ctrl/actions.hpp
@@ -52,7 +52,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   namespace error = lumiera::error;
   
@@ -374,5 +374,5 @@ namespace ctrl {
     };
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_ACTIONS_H*/
diff --git a/src/stage/ctrl/bus-term.hpp b/src/stage/ctrl/bus-term.hpp
index 889109ab8..2e9ed843e 100644
--- a/src/stage/ctrl/bus-term.hpp
+++ b/src/stage/ctrl/bus-term.hpp
@@ -71,7 +71,7 @@
 namespace lib {
   namespace diff { class MutationMessage; }
 }
-namespace gui {
+namespace stage {
 namespace model {
   class Tangible;
 }
@@ -177,5 +177,5 @@ namespace ctrl{
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_BUS_TERM_H*/
diff --git a/src/stage/ctrl/core-service.hpp b/src/stage/ctrl/core-service.hpp
index e9e0a3418..71d844ce8 100644
--- a/src/stage/ctrl/core-service.hpp
+++ b/src/stage/ctrl/core-service.hpp
@@ -95,7 +95,7 @@
 #include "stage/ctrl/nexus.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace ctrl{
   
   using proc::control::SessionCommand;
@@ -156,5 +156,5 @@ namespace ctrl{
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_CORE_SERVICE_H*/
diff --git a/src/stage/ctrl/facade.hpp b/src/stage/ctrl/facade.hpp
index 1f32d1067..20682907b 100644
--- a/src/stage/ctrl/facade.hpp
+++ b/src/stage/ctrl/facade.hpp
@@ -49,7 +49,7 @@
 
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   
@@ -86,5 +86,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_FACADE_H*/
diff --git a/src/stage/ctrl/global-ctx.hpp b/src/stage/ctrl/global-ctx.hpp
index fdfd30d02..8de320933 100644
--- a/src/stage/ctrl/global-ctx.hpp
+++ b/src/stage/ctrl/global-ctx.hpp
@@ -62,7 +62,7 @@
 #include "lib/nocopy.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using interact::InteractionDirector;
@@ -106,5 +106,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_GLOBAL_CTX_H*/
diff --git a/src/stage/ctrl/nexus.hpp b/src/stage/ctrl/nexus.hpp
index cc9fca175..5698bd931 100644
--- a/src/stage/ctrl/nexus.hpp
+++ b/src/stage/ctrl/nexus.hpp
@@ -52,7 +52,7 @@
 #include <unordered_map>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl{
   
   
@@ -192,5 +192,5 @@ namespace ctrl{
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_NEXUS_H*/
diff --git a/src/stage/ctrl/notification-hub.hpp b/src/stage/ctrl/notification-hub.hpp
index ad1d08098..0f8195c2f 100644
--- a/src/stage/ctrl/notification-hub.hpp
+++ b/src/stage/ctrl/notification-hub.hpp
@@ -70,7 +70,7 @@
 #include <functional>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using lib::diff::TreeMutator;
@@ -204,5 +204,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_NOTIFICATION_HUB_H*/
diff --git a/src/stage/ctrl/panel-locator.hpp b/src/stage/ctrl/panel-locator.hpp
index 00a7d89b9..bfc3350ea 100644
--- a/src/stage/ctrl/panel-locator.hpp
+++ b/src/stage/ctrl/panel-locator.hpp
@@ -60,7 +60,7 @@
 #include <list>
 
 
-namespace gui {
+namespace stage {
 namespace workspace {
   class WorkspaceWindow;
 }
@@ -133,5 +133,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_PANEL_LOCATOR_H*/
diff --git a/src/stage/ctrl/playback-controller.cpp b/src/stage/ctrl/playback-controller.cpp
index e8b3eaefd..6790137e3 100644
--- a/src/stage/ctrl/playback-controller.cpp
+++ b/src/stage/ctrl/playback-controller.cpp
@@ -35,7 +35,7 @@
 #include "include/logging.h"
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   namespace error = lumiera::error;
@@ -119,5 +119,5 @@ namespace ctrl {
   }
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 
diff --git a/src/stage/ctrl/playback-controller.hpp b/src/stage/ctrl/playback-controller.hpp
index ad958025e..f1b5a5722 100644
--- a/src/stage/ctrl/playback-controller.hpp
+++ b/src/stage/ctrl/playback-controller.hpp
@@ -46,7 +46,7 @@
 
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   
@@ -86,6 +86,6 @@ namespace ctrl {
     };
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif // PLAYBACK_CONTROLLER_HPP
 
diff --git a/src/stage/ctrl/state-manager.hpp b/src/stage/ctrl/state-manager.hpp
index 527226f02..67c2ab723 100644
--- a/src/stage/ctrl/state-manager.hpp
+++ b/src/stage/ctrl/state-manager.hpp
@@ -60,7 +60,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using std::string;
@@ -109,5 +109,5 @@ namespace ctrl {
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_STATE_MANAGER_H*/
diff --git a/src/stage/ctrl/state-map-grouping-storage.hpp b/src/stage/ctrl/state-map-grouping-storage.hpp
index ee0431a67..f142b3a2e 100644
--- a/src/stage/ctrl/state-map-grouping-storage.hpp
+++ b/src/stage/ctrl/state-map-grouping-storage.hpp
@@ -48,7 +48,7 @@
 #include <set>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using lib::idi::BareEntryID;
@@ -222,5 +222,5 @@ namespace ctrl {
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_STATE_MAP_GROUPING_STORAGE_H*/
diff --git a/src/stage/ctrl/state-recorder.hpp b/src/stage/ctrl/state-recorder.hpp
index 04207eaf6..346e531fc 100644
--- a/src/stage/ctrl/state-recorder.hpp
+++ b/src/stage/ctrl/state-recorder.hpp
@@ -64,7 +64,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using gui::ctrl::BusTerm;
@@ -207,5 +207,5 @@ namespace ctrl {
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_STATE_RECORDER_H*/
diff --git a/src/stage/ctrl/ui-dispatcher.hpp b/src/stage/ctrl/ui-dispatcher.hpp
index 318edd2db..ad6cf3878 100644
--- a/src/stage/ctrl/ui-dispatcher.hpp
+++ b/src/stage/ctrl/ui-dispatcher.hpp
@@ -83,7 +83,7 @@
 #include <utility>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using std::move;
@@ -154,5 +154,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_UI_DISPATCHER_H*/
diff --git a/src/stage/ctrl/ui-manager.cpp b/src/stage/ctrl/ui-manager.cpp
index 75d52aaf3..e13ebca48 100644
--- a/src/stage/ctrl/ui-manager.cpp
+++ b/src/stage/ctrl/ui-manager.cpp
@@ -49,7 +49,7 @@ using util::cStr;
 using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using Gtk::IconSize;
@@ -190,4 +190,4 @@ namespace ctrl {
   }
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
diff --git a/src/stage/ctrl/ui-manager.hpp b/src/stage/ctrl/ui-manager.hpp
index f1d1d68ff..6a3356faf 100644
--- a/src/stage/ctrl/ui-manager.hpp
+++ b/src/stage/ctrl/ui-manager.hpp
@@ -55,7 +55,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
   
   class UiBus;
   
@@ -152,5 +152,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_UI_MANAGER_H*/
diff --git a/src/stage/ctrl/ui-state.cpp b/src/stage/ctrl/ui-state.cpp
index 502bf7f60..ee5108248 100644
--- a/src/stage/ctrl/ui-state.cpp
+++ b/src/stage/ctrl/ui-state.cpp
@@ -37,7 +37,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using interact::FocusTracker;
@@ -66,4 +66,4 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
diff --git a/src/stage/ctrl/ui-state.hpp b/src/stage/ctrl/ui-state.hpp
index 3b679d5f2..5676de429 100644
--- a/src/stage/ctrl/ui-state.hpp
+++ b/src/stage/ctrl/ui-state.hpp
@@ -61,7 +61,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact { class FocusTracker; }
 namespace ctrl {
   
@@ -97,5 +97,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_CTRL_UI_MANAGER_H*/
diff --git a/src/stage/ctrl/window-locator.cpp b/src/stage/ctrl/window-locator.cpp
index 16dc56688..574f5696e 100644
--- a/src/stage/ctrl/window-locator.cpp
+++ b/src/stage/ctrl/window-locator.cpp
@@ -42,7 +42,7 @@ using util::isnil;
 using std::list;
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   
   using workspace::WorkspaceWindow;
@@ -204,4 +204,4 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
diff --git a/src/stage/ctrl/window-locator.hpp b/src/stage/ctrl/window-locator.hpp
index fb1497920..7cb2ac9e9 100644
--- a/src/stage/ctrl/window-locator.hpp
+++ b/src/stage/ctrl/window-locator.hpp
@@ -44,7 +44,7 @@
 #include <list>
 
 
-namespace gui {
+namespace stage {
   
   namespace model      { class Project; }           ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
   namespace controller { class Controller; }        ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
@@ -123,5 +123,5 @@ namespace ctrl {
   
   
   
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
 #endif /*STAGE_CTRL_WINDOW_LOCATOR_H*/
diff --git a/src/stage/dialog/dialog.hpp b/src/stage/dialog/dialog.hpp
index 6ca3d17f9..2b954ebe4 100644
--- a/src/stage/dialog/dialog.hpp
+++ b/src/stage/dialog/dialog.hpp
@@ -29,7 +29,7 @@
 #ifndef STAGE_DIALOG_DIALOG_H
 #define STAGE_DIALOG_DIALOG_H
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   /**
@@ -43,5 +43,5 @@ namespace dialog {
   static const int BoxSpacing = 6;
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
 #endif /*STAGE_DIALOG_DIALOG_H*/
diff --git a/src/stage/dialog/name-chooser.cpp b/src/stage/dialog/name-chooser.cpp
index bd93b4169..2933798d1 100644
--- a/src/stage/dialog/name-chooser.cpp
+++ b/src/stage/dialog/name-chooser.cpp
@@ -34,7 +34,7 @@
 using namespace Gtk;         //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace Glib;        //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   NameChooser::NameChooser (Window &parent,
@@ -70,4 +70,4 @@ namespace dialog {
   
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
diff --git a/src/stage/dialog/name-chooser.hpp b/src/stage/dialog/name-chooser.hpp
index 6f9f713a0..5b16b3c3e 100644
--- a/src/stage/dialog/name-chooser.hpp
+++ b/src/stage/dialog/name-chooser.hpp
@@ -32,7 +32,7 @@
 #include "stage/gtk-base.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   /**
@@ -69,5 +69,5 @@ namespace dialog {
     };
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
 #endif /*STAGE_DIALOG_NAME_CHOOSER_H*/
diff --git a/src/stage/dialog/preferences-dialog.hpp b/src/stage/dialog/preferences-dialog.hpp
index f3ff39a44..04ad680e8 100644
--- a/src/stage/dialog/preferences-dialog.hpp
+++ b/src/stage/dialog/preferences-dialog.hpp
@@ -36,7 +36,7 @@
 #include "stage/gtk-base.hpp"
 #include "stage/dialog/dialog.hpp"
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   
@@ -79,5 +79,5 @@ namespace dialog {
     };
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
 #endif /*STAGE_DIALOG_PREFERENCES_DIALOG_H*/
diff --git a/src/stage/dialog/render.cpp b/src/stage/dialog/render.cpp
index d7a147c5b..ee3102e2b 100644
--- a/src/stage/dialog/render.cpp
+++ b/src/stage/dialog/render.cpp
@@ -36,7 +36,7 @@
 
 using namespace Gtk;         //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   Render::Render (Window& parent)
@@ -108,4 +108,4 @@ namespace dialog {
   }
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
diff --git a/src/stage/dialog/render.hpp b/src/stage/dialog/render.hpp
index 101038562..ca4dcef7f 100644
--- a/src/stage/dialog/render.hpp
+++ b/src/stage/dialog/render.hpp
@@ -32,7 +32,7 @@
 #include "stage/gtk-base.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   
@@ -66,5 +66,5 @@ namespace dialog {
     };
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
 #endif /*STAGE_DIALOG_RENDER_H*/
diff --git a/src/stage/dialog/test-control.hpp b/src/stage/dialog/test-control.hpp
index 37b500e1d..5fa348f64 100644
--- a/src/stage/dialog/test-control.hpp
+++ b/src/stage/dialog/test-control.hpp
@@ -60,7 +60,7 @@
 #include <utility>
 #include <string>
 
-namespace gui {
+namespace stage {
 namespace dialog {
   
   using std::string;
@@ -358,5 +358,5 @@ namespace dialog {
     };
   
   
-}} // namespace gui::dialog
+}} // namespace stage::dialog
 #endif /*STAGE_DIALOG_TEST_CONTROL_H*/
diff --git a/src/stage/display-service.cpp b/src/stage/display-service.cpp
index b6de50ad9..74a5f9ef4 100644
--- a/src/stage/display-service.cpp
+++ b/src/stage/display-service.cpp
@@ -40,7 +40,7 @@ extern "C" {
 }
 
 
-namespace gui {
+namespace stage {
   
   
   
@@ -259,4 +259,4 @@ namespace gui {
   }
   
   
-} // namespace proc
+} // namespace stage
diff --git a/src/stage/display-service.hpp b/src/stage/display-service.hpp
index a1efaecaa..b18a47fcd 100644
--- a/src/stage/display-service.hpp
+++ b/src/stage/display-service.hpp
@@ -62,7 +62,7 @@
 #include <vector>
 
 
-namespace gui {
+namespace stage {
   
   using std::string;
   using std::vector;
@@ -185,5 +185,5 @@ namespace gui {
   
   
   
-} // namespace gui
+} // namespace stage
 #endif
diff --git a/src/stage/draw/cairo-util.cpp b/src/stage/draw/cairo-util.cpp
index 961656128..7f6b39634 100644
--- a/src/stage/draw/cairo-util.cpp
+++ b/src/stage/draw/cairo-util.cpp
@@ -28,7 +28,7 @@
 
 #include "stage/draw/cairo-util.hpp"
 
-namespace gui {
+namespace stage {
 namespace draw {
   
   RefPtr<SolidPattern>
@@ -83,4 +83,4 @@ namespace draw {
     return Cairo::SolidPattern::create_rgba (red, blue, green, alpha);
   }
   
-}}// namespace gui::draw
+}}// namespace stage::draw
diff --git a/src/stage/draw/cairo-util.hpp b/src/stage/draw/cairo-util.hpp
index 40aed4421..77a972db9 100644
--- a/src/stage/draw/cairo-util.hpp
+++ b/src/stage/draw/cairo-util.hpp
@@ -35,7 +35,7 @@ using Cairo::RefPtr;
 using Cairo::SolidPattern;
 
 
-namespace gui {
+namespace stage {
 namespace draw {
   
   /**
@@ -78,5 +78,5 @@ namespace draw {
     };
   
   
-}}// namespace gui::draw
+}}// namespace stage::draw
 #endif /*STAGE_DRAW_CAIRO_H*/
diff --git a/src/stage/draw/rectangle.cpp b/src/stage/draw/rectangle.cpp
index d497772b9..bae0f16c0 100644
--- a/src/stage/draw/rectangle.cpp
+++ b/src/stage/draw/rectangle.cpp
@@ -32,7 +32,7 @@
 using std::max;
 using std::min;
 
-namespace gui {
+namespace stage {
 namespace draw{
   
   bool
@@ -57,4 +57,4 @@ namespace draw{
   }
   
   
-}}// namespace gui::draw
+}}// namespace stage::draw
diff --git a/src/stage/draw/rectangle.hpp b/src/stage/draw/rectangle.hpp
index 8cbf9ab9a..a7618fc40 100644
--- a/src/stage/draw/rectangle.hpp
+++ b/src/stage/draw/rectangle.hpp
@@ -31,7 +31,7 @@
 
 #include "stage/gtk-base.hpp"
 
-namespace gui {
+namespace stage {
 namespace draw {
   
   /** determine whether point is within the bounding box of a rectangle */
@@ -42,5 +42,5 @@ namespace draw {
   bool rects_overlap(Gdk::Rectangle const& a, Gdk::Rectangle const& b);
   
   
-}}// namespace gui::draw
+}}// namespace stage::draw
 #endif /*STAGE_DRAW_RECTANGLE_H*/
diff --git a/src/stage/gtk-base.hpp b/src/stage/gtk-base.hpp
index 0f0fe2653..f29aa61c1 100644
--- a/src/stage/gtk-base.hpp
+++ b/src/stage/gtk-base.hpp
@@ -85,7 +85,7 @@
 /* ======= Namespace Definitions ======= */
 
 /** Lumiera GTK UI implementation root. */
-namespace gui {
+namespace stage {
   
   typedef Glib::ustring uString;
   typedef const uString cuString;
@@ -158,5 +158,5 @@ namespace gui {
   namespace idi {}
   
   
-}// namespace gui
+}// namespace stage
 #endif /*STAGE_GTK_BASE_H*/
diff --git a/src/stage/gtk-lumiera.cpp b/src/stage/gtk-lumiera.cpp
index 658d3438d..efcdca04f 100644
--- a/src/stage/gtk-lumiera.cpp
+++ b/src/stage/gtk-lumiera.cpp
@@ -73,7 +73,7 @@ using gui::LUMIERA_INTERFACE_INAME(lumieraorg_Gui, 1);
 using std::string;
 
 
-namespace gui {
+namespace stage {
   
   namespace { // implementation details
     
@@ -157,7 +157,7 @@ namespace gui {
       }           // note: lumiera_error state remains set
   }
 
-} // namespace gui
+} // namespace stage
 
 
 
diff --git a/src/stage/guifacade.hpp b/src/stage/guifacade.hpp
index 35a33c0df..91ef48af4 100644
--- a/src/stage/guifacade.hpp
+++ b/src/stage/guifacade.hpp
@@ -47,7 +47,7 @@ extern "C" {
 
 
 
-namespace gui {
+namespace stage {
   
   
   
@@ -101,5 +101,5 @@ namespace gui {
   );
   
   
-} // namespace gui
+} // namespace stage
 #endif
diff --git a/src/stage/id-scheme.hpp b/src/stage/id-scheme.hpp
index 3235fabf9..a16a0f182 100644
--- a/src/stage/id-scheme.hpp
+++ b/src/stage/id-scheme.hpp
@@ -60,7 +60,7 @@
 
 
 /* === forward declarations === */
-namespace proc {
+namespace steam {
   namespace asset {
     class Timeline;
     
@@ -70,7 +70,7 @@ namespace proc {
   }
 }
 
-namespace gui {
+namespace stage {
   namespace timeline {
     class TimelineController;
   }
@@ -166,6 +166,6 @@ locate = currentWindow().panel(infobox)
 */    
     
     
-  }//namespace gui::idi
-} // namespace gui
+  }//namespace stage::idi
+} // namespace stage
 #endif /*STAGE_ID_SCHEME_H*/
diff --git a/src/stage/interact/cmd-context.cpp b/src/stage/interact/cmd-context.cpp
index 6036c8546..a179e1c65 100644
--- a/src/stage/interact/cmd-context.cpp
+++ b/src/stage/interact/cmd-context.cpp
@@ -43,7 +43,7 @@
 //using util::contains;
 //using util::isnil;
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace { // internal details
@@ -80,4 +80,4 @@ namespace interact {
   
   /** nonsense */
 
-}} // namespace gui::interact
+}} // namespace stage::interact
diff --git a/src/stage/interact/cmd-context.hpp b/src/stage/interact/cmd-context.hpp
index 1f4c560ad..35d5a38f9 100644
--- a/src/stage/interact/cmd-context.hpp
+++ b/src/stage/interact/cmd-context.hpp
@@ -65,7 +65,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using lib::HashVal;
@@ -137,5 +137,5 @@ namespace interact {
     };
   
   
-}} // namespace gui::interact
+}} // namespace stage::interact
 #endif /*STAGE_INTERACT_CMD_CONTEXT_H*/
diff --git a/src/stage/interact/elem-access-dir.hpp b/src/stage/interact/elem-access-dir.hpp
index e137c1b57..8813a2192 100644
--- a/src/stage/interact/elem-access-dir.hpp
+++ b/src/stage/interact/elem-access-dir.hpp
@@ -53,7 +53,7 @@
 
 
   
-namespace gui {
+namespace stage {
 namespace ctrl{
   
 //  using util::isnil;
@@ -110,5 +110,5 @@ namespace ctrl{
   
   
   
-}} // namespace gui::ctrl
+}} // namespace stage::ctrl
 #endif /*STAGE_CTRL_ELEM_ACCESS_DIR_H*/
diff --git a/src/stage/interact/focus-tracker.cpp b/src/stage/interact/focus-tracker.cpp
index 362f4ed05..389314d48 100644
--- a/src/stage/interact/focus-tracker.cpp
+++ b/src/stage/interact/focus-tracker.cpp
@@ -38,7 +38,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   
@@ -57,4 +57,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/focus-tracker.hpp b/src/stage/interact/focus-tracker.hpp
index 91410320f..3dbec9829 100644
--- a/src/stage/interact/focus-tracker.hpp
+++ b/src/stage/interact/focus-tracker.hpp
@@ -61,7 +61,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using std::unique_ptr;
@@ -95,5 +95,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_FOCUS_TRACKER_H*/
diff --git a/src/stage/interact/interaction-director.cpp b/src/stage/interact/interaction-director.cpp
index 9d76c33c3..b89f7520d 100644
--- a/src/stage/interact/interaction-director.cpp
+++ b/src/stage/interact/interaction-director.cpp
@@ -73,7 +73,7 @@ using std::make_unique;
 using util::toString;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace session = proc::mobject::session;
@@ -370,4 +370,4 @@ namespace interact {
 
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/interaction-director.hpp b/src/stage/interact/interaction-director.hpp
index b21a27b5f..22e8897e8 100644
--- a/src/stage/interact/interaction-director.hpp
+++ b/src/stage/interact/interaction-director.hpp
@@ -62,7 +62,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
   
   class UiBus;
 
@@ -159,5 +159,5 @@ namespace interact {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_INTERACT_INTERACTION_DIRECTOR_H*/
diff --git a/src/stage/interact/interaction-state.cpp b/src/stage/interact/interaction-state.cpp
index 97ed689bb..bf104b421 100644
--- a/src/stage/interact/interaction-state.cpp
+++ b/src/stage/interact/interaction-state.cpp
@@ -43,7 +43,7 @@
 //using util::contains;
 //using util::isnil;
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace { // internal details
@@ -59,4 +59,4 @@ namespace interact {
   
   /** nonsense */
 
-}} // namespace gui::interact
+}} // namespace stage::interact
diff --git a/src/stage/interact/interaction-state.hpp b/src/stage/interact/interaction-state.hpp
index 959df71ca..29bc45aec 100644
--- a/src/stage/interact/interaction-state.hpp
+++ b/src/stage/interact/interaction-state.hpp
@@ -48,7 +48,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using lib::HashVal;
@@ -73,5 +73,5 @@ namespace interact {
   
   
   
-}} // namespace gui::interact
+}} // namespace stage::interact
 #endif /*STAGE_INTERACT_INTERACTION_STATE_H*/
diff --git a/src/stage/interact/navigator.cpp b/src/stage/interact/navigator.cpp
index 70cc16831..6c7a698d9 100644
--- a/src/stage/interact/navigator.cpp
+++ b/src/stage/interact/navigator.cpp
@@ -43,7 +43,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   
@@ -87,4 +87,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/navigator.hpp b/src/stage/interact/navigator.hpp
index 3d6774859..8d2cce914 100644
--- a/src/stage/interact/navigator.hpp
+++ b/src/stage/interact/navigator.hpp
@@ -46,7 +46,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using std::unique_ptr;
@@ -86,5 +86,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_NAVIGATOR_H*/
diff --git a/src/stage/interact/spot-locator.cpp b/src/stage/interact/spot-locator.cpp
index 4e74bc81e..bc52e415a 100644
--- a/src/stage/interact/spot-locator.cpp
+++ b/src/stage/interact/spot-locator.cpp
@@ -36,7 +36,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   
@@ -54,4 +54,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/spot-locator.hpp b/src/stage/interact/spot-locator.hpp
index 870dd77e0..1b225b8f7 100644
--- a/src/stage/interact/spot-locator.hpp
+++ b/src/stage/interact/spot-locator.hpp
@@ -46,7 +46,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using std::unique_ptr;
@@ -75,5 +75,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_SPOT_LOCATOR_H*/
diff --git a/src/stage/interact/ui-coord-resolver.cpp b/src/stage/interact/ui-coord-resolver.cpp
index 0e8d75c24..ba767374b 100644
--- a/src/stage/interact/ui-coord-resolver.cpp
+++ b/src/stage/interact/ui-coord-resolver.cpp
@@ -36,7 +36,7 @@ using lib::Symbol;
 using lib::treeExplore;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   // emit typeinfo and VTables here....
@@ -205,4 +205,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/ui-coord-resolver.hpp b/src/stage/interact/ui-coord-resolver.hpp
index 8356a2e13..c8903edd2 100644
--- a/src/stage/interact/ui-coord-resolver.hpp
+++ b/src/stage/interact/ui-coord-resolver.hpp
@@ -128,7 +128,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace error = lumiera::error;
@@ -597,5 +597,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_UI_COORD_RESOLVER_H*/
diff --git a/src/stage/interact/ui-coord.hpp b/src/stage/interact/ui-coord.hpp
index 232e8de51..36f4d92e2 100644
--- a/src/stage/interact/ui-coord.hpp
+++ b/src/stage/interact/ui-coord.hpp
@@ -94,7 +94,7 @@
 #include <utility>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace error = lumiera::error;
@@ -767,5 +767,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_UI_COORD_H*/
diff --git a/src/stage/interact/ui-location-solver.hpp b/src/stage/interact/ui-location-solver.hpp
index 10087bedc..546c3c104 100644
--- a/src/stage/interact/ui-location-solver.hpp
+++ b/src/stage/interact/ui-location-solver.hpp
@@ -80,7 +80,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   using lib::Literal;
@@ -323,5 +323,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_UI_LOCATION_SOLVER_H*/
diff --git a/src/stage/interact/view-locator.cpp b/src/stage/interact/view-locator.cpp
index d66b0f85b..46f7762a3 100644
--- a/src/stage/interact/view-locator.cpp
+++ b/src/stage/interact/view-locator.cpp
@@ -58,7 +58,7 @@ using lib::Symbol;
 using gui::model::ElementAccess;
 
 
-namespace gui {
+namespace stage {
   namespace error = lumiera::error;
   
   
@@ -108,4 +108,4 @@ namespace gui {
     
     
     
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/view-locator.hpp b/src/stage/interact/view-locator.hpp
index cfbed10a6..1f500af9b 100644
--- a/src/stage/interact/view-locator.hpp
+++ b/src/stage/interact/view-locator.hpp
@@ -77,7 +77,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace ctrl{
   class PanelLocator;
 }
@@ -137,5 +137,5 @@ namespace interact {
   }
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_VIEW_LOCATOR_H*/
diff --git a/src/stage/interact/view-spec-dsl.hpp b/src/stage/interact/view-spec-dsl.hpp
index 06bdf61f1..332f74322 100644
--- a/src/stage/interact/view-spec-dsl.hpp
+++ b/src/stage/interact/view-spec-dsl.hpp
@@ -111,7 +111,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   using std::forward;
@@ -287,5 +287,5 @@ namespace idi {
   }
   
   
-}}// namespace gui::idi
+}}// namespace stage::idi
 #endif /*STAGE_INTERACT_VIEW_SPEC_DSL_H*/
diff --git a/src/stage/interact/wizard.cpp b/src/stage/interact/wizard.cpp
index f44260304..d0ad02252 100644
--- a/src/stage/interact/wizard.cpp
+++ b/src/stage/interact/wizard.cpp
@@ -52,7 +52,7 @@ using std::vector;
 using std::string;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   using boost::algorithm::is_any_of;
@@ -134,4 +134,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/wizard.hpp b/src/stage/interact/wizard.hpp
index d9c7bbb48..6179a1608 100644
--- a/src/stage/interact/wizard.hpp
+++ b/src/stage/interact/wizard.hpp
@@ -49,7 +49,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
   namespace asset {
     namespace meta {
       class ErrorLog;
@@ -57,7 +57,7 @@ namespace proc {
       extern lib::idi::EntryID<ErrorLog> theErrorLog_ID;
 } } }
 
-namespace gui {
+namespace stage {
   using ID = lib::idi::BareEntryID const&;
   
 namespace ctrl {
@@ -103,5 +103,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_WIZARD_H*/
diff --git a/src/stage/interact/work-site-trail.cpp b/src/stage/interact/work-site-trail.cpp
index efcc9ab92..967847c03 100644
--- a/src/stage/interact/work-site-trail.cpp
+++ b/src/stage/interact/work-site-trail.cpp
@@ -36,7 +36,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   
@@ -57,4 +57,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/work-site-trail.hpp b/src/stage/interact/work-site-trail.hpp
index 0be7ad42c..23defa4b2 100644
--- a/src/stage/interact/work-site-trail.hpp
+++ b/src/stage/interact/work-site-trail.hpp
@@ -47,7 +47,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using std::unique_ptr;
@@ -76,5 +76,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_WORK_SITE_H*/
diff --git a/src/stage/interact/work-site.cpp b/src/stage/interact/work-site.cpp
index b3d5ec90e..7c421a89e 100644
--- a/src/stage/interact/work-site.cpp
+++ b/src/stage/interact/work-site.cpp
@@ -37,7 +37,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   
@@ -58,4 +58,4 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
diff --git a/src/stage/interact/work-site.hpp b/src/stage/interact/work-site.hpp
index 38603e0db..735d78bf9 100644
--- a/src/stage/interact/work-site.hpp
+++ b/src/stage/interact/work-site.hpp
@@ -52,7 +52,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
 //  using std::unique_ptr;
@@ -83,5 +83,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_WORK_SITE_H*/
diff --git a/src/stage/model/clip-track.cpp b/src/stage/model/clip-track.cpp
index 3bfb48737..26a9b24f3 100644
--- a/src/stage/model/clip-track.cpp
+++ b/src/stage/model/clip-track.cpp
@@ -32,7 +32,7 @@
 #include "clip.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
   ClipTrack::ClipTrack()
@@ -63,4 +63,4 @@ namespace model {
   }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/clip-track.hpp b/src/stage/model/clip-track.hpp
index 79f66d350..5aadcadd6 100644
--- a/src/stage/model/clip-track.hpp
+++ b/src/stage/model/clip-track.hpp
@@ -34,7 +34,7 @@
 #include "stage/model/track.hpp"
 #include "lib/observable-list.hpp"
 
-namespace gui {
+namespace stage {
 namespace model {
 
   class Clip;
@@ -66,6 +66,6 @@ namespace model {
   };
 
 }   // namespace timeline
-}   // namespace gui
+}   // namespace stage
 
 #endif // CLIP_TRACK_HPP
diff --git a/src/stage/model/clip.cpp b/src/stage/model/clip.cpp
index 7c2299063..c2192aba7 100644
--- a/src/stage/model/clip.cpp
+++ b/src/stage/model/clip.cpp
@@ -36,7 +36,7 @@ using lib::time::FSecs;
 using lib::time::Mutation;
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
   Clip::Clip()
@@ -72,5 +72,5 @@ namespace model {
   }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
diff --git a/src/stage/model/clip.hpp b/src/stage/model/clip.hpp
index 145618cda..c6638eef5 100644
--- a/src/stage/model/clip.hpp
+++ b/src/stage/model/clip.hpp
@@ -36,7 +36,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   using std::string;
@@ -103,5 +103,5 @@ namespace model {
     };
   
   
-}}   // namespace gui::model
+}}   // namespace stage::model
 #endif // CLIP_HPP
diff --git a/src/stage/model/controller.hpp b/src/stage/model/controller.hpp
index 272a282b4..43318a7c4 100644
--- a/src/stage/model/controller.hpp
+++ b/src/stage/model/controller.hpp
@@ -47,7 +47,7 @@
 //#include <string>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
 //  using lib::HashVal;
@@ -120,5 +120,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_CONTROLLER_H*/
diff --git a/src/stage/model/diagnostics.hpp b/src/stage/model/diagnostics.hpp
index f13ef9c11..9a97f9fa7 100644
--- a/src/stage/model/diagnostics.hpp
+++ b/src/stage/model/diagnostics.hpp
@@ -47,7 +47,7 @@
 
 
   
-namespace gui {
+namespace stage {
 namespace model {
   
 //  using util::isnil;
@@ -116,5 +116,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_DIAGNOSTICS_H*/
diff --git a/src/stage/model/element-access.hpp b/src/stage/model/element-access.hpp
index d09027063..2b411a130 100644
--- a/src/stage/model/element-access.hpp
+++ b/src/stage/model/element-access.hpp
@@ -67,7 +67,7 @@
 namespace Gtk {
   class Widget;
 }
-namespace gui {
+namespace stage {
 namespace model {
   namespace error = lumiera::error;
   
@@ -198,5 +198,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_ELEMENT_ACCESS_H*/
diff --git a/src/stage/model/expander-revealer.hpp b/src/stage/model/expander-revealer.hpp
index 523337051..1882f2333 100644
--- a/src/stage/model/expander-revealer.hpp
+++ b/src/stage/model/expander-revealer.hpp
@@ -69,7 +69,7 @@
 #include <utility>
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
   using std::move;
@@ -185,5 +185,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_EXPANDER_REVEALER_H*/
diff --git a/src/stage/model/flash-deco.hpp b/src/stage/model/flash-deco.hpp
index 30c9fdb91..4c646139a 100644
--- a/src/stage/model/flash-deco.hpp
+++ b/src/stage/model/flash-deco.hpp
@@ -45,7 +45,7 @@
 #include "stage/style-scheme.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   
@@ -86,5 +86,5 @@ namespace model {
     };
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_FLASH_DECO_H*/
diff --git a/src/stage/model/group-track.cpp b/src/stage/model/group-track.cpp
index f5fb8415c..a0ed15d11 100644
--- a/src/stage/model/group-track.cpp
+++ b/src/stage/model/group-track.cpp
@@ -30,7 +30,7 @@
 
 #include "group-track.hpp"
 
-namespace gui {
+namespace stage {
 namespace model {
   
 GroupTrack::GroupTrack()
@@ -48,4 +48,4 @@ GroupTrack::print_track()
 }
   
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/group-track.hpp b/src/stage/model/group-track.hpp
index 270bf18e9..9ee2d5913 100644
--- a/src/stage/model/group-track.hpp
+++ b/src/stage/model/group-track.hpp
@@ -34,7 +34,7 @@
 #include "stage/model/parent-track.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
 /**
@@ -58,6 +58,6 @@ public:
 };
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
 #endif // GROUP_TRACK_HPP
diff --git a/src/stage/model/parent-track.cpp b/src/stage/model/parent-track.cpp
index 60b509ac2..9910f25f9 100644
--- a/src/stage/model/parent-track.cpp
+++ b/src/stage/model/parent-track.cpp
@@ -33,7 +33,7 @@
 
 using std::shared_ptr;
 
-namespace gui {
+namespace stage {
 namespace model {
 
 ParentTrack::ParentTrack()
@@ -96,4 +96,4 @@ ParentTrack::find_descendant_track_parent(shared_ptr<Track> child)
 }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/parent-track.hpp b/src/stage/model/parent-track.hpp
index b86bd5a38..b5f7f4238 100644
--- a/src/stage/model/parent-track.hpp
+++ b/src/stage/model/parent-track.hpp
@@ -34,7 +34,7 @@
 #include "stage/model/track.hpp"
 #include "lib/observable-list.hpp"
 
-namespace gui {
+namespace stage {
 namespace model {
 
 /**
@@ -98,6 +98,6 @@ protected:
 };
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
 #endif // PARENT_TRACK_HPP
diff --git a/src/stage/model/project.cpp b/src/stage/model/project.cpp
index a34c834e8..5b2b7ee88 100644
--- a/src/stage/model/project.cpp
+++ b/src/stage/model/project.cpp
@@ -36,7 +36,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
 Project::Project()
@@ -66,4 +66,4 @@ Project::add_new_sequence(uString name)
 }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/project.hpp b/src/stage/model/project.hpp
index 263b47886..d61c02c76 100644
--- a/src/stage/model/project.hpp
+++ b/src/stage/model/project.hpp
@@ -37,7 +37,7 @@
 #include "stage/model/sequence.hpp"
 #include "lib/observable-list.hpp"
 
-namespace gui {
+namespace stage {
 namespace model {
   
 /**
@@ -61,6 +61,6 @@ private:
 };
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
 #endif // PROJECT_HPP
diff --git a/src/stage/model/sequence.cpp b/src/stage/model/sequence.cpp
index 1270fc865..57acbca87 100644
--- a/src/stage/model/sequence.cpp
+++ b/src/stage/model/sequence.cpp
@@ -37,7 +37,7 @@
 #include "stage/model/clip-track.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace model {
 
 
@@ -85,4 +85,4 @@ Sequence::print_track()
 }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/sequence.hpp b/src/stage/model/sequence.hpp
index 0cc09baf1..077cedc9d 100644
--- a/src/stage/model/sequence.hpp
+++ b/src/stage/model/sequence.hpp
@@ -39,7 +39,7 @@
 
 #include <string>
 
-namespace gui {
+namespace stage {
 namespace model {
 
 class Track;
@@ -75,6 +75,6 @@ class Sequence
 
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
 #endif // SEQUENCE_HPP
diff --git a/src/stage/model/session-facade.cpp b/src/stage/model/session-facade.cpp
index 95514583e..2132f5da7 100644
--- a/src/stage/model/session-facade.cpp
+++ b/src/stage/model/session-facade.cpp
@@ -51,7 +51,7 @@
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   namespace { // internal details
@@ -91,4 +91,4 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
diff --git a/src/stage/model/session-facade.hpp b/src/stage/model/session-facade.hpp
index 0bb26229d..bc232e74e 100644
--- a/src/stage/model/session-facade.hpp
+++ b/src/stage/model/session-facade.hpp
@@ -46,7 +46,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
 //  using lib::HashVal;
@@ -87,5 +87,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*SESSION_FACADE_H*/
diff --git a/src/stage/model/tangible.cpp b/src/stage/model/tangible.cpp
index 1014f5dc4..cd227271f 100644
--- a/src/stage/model/tangible.cpp
+++ b/src/stage/model/tangible.cpp
@@ -37,7 +37,7 @@
 #include "lib/diff/gen-node.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   
@@ -302,4 +302,4 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
diff --git a/src/stage/model/tangible.hpp b/src/stage/model/tangible.hpp
index 49aba5980..f53ab2429 100644
--- a/src/stage/model/tangible.hpp
+++ b/src/stage/model/tangible.hpp
@@ -143,7 +143,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   using std::string;
@@ -300,5 +300,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_TANGIBLE_H*/
diff --git a/src/stage/model/track.cpp b/src/stage/model/track.cpp
index 06f093f98..f5a4886f9 100644
--- a/src/stage/model/track.cpp
+++ b/src/stage/model/track.cpp
@@ -37,7 +37,7 @@
 #include <string>
 #include <list>
 
-namespace gui {
+namespace stage {
 namespace model {
   
 using std::list;
@@ -156,4 +156,4 @@ Track::print_branch_recursive (const unsigned int indentation)
 }
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
diff --git a/src/stage/model/track.hpp b/src/stage/model/track.hpp
index caf47e723..e10f7e473 100644
--- a/src/stage/model/track.hpp
+++ b/src/stage/model/track.hpp
@@ -36,7 +36,7 @@
 #ifndef TRACK_HPP
 #define TRACK_HPP
 
-namespace gui {
+namespace stage {
 namespace model {
   
 using std::shared_ptr;
@@ -209,6 +209,6 @@ private:
 };
 
 }   // namespace model
-}   // namespace gui
+}   // namespace stage
 
 #endif // TRACK_HPP
diff --git a/src/stage/model/w-link.hpp b/src/stage/model/w-link.hpp
index f8f770c88..58c1b053c 100644
--- a/src/stage/model/w-link.hpp
+++ b/src/stage/model/w-link.hpp
@@ -65,7 +65,7 @@
 #include <sigc++/trackable.h>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
   namespace error = lumiera::error;
@@ -240,5 +240,5 @@ namespace model {
     };
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_W_LINK_H*/
diff --git a/src/stage/model/widget.hpp b/src/stage/model/widget.hpp
index 199635c5e..5e0f04cac 100644
--- a/src/stage/model/widget.hpp
+++ b/src/stage/model/widget.hpp
@@ -44,7 +44,7 @@
 //#include <string>
 
 
-namespace gui {
+namespace stage {
 namespace model {
   
 //  using lib::HashVal;
@@ -111,5 +111,5 @@ namespace model {
   
   
   
-}} // namespace gui::model
+}} // namespace stage::model
 #endif /*STAGE_MODEL_WIDGET_H*/
diff --git a/src/stage/notification-service.cpp b/src/stage/notification-service.cpp
index 1e4467aba..1d09065f0 100644
--- a/src/stage/notification-service.cpp
+++ b/src/stage/notification-service.cpp
@@ -85,7 +85,7 @@ using std::string;
 using std::move;
 
 
-namespace gui {
+namespace stage {
   
   
   /** @internal helper to _move_ a given UI-Bus message (GenNode)
@@ -328,4 +328,4 @@ namespace gui {
   NotificationService::~NotificationService() { } // emit dtors of embedded objects here...
   
   
-} // namespace gui
+} // namespace stage
diff --git a/src/stage/notification-service.hpp b/src/stage/notification-service.hpp
index e1cdb0bef..661c21830 100644
--- a/src/stage/notification-service.hpp
+++ b/src/stage/notification-service.hpp
@@ -51,7 +51,7 @@
 namespace lib {
   namespace diff { class GenNode; }
 }
-namespace gui {
+namespace stage {
   
   namespace ctrl {
     class UiManager;
@@ -108,5 +108,5 @@ namespace gui {
   
   
   
-} // namespace gui
+} // namespace stage
 #endif
diff --git a/src/stage/output/displayer.cpp b/src/stage/output/displayer.cpp
index 470ab3461..8f3238e2c 100644
--- a/src/stage/output/displayer.cpp
+++ b/src/stage/output/displayer.cpp
@@ -40,7 +40,7 @@
 #include "stage/output/xvdisplayer.hpp"
 #include "stage/output/gdkdisplayer.hpp"
 
-namespace gui {
+namespace stage {
 namespace output {
   
   bool
@@ -94,4 +94,4 @@ namespace output {
   }
   
   
-}} // namespace gui::output
+}} // namespace stage::output
diff --git a/src/stage/output/displayer.hpp b/src/stage/output/displayer.hpp
index c36745f19..6e43ffe8e 100644
--- a/src/stage/output/displayer.hpp
+++ b/src/stage/output/displayer.hpp
@@ -36,7 +36,7 @@
 #define STAGE_OUTPUT_DISPLAYER_H
 
 
-namespace gui {
+namespace stage {
 namespace output {
   
   /** Supported Displayer formats */
@@ -123,5 +123,5 @@ namespace output {
     
     
   
-}} // namespace gui::output
+}} // namespace stage::output
 #endif /*STAGE_OUTPUT_DISPLAYER_H*/
diff --git a/src/stage/output/gdkdisplayer.cpp b/src/stage/output/gdkdisplayer.cpp
index 46ef6bc8a..c330e5d06 100644
--- a/src/stage/output/gdkdisplayer.cpp
+++ b/src/stage/output/gdkdisplayer.cpp
@@ -42,7 +42,7 @@ using std::cerr;
 using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace output {
   
   GdkDisplayer::GdkDisplayer (Gtk::Widget *drawing_area,
@@ -100,4 +100,4 @@ namespace output {
   }
   
   
-}}   // namespace gui::output
+}}   // namespace stage::output
diff --git a/src/stage/output/gdkdisplayer.hpp b/src/stage/output/gdkdisplayer.hpp
index cc8113ee9..52bb042f3 100644
--- a/src/stage/output/gdkdisplayer.hpp
+++ b/src/stage/output/gdkdisplayer.hpp
@@ -40,7 +40,7 @@ namespace Gtk {
   class Widget;
 }
 
-namespace gui {
+namespace stage {
 namespace output {
 
 /**
@@ -93,5 +93,5 @@ class GdkDisplayer
   
   
   
-}}   // namespace gui::output
+}}   // namespace stage::output
 #endif /*STAGE_OUTPUT_GDKDISPLAYER_H*/
diff --git a/src/stage/output/xvdisplayer.cpp b/src/stage/output/xvdisplayer.cpp
index e83e76c89..224f9e1e6 100644
--- a/src/stage/output/xvdisplayer.cpp
+++ b/src/stage/output/xvdisplayer.cpp
@@ -39,7 +39,7 @@
 
 #include <gdk/gdkx.h>
 
-namespace gui {
+namespace stage {
 namespace output {
   
   XvDisplayer::XvDisplayer(Gtk::Widget *drawing_area,
@@ -242,4 +242,4 @@ namespace output {
   }
   
   
-}}   // namespace gui::output
+}}   // namespace stage::output
diff --git a/src/stage/output/xvdisplayer.hpp b/src/stage/output/xvdisplayer.hpp
index e4cf6860c..d6345bee2 100644
--- a/src/stage/output/xvdisplayer.hpp
+++ b/src/stage/output/xvdisplayer.hpp
@@ -52,7 +52,7 @@ namespace Gtk {
   class Widget;
 }
 
-namespace gui {
+namespace stage {
 namespace output {
   
   /**
@@ -135,5 +135,5 @@ namespace output {
     };
   
   
-}}   // namespace gui::output
+}}   // namespace stage::output
 #endif // XVDISPLAYER_HPP
diff --git a/src/stage/panel/assets-panel.cpp b/src/stage/panel/assets-panel.cpp
index cd5807e7e..e8eaf11aa 100644
--- a/src/stage/panel/assets-panel.cpp
+++ b/src/stage/panel/assets-panel.cpp
@@ -28,7 +28,7 @@
 #include "stage/gtk-base.hpp"
 #include "stage/panel/assets-panel.hpp"
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   AssetsPanel::AssetsPanel(workspace::PanelManager& panelManager, Gdl::DockItem& dockItem)
@@ -55,4 +55,4 @@ namespace panel{
   }
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
diff --git a/src/stage/panel/assets-panel.hpp b/src/stage/panel/assets-panel.hpp
index 5571d2f32..3ff2395de 100644
--- a/src/stage/panel/assets-panel.hpp
+++ b/src/stage/panel/assets-panel.hpp
@@ -39,7 +39,7 @@
 
 #include "stage/panel/panel.hpp"
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   class AssetsPanel
@@ -67,5 +67,5 @@ namespace panel{
     };
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_ASSETS_PANEL_H*/
diff --git a/src/stage/panel/infobox-panel.cpp b/src/stage/panel/infobox-panel.cpp
index 380c5341e..980ad2f61 100644
--- a/src/stage/panel/infobox-panel.cpp
+++ b/src/stage/panel/infobox-panel.cpp
@@ -30,7 +30,7 @@
 #include "stage/widget/error-log-display.hpp"
 
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   using widget::ErrorLogDisplay;
@@ -138,4 +138,4 @@ namespace panel{
   }
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
diff --git a/src/stage/panel/infobox-panel.hpp b/src/stage/panel/infobox-panel.hpp
index 28bfb2d73..fcaea652c 100644
--- a/src/stage/panel/infobox-panel.hpp
+++ b/src/stage/panel/infobox-panel.hpp
@@ -39,7 +39,7 @@
 
 #include <memory>
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   class ErrorLogDisplay;
 }
@@ -77,5 +77,5 @@ namespace panel{
     };
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_INFOBOX_PANEL_H*/
diff --git a/src/stage/panel/panel.cpp b/src/stage/panel/panel.cpp
index 11b4635c0..f2c2ecb80 100644
--- a/src/stage/panel/panel.cpp
+++ b/src/stage/panel/panel.cpp
@@ -35,7 +35,7 @@
 
 using namespace Gtk;         //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   Panel::Panel (workspace::PanelManager& panelManager
@@ -169,4 +169,4 @@ namespace panel{
   }
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
diff --git a/src/stage/panel/panel.hpp b/src/stage/panel/panel.hpp
index 6d7df022b..6ce6a7539 100644
--- a/src/stage/panel/panel.hpp
+++ b/src/stage/panel/panel.hpp
@@ -35,7 +35,7 @@
 
 #include <gdlmm.h>
 
-namespace gui {
+namespace stage {
 namespace workspace {
   class PanelManager;
   class WorkspaceWindow;
@@ -113,5 +113,5 @@ namespace panel {
     };
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_PANEL_H*/
diff --git a/src/stage/panel/timeline-panel-obsolete.cpp b/src/stage/panel/timeline-panel-obsolete.cpp
index a3847e0c4..7eb17d4f7 100644
--- a/src/stage/panel/timeline-panel-obsolete.cpp
+++ b/src/stage/panel/timeline-panel-obsolete.cpp
@@ -35,9 +35,9 @@
 
 using namespace Gtk;         //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace sigc;
-using namespace gui::widget;
-using namespace gui::widget::timeline;
-using namespace gui::model;
+using namespace stage::widget;
+using namespace stage::widget::timeline;
+using namespace stage::model;
 
 using gui::controller::Controller;
 using gui::ctrl::PlaybackController;
@@ -46,7 +46,7 @@ using std::weak_ptr;
 using util::contains;
 
 
-namespace gui {
+namespace stage {
 namespace panel {
     
   const int TimelinePanelObsolete::ZoomToolSteps = 2; // 2 seems comfortable
@@ -408,4 +408,4 @@ namespace panel {
     return shared_ptr<TimelineState>();
   }
   
-}}   // namespace gui::panel
+}}   // namespace stage::panel
diff --git a/src/stage/panel/timeline-panel-obsolete.hpp b/src/stage/panel/timeline-panel-obsolete.hpp
index 1a9171f92..f066fa99a 100644
--- a/src/stage/panel/timeline-panel-obsolete.hpp
+++ b/src/stage/panel/timeline-panel-obsolete.hpp
@@ -42,9 +42,9 @@
 #include <memory>
 #include <map>
 
-using namespace gui::widget;      /////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget;      /////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui  {
+namespace stage  {
 namespace model{
     class Sequence;
   }
@@ -206,5 +206,5 @@ namespace model{
     };
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_TIMELINE_PANEL_OBSOLETE_H*/
diff --git a/src/stage/panel/timeline-panel.cpp b/src/stage/panel/timeline-panel.cpp
index de8d650d3..0dd160bb3 100644
--- a/src/stage/panel/timeline-panel.cpp
+++ b/src/stage/panel/timeline-panel.cpp
@@ -39,7 +39,7 @@
 using std::make_unique;
 
 
-namespace gui {
+namespace stage {
 namespace panel {
   
   using timeline::TimelinePage;
@@ -96,4 +96,4 @@ namespace panel {
   }
   
   
-}}   // namespace gui::panel
+}}   // namespace stage::panel
diff --git a/src/stage/panel/timeline-panel.hpp b/src/stage/panel/timeline-panel.hpp
index b5f599440..6b0a4fcc4 100644
--- a/src/stage/panel/timeline-panel.hpp
+++ b/src/stage/panel/timeline-panel.hpp
@@ -50,7 +50,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   
@@ -85,5 +85,5 @@ namespace panel{
     };
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_TIMELINE_PANEL_H*/
diff --git a/src/stage/panel/viewer-panel.cpp b/src/stage/panel/viewer-panel.cpp
index 4903fd487..e60abeb15 100644
--- a/src/stage/panel/viewer-panel.cpp
+++ b/src/stage/panel/viewer-panel.cpp
@@ -34,10 +34,10 @@
 
 
 using namespace Gtk;                   ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget;           ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::controller;       ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget;           ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::controller;       ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace panel {
   
   ViewerPanel::ViewerPanel (workspace::PanelManager& panelManager
@@ -74,4 +74,4 @@ namespace panel {
   }
   
   
-}}// namespace gui::panel
+}}// namespace stage::panel
diff --git a/src/stage/panel/viewer-panel.hpp b/src/stage/panel/viewer-panel.hpp
index c4d24dd92..665a50270 100644
--- a/src/stage/panel/viewer-panel.hpp
+++ b/src/stage/panel/viewer-panel.hpp
@@ -33,7 +33,7 @@
 #include "stage/widget/video-display-widget.hpp"
 #include "stage/ctrl/playback-controller.hpp"
 
-namespace gui  {
+namespace stage  {
 namespace panel{
   
   /**
@@ -60,5 +60,5 @@ namespace panel{
       widget::VideoDisplayWidget display_;
     };
   
-}}// namespace gui::panel
+}}// namespace stage::panel
 #endif /*STAGE_PANEL_VIEWER_PANEL_H*/
diff --git a/src/stage/setting/asset-controller.cpp b/src/stage/setting/asset-controller.cpp
index d54d3a418..c34e07d65 100644
--- a/src/stage/setting/asset-controller.cpp
+++ b/src/stage/setting/asset-controller.cpp
@@ -39,7 +39,7 @@ using lib::diff::TreeMutator;
 //using util::isnil;
 
 
-namespace gui {
+namespace stage {
 namespace setting {
   
   
@@ -74,4 +74,4 @@ namespace setting {
   
   
   
-}}// namespace gui::setting
+}}// namespace stage::setting
diff --git a/src/stage/setting/asset-controller.hpp b/src/stage/setting/asset-controller.hpp
index 7f761551c..33770d389 100644
--- a/src/stage/setting/asset-controller.hpp
+++ b/src/stage/setting/asset-controller.hpp
@@ -58,7 +58,7 @@
 //#include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace setting {
   
 //  using std::unique_ptr;
@@ -91,5 +91,5 @@ namespace setting {
   
   
   
-}}// namespace gui::setting
+}}// namespace stage::setting
 #endif /*STAGE_SETTING_ASSET_CONTROLLER_H*/
diff --git a/src/stage/style-scheme.cpp b/src/stage/style-scheme.cpp
index 14c2d5ae8..986b37d25 100644
--- a/src/stage/style-scheme.cpp
+++ b/src/stage/style-scheme.cpp
@@ -31,7 +31,7 @@
 #include "stage/gtk-base.hpp"
 #include "stage/style-scheme.hpp"
 
-namespace gui {
+namespace stage {
   
   const Literal TAG_ERROR{"ERROR"};              ////////////////////////////////////////////////////////////TICKET #1168 : find a way to manage style of custom extended UI elements
   const Literal TAG_WARN{"WARN"};
@@ -44,4 +44,4 @@ namespace gui {
   
   
   
-}// namespace gui
+}// namespace stage
diff --git a/src/stage/style-scheme.hpp b/src/stage/style-scheme.hpp
index fe380ddf6..90a1e6499 100644
--- a/src/stage/style-scheme.hpp
+++ b/src/stage/style-scheme.hpp
@@ -40,7 +40,7 @@
 namespace Glib {
   class ustring;
 }
-namespace gui {
+namespace stage {
   
   using lib::Literal;
   using cuString = const Glib::ustring;
@@ -54,5 +54,5 @@ namespace gui {
   
   
   
-}// namespace gui
+}// namespace stage
 #endif /*STAGE_STYLE_SCHEME_H*/
diff --git a/src/stage/timeline/body-canvas-widget.cpp b/src/stage/timeline/body-canvas-widget.cpp
index 31ea944b1..79caa3729 100644
--- a/src/stage/timeline/body-canvas-widget.cpp
+++ b/src/stage/timeline/body-canvas-widget.cpp
@@ -53,7 +53,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -102,4 +102,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/body-canvas-widget.hpp b/src/stage/timeline/body-canvas-widget.hpp
index 50278bda4..932a8cb57 100644
--- a/src/stage/timeline/body-canvas-widget.hpp
+++ b/src/stage/timeline/body-canvas-widget.hpp
@@ -66,7 +66,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   class TrackBody;
@@ -102,5 +102,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_BODY_CANVAS_WIDGET_H*/
diff --git a/src/stage/timeline/clip-presenter.cpp b/src/stage/timeline/clip-presenter.cpp
index 735521aeb..7e381d6ec 100644
--- a/src/stage/timeline/clip-presenter.cpp
+++ b/src/stage/timeline/clip-presenter.cpp
@@ -58,7 +58,7 @@ using std::make_unique;
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -154,4 +154,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/clip-presenter.hpp b/src/stage/timeline/clip-presenter.hpp
index 054ba1ef8..3db3f3a1f 100644
--- a/src/stage/timeline/clip-presenter.hpp
+++ b/src/stage/timeline/clip-presenter.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using std::vector;
@@ -102,5 +102,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_CLIP_PRESENTER_H*/
diff --git a/src/stage/timeline/clip-widget.cpp b/src/stage/timeline/clip-widget.cpp
index 676096ae2..a3eae6399 100644
--- a/src/stage/timeline/clip-widget.cpp
+++ b/src/stage/timeline/clip-widget.cpp
@@ -57,7 +57,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -76,4 +76,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/clip-widget.hpp b/src/stage/timeline/clip-widget.hpp
index 29e085851..42551bd43 100644
--- a/src/stage/timeline/clip-widget.hpp
+++ b/src/stage/timeline/clip-widget.hpp
@@ -110,7 +110,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -128,5 +128,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_CLIP_WIDGET_H*/
diff --git a/src/stage/timeline/header-pane-widget.hpp b/src/stage/timeline/header-pane-widget.hpp
index 49413c356..de2c37606 100644
--- a/src/stage/timeline/header-pane-widget.hpp
+++ b/src/stage/timeline/header-pane-widget.hpp
@@ -60,7 +60,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using PAdjustment = Glib::RefPtr<Gtk::Adjustment>;
@@ -106,5 +106,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_HEADER_PANE_WIDGET_H*/
diff --git a/src/stage/timeline/marker-widget.cpp b/src/stage/timeline/marker-widget.cpp
index c18413f49..1eafb4c06 100644
--- a/src/stage/timeline/marker-widget.cpp
+++ b/src/stage/timeline/marker-widget.cpp
@@ -55,7 +55,7 @@ using lib::diff::TreeMutator;
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -97,4 +97,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/marker-widget.hpp b/src/stage/timeline/marker-widget.hpp
index e42c8fe47..7f147ca0f 100644
--- a/src/stage/timeline/marker-widget.hpp
+++ b/src/stage/timeline/marker-widget.hpp
@@ -49,7 +49,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using std::string;
@@ -87,5 +87,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_MARKER_WIDGET_H*/
diff --git a/src/stage/timeline/navigator-widget.cpp b/src/stage/timeline/navigator-widget.cpp
index 244a3b32e..888dd2159 100644
--- a/src/stage/timeline/navigator-widget.cpp
+++ b/src/stage/timeline/navigator-widget.cpp
@@ -53,7 +53,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -71,4 +71,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/navigator-widget.hpp b/src/stage/timeline/navigator-widget.hpp
index ee9e2ef81..ed59f1a5b 100644
--- a/src/stage/timeline/navigator-widget.hpp
+++ b/src/stage/timeline/navigator-widget.hpp
@@ -50,7 +50,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -69,5 +69,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_NAVIGATOR_WIDGET_H*/
diff --git a/src/stage/timeline/patchbay-widget.cpp b/src/stage/timeline/patchbay-widget.cpp
index 390cc93cd..93dcb23a9 100644
--- a/src/stage/timeline/patchbay-widget.cpp
+++ b/src/stage/timeline/patchbay-widget.cpp
@@ -54,7 +54,7 @@ using Gtk::Adjustment;
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -91,4 +91,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/patchbay-widget.hpp b/src/stage/timeline/patchbay-widget.hpp
index b15cd4e04..9ac995536 100644
--- a/src/stage/timeline/patchbay-widget.hpp
+++ b/src/stage/timeline/patchbay-widget.hpp
@@ -46,7 +46,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using PAdjustment = Glib::RefPtr<Gtk::Adjustment>;
@@ -76,5 +76,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_PATCHBAY_WIDGET_H*/
diff --git a/src/stage/timeline/pipe-widget.cpp b/src/stage/timeline/pipe-widget.cpp
index a8f82fbff..644c4b9d3 100644
--- a/src/stage/timeline/pipe-widget.cpp
+++ b/src/stage/timeline/pipe-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -71,4 +71,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/pipe-widget.hpp b/src/stage/timeline/pipe-widget.hpp
index 296dc90df..5ec07ae76 100644
--- a/src/stage/timeline/pipe-widget.hpp
+++ b/src/stage/timeline/pipe-widget.hpp
@@ -48,7 +48,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -66,5 +66,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_PIPE_WIDGET_H*/
diff --git a/src/stage/timeline/ruler-widget.cpp b/src/stage/timeline/ruler-widget.cpp
index 29edb9aed..60111baee 100644
--- a/src/stage/timeline/ruler-widget.cpp
+++ b/src/stage/timeline/ruler-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -71,4 +71,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/ruler-widget.hpp b/src/stage/timeline/ruler-widget.hpp
index 75a192d74..158c8070d 100644
--- a/src/stage/timeline/ruler-widget.hpp
+++ b/src/stage/timeline/ruler-widget.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -59,5 +59,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_RULER_WIDGET_H*/
diff --git a/src/stage/timeline/timeline-controller.cpp b/src/stage/timeline/timeline-controller.cpp
index 894f8eaf7..4dfe1616c 100644
--- a/src/stage/timeline/timeline-controller.cpp
+++ b/src/stage/timeline/timeline-controller.cpp
@@ -70,7 +70,7 @@ using std::make_unique;
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
 //const int TimelineWidget::TrackPadding = 1;
@@ -174,4 +174,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/timeline-controller.hpp b/src/stage/timeline/timeline-controller.hpp
index 914f2bb83..84c28e851 100644
--- a/src/stage/timeline/timeline-controller.hpp
+++ b/src/stage/timeline/timeline-controller.hpp
@@ -64,7 +64,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using std::unique_ptr;
@@ -124,5 +124,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TIMELINE_CONTROLLER_H*/
diff --git a/src/stage/timeline/timeline-gui.cpp b/src/stage/timeline/timeline-gui.cpp
index cd5cadc28..e48a1f2da 100644
--- a/src/stage/timeline/timeline-gui.cpp
+++ b/src/stage/timeline/timeline-gui.cpp
@@ -44,7 +44,7 @@ using lib::diff::TreeMutator;
 using std::unique_ptr;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -120,4 +120,4 @@ namespace timeline {
   }
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/timeline-gui.hpp b/src/stage/timeline/timeline-gui.hpp
index 2607ab460..c8925b809 100644
--- a/src/stage/timeline/timeline-gui.hpp
+++ b/src/stage/timeline/timeline-gui.hpp
@@ -60,7 +60,7 @@
 #include <memory>
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   class TimelinePage;
@@ -102,5 +102,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TIMELINE_GUI_H*/
diff --git a/src/stage/timeline/timeline-layout.cpp b/src/stage/timeline/timeline-layout.cpp
index 77bd08c0f..15db8a79d 100644
--- a/src/stage/timeline/timeline-layout.cpp
+++ b/src/stage/timeline/timeline-layout.cpp
@@ -53,7 +53,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -91,4 +91,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/timeline-layout.hpp b/src/stage/timeline/timeline-layout.hpp
index 1f8bb4c33..d0c6bb63c 100644
--- a/src/stage/timeline/timeline-layout.hpp
+++ b/src/stage/timeline/timeline-layout.hpp
@@ -93,7 +93,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   class TrackHeadWidget;
@@ -126,5 +126,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TIMELINE_LAYOUT_H*/
diff --git a/src/stage/timeline/timeline-widget-empty.hpp b/src/stage/timeline/timeline-widget-empty.hpp
index fff1d57e1..ebf4a2fee 100644
--- a/src/stage/timeline/timeline-widget-empty.hpp
+++ b/src/stage/timeline/timeline-widget-empty.hpp
@@ -40,7 +40,7 @@
 #include "stage/timeline/timeline-widget.hpp"
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -94,5 +94,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TIMELINE_WIDGET_EMPTY_H*/
diff --git a/src/stage/timeline/timeline-widget.cpp b/src/stage/timeline/timeline-widget.cpp
index 9f393d7ad..5d8a8f26e 100644
--- a/src/stage/timeline/timeline-widget.cpp
+++ b/src/stage/timeline/timeline-widget.cpp
@@ -57,7 +57,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
 //const int TimelineWidget::TrackPadding = 1;
@@ -94,4 +94,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/timeline-widget.hpp b/src/stage/timeline/timeline-widget.hpp
index b8af429ed..75a9d5faf 100644
--- a/src/stage/timeline/timeline-widget.hpp
+++ b/src/stage/timeline/timeline-widget.hpp
@@ -69,12 +69,12 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset{
   class Timeline;
 }}
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using ctrl::BusTerm;
@@ -155,5 +155,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TIMELINE_WIDGET_H*/
diff --git a/src/stage/timeline/track-body.cpp b/src/stage/timeline/track-body.cpp
index e81c238ac..8b297dbbc 100644
--- a/src/stage/timeline/track-body.cpp
+++ b/src/stage/timeline/track-body.cpp
@@ -53,7 +53,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   namespace {
@@ -99,4 +99,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/track-body.hpp b/src/stage/timeline/track-body.hpp
index 1ada02206..3f05000ed 100644
--- a/src/stage/timeline/track-body.hpp
+++ b/src/stage/timeline/track-body.hpp
@@ -50,7 +50,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using ID = ctrl::BusTerm::ID;
@@ -90,5 +90,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TRACK_BODY_H*/
diff --git a/src/stage/timeline/track-head-widget.cpp b/src/stage/timeline/track-head-widget.cpp
index 673c129b8..c5c8601ff 100644
--- a/src/stage/timeline/track-head-widget.cpp
+++ b/src/stage/timeline/track-head-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -98,4 +98,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/track-head-widget.hpp b/src/stage/timeline/track-head-widget.hpp
index 8be6a1dbf..bb7a5812a 100644
--- a/src/stage/timeline/track-head-widget.hpp
+++ b/src/stage/timeline/track-head-widget.hpp
@@ -55,7 +55,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using ID = ctrl::BusTerm::ID;
@@ -87,5 +87,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TRACK_HEAD_WIDGET_H*/
diff --git a/src/stage/timeline/track-presenter.cpp b/src/stage/timeline/track-presenter.cpp
index a337abc7b..87194ec6b 100644
--- a/src/stage/timeline/track-presenter.cpp
+++ b/src/stage/timeline/track-presenter.cpp
@@ -57,7 +57,7 @@ using std::make_unique;
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -159,4 +159,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp
index 8e9878fbf..476e6e991 100644
--- a/src/stage/timeline/track-presenter.hpp
+++ b/src/stage/timeline/track-presenter.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   using std::vector;
@@ -154,5 +154,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TRACK_PRESENTER_H*/
diff --git a/src/stage/timeline/transition-widget.cpp b/src/stage/timeline/transition-widget.cpp
index 4b0906794..100ec0ae9 100644
--- a/src/stage/timeline/transition-widget.cpp
+++ b/src/stage/timeline/transition-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace timeline {
   
   
@@ -71,4 +71,4 @@ namespace timeline {
   
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
diff --git a/src/stage/timeline/transition-widget.hpp b/src/stage/timeline/transition-widget.hpp
index 490f8261d..9af182afa 100644
--- a/src/stage/timeline/transition-widget.hpp
+++ b/src/stage/timeline/transition-widget.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace timeline {
   
   
@@ -59,5 +59,5 @@ namespace timeline {
     };
   
   
-}}// namespace gui::timeline
+}}// namespace stage::timeline
 #endif /*STAGE_TIMELINE_TRANSITION_WIDGET_H*/
diff --git a/src/stage/ui-bus.cpp b/src/stage/ui-bus.cpp
index ee91b4fc9..149194997 100644
--- a/src/stage/ui-bus.cpp
+++ b/src/stage/ui-bus.cpp
@@ -40,7 +40,7 @@
 #include "stage/ctrl/core-service.hpp"
 
 
-namespace gui {
+namespace stage {
   ///////////////////////////////////////////////////////////////////////////////////TICKET #959 : scheduled for termination....
 namespace controller {
     
@@ -56,7 +56,7 @@ namespace controller {
     return playback_;
   }
   
-}// namespace gui::controller
+}// namespace stage::controller
   ///////////////////////////////////////////////////////////////////////////////////TICKET #959 : scheduled for termination....
   
   
@@ -245,4 +245,4 @@ namespace ctrl {
     
     
     
-}}// namespace gui::ctrl
+}}// namespace stage::ctrl
diff --git a/src/stage/ui-bus.hpp b/src/stage/ui-bus.hpp
index f734e486d..82ab047f7 100644
--- a/src/stage/ui-bus.hpp
+++ b/src/stage/ui-bus.hpp
@@ -114,7 +114,7 @@ using std::unique_ptr;
 
 
 
-namespace gui {
+namespace stage {
   ///////////////////////////////////////////////////////////////////////////////////TICKET #959 : scheduled for termination....
   namespace model {
     class Project;
@@ -136,7 +136,7 @@ namespace gui {
         ctrl::PlaybackController& get_playback_controller();
       };
   
-}// namespace gui::controller
+}// namespace stage::controller
   ///////////////////////////////////////////////////////////////////////////////////TICKET #959 : scheduled for termination....
   
   namespace ctrl {
@@ -171,6 +171,6 @@ namespace gui {
   
   
   
-}// namespace gui
+}// namespace stage
 #endif /*STAGE_UI_BUS_H*/
 
diff --git a/src/stage/widget/bin-widget.cpp b/src/stage/widget/bin-widget.cpp
index d5a6fe1d6..0b5bd7ad6 100644
--- a/src/stage/widget/bin-widget.cpp
+++ b/src/stage/widget/bin-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
@@ -71,4 +71,4 @@ namespace widget {
   
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
diff --git a/src/stage/widget/bin-widget.hpp b/src/stage/widget/bin-widget.hpp
index 354cc8312..5ad38803d 100644
--- a/src/stage/widget/bin-widget.hpp
+++ b/src/stage/widget/bin-widget.hpp
@@ -57,7 +57,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   
@@ -75,5 +75,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_BIN_WIDGET_H*/
diff --git a/src/stage/widget/button-bar.cpp b/src/stage/widget/button-bar.cpp
index 4852a8873..8cae79e58 100644
--- a/src/stage/widget/button-bar.cpp
+++ b/src/stage/widget/button-bar.cpp
@@ -30,7 +30,7 @@
 #include "include/logging.h"
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   ButtonBar::ButtonBar()
diff --git a/src/stage/widget/button-bar.hpp b/src/stage/widget/button-bar.hpp
index e4cf2a203..fa62eef84 100644
--- a/src/stage/widget/button-bar.hpp
+++ b/src/stage/widget/button-bar.hpp
@@ -31,7 +31,7 @@
 
 #include "stage/widget/mini-button.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   /**
diff --git a/src/stage/widget/element-box-widget.cpp b/src/stage/widget/element-box-widget.cpp
index 001f226b3..b522b5e75 100644
--- a/src/stage/widget/element-box-widget.cpp
+++ b/src/stage/widget/element-box-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
@@ -71,4 +71,4 @@ namespace widget {
   
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
diff --git a/src/stage/widget/element-box-widget.hpp b/src/stage/widget/element-box-widget.hpp
index 7f05265a2..92f5c622c 100644
--- a/src/stage/widget/element-box-widget.hpp
+++ b/src/stage/widget/element-box-widget.hpp
@@ -49,7 +49,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   
@@ -67,5 +67,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_ELEMENT_BOX_WIDGET_H*/
diff --git a/src/stage/widget/error-log-display.hpp b/src/stage/widget/error-log-display.hpp
index 477cc5893..a0de35240 100644
--- a/src/stage/widget/error-log-display.hpp
+++ b/src/stage/widget/error-log-display.hpp
@@ -73,7 +73,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   using util::max;
@@ -333,5 +333,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_ERROR_LOG_DISPLAY_H*/
diff --git a/src/stage/widget/menu-button.cpp b/src/stage/widget/menu-button.cpp
index 8b3483f69..e0265abdb 100644
--- a/src/stage/widget/menu-button.cpp
+++ b/src/stage/widget/menu-button.cpp
@@ -37,7 +37,7 @@ using namespace sigc;     //////////////////////////////////////////////////////
 #define POPUP_SLUG "TheMenu"
 #define POPUP_PATH "/" POPUP_SLUG
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   namespace {
diff --git a/src/stage/widget/menu-button.hpp b/src/stage/widget/menu-button.hpp
index 34af01a38..dde47e8e7 100644
--- a/src/stage/widget/menu-button.hpp
+++ b/src/stage/widget/menu-button.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   using namespace Gtk;       ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
diff --git a/src/stage/widget/mini-button.hpp b/src/stage/widget/mini-button.hpp
index fe1b6ead7..8ccf44fa6 100644
--- a/src/stage/widget/mini-button.hpp
+++ b/src/stage/widget/mini-button.hpp
@@ -33,7 +33,7 @@
 #include "stage/gtk-base.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   /**
diff --git a/src/stage/widget/mixer-widget.cpp b/src/stage/widget/mixer-widget.cpp
index b78672538..b5c5f58fb 100644
--- a/src/stage/widget/mixer-widget.cpp
+++ b/src/stage/widget/mixer-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
@@ -71,4 +71,4 @@ namespace widget {
   
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
diff --git a/src/stage/widget/mixer-widget.hpp b/src/stage/widget/mixer-widget.hpp
index c22e8eaf8..1c58ef23a 100644
--- a/src/stage/widget/mixer-widget.hpp
+++ b/src/stage/widget/mixer-widget.hpp
@@ -60,7 +60,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   
@@ -78,5 +78,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_MIXER_WIDGET_H*/
diff --git a/src/stage/widget/panel-bar.cpp b/src/stage/widget/panel-bar.cpp
index e86ae3b05..56858c553 100644
--- a/src/stage/widget/panel-bar.cpp
+++ b/src/stage/widget/panel-bar.cpp
@@ -41,9 +41,9 @@ using namespace Gtk;        ////////////////////////////////////////////////////
 using namespace Glib;       ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace sigc;       ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace std;        ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::workspace;       //////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::workspace;       //////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
diff --git a/src/stage/widget/panel-bar.hpp b/src/stage/widget/panel-bar.hpp
index fe0e7a1ae..0c7e2c3a7 100644
--- a/src/stage/widget/panel-bar.hpp
+++ b/src/stage/widget/panel-bar.hpp
@@ -38,7 +38,7 @@
 #include <gtkmm.h>
 
 
-namespace gui {
+namespace stage {
   namespace panel {
     class Panel;
   }
diff --git a/src/stage/widget/player-widget.cpp b/src/stage/widget/player-widget.cpp
index d5694582b..c347c8133 100644
--- a/src/stage/widget/player-widget.cpp
+++ b/src/stage/widget/player-widget.cpp
@@ -52,7 +52,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
@@ -71,4 +71,4 @@ namespace widget {
   
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
diff --git a/src/stage/widget/player-widget.hpp b/src/stage/widget/player-widget.hpp
index 74b461e2a..acbecca27 100644
--- a/src/stage/widget/player-widget.hpp
+++ b/src/stage/widget/player-widget.hpp
@@ -59,7 +59,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   
@@ -77,5 +77,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_PLAYER_WIDGET_H*/
diff --git a/src/stage/widget/switchboard-widget.cpp b/src/stage/widget/switchboard-widget.cpp
index 54a799af0..304795842 100644
--- a/src/stage/widget/switchboard-widget.cpp
+++ b/src/stage/widget/switchboard-widget.cpp
@@ -53,7 +53,7 @@
 //using std::endl;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   
@@ -72,4 +72,4 @@ namespace widget {
   
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
diff --git a/src/stage/widget/switchboard-widget.hpp b/src/stage/widget/switchboard-widget.hpp
index cd0fabcab..94439b713 100644
--- a/src/stage/widget/switchboard-widget.hpp
+++ b/src/stage/widget/switchboard-widget.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace gui  {
+namespace stage  {
 namespace widget {
   
   
@@ -81,5 +81,5 @@ namespace widget {
     };
   
   
-}}// namespace gui::widget
+}}// namespace stage::widget
 #endif /*STAGE_WIDGET_SWITCHBOARD_WIDGET_H*/
diff --git a/src/stage/widget/timecode-widget.cpp b/src/stage/widget/timecode-widget.cpp
index edac1e5ac..c0b55baa0 100644
--- a/src/stage/widget/timecode-widget.cpp
+++ b/src/stage/widget/timecode-widget.cpp
@@ -52,7 +52,7 @@ using sigc::bind;
 using std::string;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   using namespace Gtk;       ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
diff --git a/src/stage/widget/timecode-widget.hpp b/src/stage/widget/timecode-widget.hpp
index 1ac9e49dd..cf919061f 100644
--- a/src/stage/widget/timecode-widget.hpp
+++ b/src/stage/widget/timecode-widget.hpp
@@ -47,7 +47,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   using lib::time::Time;
diff --git a/src/stage/widget/timeline-widget.cpp b/src/stage/widget/timeline-widget.cpp
index e5d0025d7..d9b010319 100644
--- a/src/stage/widget/timeline-widget.cpp
+++ b/src/stage/widget/timeline-widget.cpp
@@ -42,9 +42,9 @@ using std::dynamic_pointer_cast;
 using namespace Gtk;         ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
 using namespace util;        ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget::timeline;       ////////////TODO OK this one looks more sensible, but why do we need to refer to such a nested space so much?
+using namespace stage::widget::timeline;       ////////////TODO OK this one looks more sensible, but why do we need to refer to such a nested space so much?
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   const int TimelineWidget::TrackPadding = 1;
diff --git a/src/stage/widget/timeline-widget.hpp b/src/stage/widget/timeline-widget.hpp
index 80ab3d490..da7a9b628 100644
--- a/src/stage/widget/timeline-widget.hpp
+++ b/src/stage/widget/timeline-widget.hpp
@@ -55,7 +55,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   using lib::time::Time;
diff --git a/src/stage/widget/timeline/basic-draw-strategy.hpp b/src/stage/widget/timeline/basic-draw-strategy.hpp
index 35a44749a..853d07038 100644
--- a/src/stage/widget/timeline/basic-draw-strategy.hpp
+++ b/src/stage/widget/timeline/basic-draw-strategy.hpp
@@ -33,7 +33,7 @@
 #include "stage/widget/timeline/draw-strategy.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -50,5 +50,5 @@ namespace timeline {
            ,TimelineViewWindow* const window)  const;
     };
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_BASIC_DRAW_STRATEGY_H*/
diff --git a/src/stage/widget/timeline/draw-strategy.cpp b/src/stage/widget/timeline/draw-strategy.cpp
index 7446ec3a0..8f88a66f8 100644
--- a/src/stage/widget/timeline/draw-strategy.cpp
+++ b/src/stage/widget/timeline/draw-strategy.cpp
@@ -29,7 +29,7 @@
 
 #include "stage/widget/timeline/basic-draw-strategy.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -69,4 +69,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/draw-strategy.hpp b/src/stage/widget/timeline/draw-strategy.hpp
index b9a8b9221..74f789acb 100644
--- a/src/stage/widget/timeline/draw-strategy.hpp
+++ b/src/stage/widget/timeline/draw-strategy.hpp
@@ -37,7 +37,7 @@
 #include "stage/widget/timeline/timeline-entity.hpp"
 #include "stage/widget/timeline/timeline-view-window.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -66,5 +66,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_DRAW_STRATEGY_HPP*/
diff --git a/src/stage/widget/timeline/timeline-arrow-tool.cpp b/src/stage/widget/timeline/timeline-arrow-tool.cpp
index b83297e6f..79207dec6 100644
--- a/src/stage/widget/timeline/timeline-arrow-tool.cpp
+++ b/src/stage/widget/timeline/timeline-arrow-tool.cpp
@@ -28,7 +28,7 @@
 
 #include "stage/widget/timeline/timeline-arrow-tool.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -105,4 +105,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-arrow-tool.hpp b/src/stage/widget/timeline/timeline-arrow-tool.hpp
index 69a325b78..9e5c5bdc8 100644
--- a/src/stage/widget/timeline/timeline-arrow-tool.hpp
+++ b/src/stage/widget/timeline/timeline-arrow-tool.hpp
@@ -37,7 +37,7 @@
 
 #include "lib/time/timevalue.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
 
@@ -89,5 +89,5 @@ namespace timeline {
   };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_ARROW_TOOL_H*/
diff --git a/src/stage/widget/timeline/timeline-body.cpp b/src/stage/widget/timeline/timeline-body.cpp
index f54aec9b5..8aa2b4527 100644
--- a/src/stage/widget/timeline/timeline-body.cpp
+++ b/src/stage/widget/timeline/timeline-body.cpp
@@ -45,7 +45,7 @@ using namespace lumiera;     ///////////////////////////////////////////////////
 using gui::draw::CairoUtil;
 using std::shared_ptr;
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
 
@@ -543,4 +543,4 @@ TimelineBody::read_styles()
 }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-body.hpp b/src/stage/widget/timeline/timeline-body.hpp
index 3c48d7bb1..6db0f6bbd 100644
--- a/src/stage/widget/timeline/timeline-body.hpp
+++ b/src/stage/widget/timeline/timeline-body.hpp
@@ -34,7 +34,7 @@
 
 #include <memory>
 
-namespace gui {
+namespace stage {
 
 namespace model {
 class Track;
@@ -213,5 +213,5 @@ private:
 };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_BODY_H*/
diff --git a/src/stage/widget/timeline/timeline-clip-track.cpp b/src/stage/widget/timeline/timeline-clip-track.cpp
index dc133b493..f4c4ed74f 100644
--- a/src/stage/widget/timeline/timeline-clip-track.cpp
+++ b/src/stage/widget/timeline/timeline-clip-track.cpp
@@ -37,7 +37,7 @@ using namespace Gtk;         ///////////////////////////////////////////////////
 using std::shared_ptr;
 using util::contains;
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -163,4 +163,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-clip-track.hpp b/src/stage/widget/timeline/timeline-clip-track.hpp
index b4de3d6ba..5536efaac 100644
--- a/src/stage/widget/timeline/timeline-clip-track.hpp
+++ b/src/stage/widget/timeline/timeline-clip-track.hpp
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -109,5 +109,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_CLIP_TRACK_H*/
diff --git a/src/stage/widget/timeline/timeline-clip.cpp b/src/stage/widget/timeline/timeline-clip.cpp
index 7c61bf42a..a6de21420 100644
--- a/src/stage/widget/timeline/timeline-clip.cpp
+++ b/src/stage/widget/timeline/timeline-clip.cpp
@@ -28,7 +28,7 @@
 
 #include "stage/widget/timeline/timeline-clip.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -75,4 +75,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-clip.hpp b/src/stage/widget/timeline/timeline-clip.hpp
index ade812956..9b98d8dfa 100644
--- a/src/stage/widget/timeline/timeline-clip.hpp
+++ b/src/stage/widget/timeline/timeline-clip.hpp
@@ -39,7 +39,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -71,5 +71,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_CLIP_H*/
diff --git a/src/stage/widget/timeline/timeline-entity.cpp b/src/stage/widget/timeline/timeline-entity.cpp
index 4e2f32e72..7c8ce6407 100644
--- a/src/stage/widget/timeline/timeline-entity.cpp
+++ b/src/stage/widget/timeline/timeline-entity.cpp
@@ -31,7 +31,7 @@
 #include "stage/widget/timeline/timeline-entity.hpp"
 #include "stage/widget/timeline/draw-strategy.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -68,4 +68,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-entity.hpp b/src/stage/widget/timeline/timeline-entity.hpp
index af9c4ea2f..137ae5c87 100644
--- a/src/stage/widget/timeline/timeline-entity.hpp
+++ b/src/stage/widget/timeline/timeline-entity.hpp
@@ -37,7 +37,7 @@
 #include <cairomm/cairomm.h>
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -88,5 +88,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_ENTITY_H*/
diff --git a/src/stage/widget/timeline/timeline-group-track.cpp b/src/stage/widget/timeline/timeline-group-track.cpp
index cdbe34a4c..b3b9079ca 100644
--- a/src/stage/widget/timeline/timeline-group-track.cpp
+++ b/src/stage/widget/timeline/timeline-group-track.cpp
@@ -33,7 +33,7 @@
 using namespace Gtk;         ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace sigc;        ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -63,4 +63,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-group-track.hpp b/src/stage/widget/timeline/timeline-group-track.hpp
index 00d8eda87..2a324b14d 100644
--- a/src/stage/widget/timeline/timeline-group-track.hpp
+++ b/src/stage/widget/timeline/timeline-group-track.hpp
@@ -34,7 +34,7 @@
 #include "stage/widget/timeline/timeline-track.hpp"
 #include "stage/model/group-track.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -54,5 +54,5 @@ namespace timeline {
     };
     
     
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_GROUP_TRACK_H*/
diff --git a/src/stage/widget/timeline/timeline-header-container.cpp b/src/stage/widget/timeline/timeline-header-container.cpp
index 71fe03960..a3bbec4da 100644
--- a/src/stage/widget/timeline/timeline-header-container.cpp
+++ b/src/stage/widget/timeline/timeline-header-container.cpp
@@ -40,7 +40,7 @@ using std::shared_ptr;
 using namespace Gtk;         ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace util;        ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -536,4 +536,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-header-container.hpp b/src/stage/widget/timeline/timeline-header-container.hpp
index db485777d..3da423ee1 100644
--- a/src/stage/widget/timeline/timeline-header-container.hpp
+++ b/src/stage/widget/timeline/timeline-header-container.hpp
@@ -35,7 +35,7 @@
 #include "stage/gtk-base.hpp"
 #include "timeline-layout-helper.hpp"
 
-namespace gui {
+namespace stage {
   namespace model {
     class Track;
   }
@@ -272,6 +272,6 @@ namespace gui {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_HEADER_CONTAINER_H*/
 
diff --git a/src/stage/widget/timeline/timeline-header-widget.cpp b/src/stage/widget/timeline/timeline-header-widget.cpp
index 99f530f04..c2b5b4cbb 100644
--- a/src/stage/widget/timeline/timeline-header-widget.cpp
+++ b/src/stage/widget/timeline/timeline-header-widget.cpp
@@ -37,7 +37,7 @@ using namespace util;        ///////////////////////////////////////////////////
 
 using std::shared_ptr;
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -343,4 +343,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-header-widget.hpp b/src/stage/widget/timeline/timeline-header-widget.hpp
index 748486f60..b348b380d 100644
--- a/src/stage/widget/timeline/timeline-header-widget.hpp
+++ b/src/stage/widget/timeline/timeline-header-widget.hpp
@@ -32,7 +32,7 @@
 
 #include "stage/gtk-base.hpp"
 
-namespace gui {  
+namespace stage {  
 namespace widget {
 namespace timeline {
   
@@ -181,5 +181,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_HEADER_WIDGET_H*/
diff --git a/src/stage/widget/timeline/timeline-ibeam-tool.cpp b/src/stage/widget/timeline/timeline-ibeam-tool.cpp
index 9bdf3e5b8..6890a8bc6 100644
--- a/src/stage/widget/timeline/timeline-ibeam-tool.cpp
+++ b/src/stage/widget/timeline/timeline-ibeam-tool.cpp
@@ -30,13 +30,13 @@
 #include "stage/widget/timeline-widget.hpp"
 #include "lib/time/mutation.hpp"
 
-using namespace gui::widget;     ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget;     ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
 using lib::time::Mutation;
 using std::shared_ptr;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -265,4 +265,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-ibeam-tool.hpp b/src/stage/widget/timeline/timeline-ibeam-tool.hpp
index f7b1ced33..de82f500f 100644
--- a/src/stage/widget/timeline/timeline-ibeam-tool.hpp
+++ b/src/stage/widget/timeline/timeline-ibeam-tool.hpp
@@ -35,7 +35,7 @@
 #include "lib/time/control.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -208,5 +208,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_IBEAM_TOOL_H*/
diff --git a/src/stage/widget/timeline/timeline-layout-helper.cpp b/src/stage/widget/timeline/timeline-layout-helper.cpp
index ceb6a54f4..1cf167c79 100644
--- a/src/stage/widget/timeline/timeline-layout-helper.cpp
+++ b/src/stage/widget/timeline/timeline-layout-helper.cpp
@@ -45,9 +45,9 @@ using std::dynamic_pointer_cast;
 using namespace Gtk;           ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace lumiera;       ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace util;          ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::draw;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::draw;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -706,4 +706,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-layout-helper.hpp b/src/stage/widget/timeline/timeline-layout-helper.hpp
index f50c7310a..27385c9e0 100644
--- a/src/stage/widget/timeline/timeline-layout-helper.hpp
+++ b/src/stage/widget/timeline/timeline-layout-helper.hpp
@@ -37,7 +37,7 @@
 #include <boost/optional.hpp>
 
 
-namespace gui {
+namespace stage {
   
   namespace model {
     class Track;
@@ -432,5 +432,5 @@ namespace gui {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_LAYOUT_HELPER_H*/
diff --git a/src/stage/widget/timeline/timeline-ruler.cpp b/src/stage/widget/timeline/timeline-ruler.cpp
index caceb0eb4..8818ce43d 100644
--- a/src/stage/widget/timeline/timeline-ruler.cpp
+++ b/src/stage/widget/timeline/timeline-ruler.cpp
@@ -38,9 +38,9 @@
 
 using namespace Gtk;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace Cairo;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget::timeline;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget::timeline;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
 using std::shared_ptr;
 using gui::draw::CairoUtil;
@@ -48,7 +48,7 @@ using lib::time::Time;
 using lib::time::TimeVar;
 
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -707,4 +707,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-ruler.hpp b/src/stage/widget/timeline/timeline-ruler.hpp
index 0c612dcd3..2f039d1ed 100644
--- a/src/stage/widget/timeline/timeline-ruler.hpp
+++ b/src/stage/widget/timeline/timeline-ruler.hpp
@@ -35,7 +35,7 @@
 #include "stage/widget/timeline/timeline-state.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace widget {
     class TimelineWidget;
   
@@ -253,6 +253,6 @@ namespace widget {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_RULER_H*/
 
diff --git a/src/stage/widget/timeline/timeline-state.cpp b/src/stage/widget/timeline/timeline-state.cpp
index cb9034600..eda000261 100644
--- a/src/stage/widget/timeline/timeline-state.cpp
+++ b/src/stage/widget/timeline/timeline-state.cpp
@@ -35,7 +35,7 @@
 using namespace Gtk;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace sigc;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -146,4 +146,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-state.hpp b/src/stage/widget/timeline/timeline-state.hpp
index 43ee84628..94a5f07c6 100644
--- a/src/stage/widget/timeline/timeline-state.hpp
+++ b/src/stage/widget/timeline/timeline-state.hpp
@@ -40,7 +40,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
   namespace model {
     class Sequence;
   }  
@@ -225,5 +225,5 @@ namespace gui {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_STATE_H*/
diff --git a/src/stage/widget/timeline/timeline-tool.cpp b/src/stage/widget/timeline/timeline-tool.cpp
index c102a7274..1dcc9fe0c 100644
--- a/src/stage/widget/timeline/timeline-tool.cpp
+++ b/src/stage/widget/timeline/timeline-tool.cpp
@@ -33,7 +33,7 @@
 using namespace Gdk;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using std::shared_ptr;
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -122,4 +122,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-tool.hpp b/src/stage/widget/timeline/timeline-tool.hpp
index 27b5d312f..3ea2ef271 100644
--- a/src/stage/widget/timeline/timeline-tool.hpp
+++ b/src/stage/widget/timeline/timeline-tool.hpp
@@ -36,7 +36,7 @@
 
 #include <memory>
 
-namespace gui {
+namespace stage {
 namespace widget {
   class TimelineWidget;
   
@@ -152,5 +152,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_TOOL_H*/
diff --git a/src/stage/widget/timeline/timeline-track.cpp b/src/stage/widget/timeline/timeline-track.cpp
index 79e287382..6aab8e8da 100644
--- a/src/stage/widget/timeline/timeline-track.cpp
+++ b/src/stage/widget/timeline/timeline-track.cpp
@@ -39,7 +39,7 @@ using namespace sigc;         //////////////////////////////////////////////////
 
 using std::shared_ptr;
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -364,4 +364,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-track.hpp b/src/stage/widget/timeline/timeline-track.hpp
index c41298d60..a45610831 100644
--- a/src/stage/widget/timeline/timeline-track.hpp
+++ b/src/stage/widget/timeline/timeline-track.hpp
@@ -46,7 +46,7 @@
 #include <memory>
 
 
-namespace gui {
+namespace stage {
 namespace widget { 
 namespace timeline {
   
@@ -264,5 +264,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_TRACK_H*/
diff --git a/src/stage/widget/timeline/timeline-view-window.cpp b/src/stage/widget/timeline/timeline-view-window.cpp
index a93313fe8..d8e4e5bd2 100644
--- a/src/stage/widget/timeline/timeline-view-window.cpp
+++ b/src/stage/widget/timeline/timeline-view-window.cpp
@@ -32,10 +32,10 @@
 
 
 using namespace Gtk;         ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget; ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace lumiera;     ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -168,4 +168,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-view-window.hpp b/src/stage/widget/timeline/timeline-view-window.hpp
index e9bae3ccd..74743757b 100644
--- a/src/stage/widget/timeline/timeline-view-window.hpp
+++ b/src/stage/widget/timeline/timeline-view-window.hpp
@@ -34,7 +34,7 @@
 #include "stage/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
   class TimelineWidget;
   
@@ -167,5 +167,5 @@ namespace widget {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_VIEW_WINDOW_H*/
diff --git a/src/stage/widget/timeline/timeline-zoom-scale.cpp b/src/stage/widget/timeline/timeline-zoom-scale.cpp
index 3b97ed393..c3a70df00 100644
--- a/src/stage/widget/timeline/timeline-zoom-scale.cpp
+++ b/src/stage/widget/timeline/timeline-zoom-scale.cpp
@@ -32,7 +32,7 @@
 
 using namespace Gtk;         ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 
 class TimelineWidget;
@@ -156,4 +156,4 @@ namespace timeline {
   }
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
diff --git a/src/stage/widget/timeline/timeline-zoom-scale.hpp b/src/stage/widget/timeline/timeline-zoom-scale.hpp
index f3922e0cf..1b73a46bb 100644
--- a/src/stage/widget/timeline/timeline-zoom-scale.hpp
+++ b/src/stage/widget/timeline/timeline-zoom-scale.hpp
@@ -37,9 +37,9 @@
 #include "stage/widget/timeline/timeline-state.hpp"
 
 using namespace Gtk;         ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
-using namespace gui::widget;    ////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::widget;    ////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 namespace timeline {
   
@@ -97,5 +97,5 @@ namespace timeline {
     };
   
   
-}}}// namespace gui::widget::timeline
+}}}// namespace stage::widget::timeline
 #endif /*STAGE_WIDGET_TIMELINE_ZOOM_SCALE_H*/
diff --git a/src/stage/widget/video-display-widget.cpp b/src/stage/widget/video-display-widget.cpp
index e50a30979..972ecf5ef 100644
--- a/src/stage/widget/video-display-widget.cpp
+++ b/src/stage/widget/video-display-widget.cpp
@@ -33,7 +33,7 @@
 
 #include "video-display-widget.hpp"
 
-namespace gui {
+namespace stage {
 namespace widget {
   
   VideoDisplayWidget::VideoDisplayWidget()
diff --git a/src/stage/widget/video-display-widget.hpp b/src/stage/widget/video-display-widget.hpp
index 1c2d3b6eb..880c78b91 100644
--- a/src/stage/widget/video-display-widget.hpp
+++ b/src/stage/widget/video-display-widget.hpp
@@ -36,9 +36,9 @@
 #include "stage/output/displayer.hpp"
 
 
-using namespace gui::output;  ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::output;  ///////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace widget {
 
   /**
diff --git a/src/stage/workspace/dock-area.cpp b/src/stage/workspace/dock-area.cpp
index 4e076ef67..9efd5ab44 100644
--- a/src/stage/workspace/dock-area.cpp
+++ b/src/stage/workspace/dock-area.cpp
@@ -48,7 +48,7 @@ using namespace boost;       ///////////////////////////////////////////////////
 using namespace std;         ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace Gtk;         ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   const DockArea::PanelDescription
@@ -388,4 +388,4 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
diff --git a/src/stage/workspace/dock-area.hpp b/src/stage/workspace/dock-area.hpp
index cd0571e72..f323807a9 100644
--- a/src/stage/workspace/dock-area.hpp
+++ b/src/stage/workspace/dock-area.hpp
@@ -45,9 +45,9 @@
 #include <typeinfo>
 
 
-using namespace gui::panel;       ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::panel;       ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   
@@ -365,5 +365,5 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_WORKSPACE_DOCK_AREA_H*/
diff --git a/src/stage/workspace/panel-manager.cpp b/src/stage/workspace/panel-manager.cpp
index ad53fdc83..983c3f22b 100644
--- a/src/stage/workspace/panel-manager.cpp
+++ b/src/stage/workspace/panel-manager.cpp
@@ -43,7 +43,7 @@ using namespace boost;       ///////////////////////////////////////////////////
 using namespace std;         ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 using namespace Gtk;         ////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   const PanelManager::PanelDescription
@@ -380,4 +380,4 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
diff --git a/src/stage/workspace/panel-manager.hpp b/src/stage/workspace/panel-manager.hpp
index 1b4a619eb..dfbbab21e 100644
--- a/src/stage/workspace/panel-manager.hpp
+++ b/src/stage/workspace/panel-manager.hpp
@@ -40,9 +40,9 @@
 #include <typeinfo>
 
 
-using namespace gui::panel;       ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
+using namespace stage::panel;       ///////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   
@@ -357,5 +357,5 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_WORKSPACE_PANEL_MANAGER_H*/
diff --git a/src/stage/workspace/ui-style.cpp b/src/stage/workspace/ui-style.cpp
index e57796bb0..5212261b6 100644
--- a/src/stage/workspace/ui-style.cpp
+++ b/src/stage/workspace/ui-style.cpp
@@ -45,7 +45,7 @@ using Gtk::IconFactory;
 using util::cStr;
 
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   namespace fsys = boost::filesystem;
@@ -304,4 +304,4 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
diff --git a/src/stage/workspace/ui-style.hpp b/src/stage/workspace/ui-style.hpp
index d87cb200a..bce2abad0 100644
--- a/src/stage/workspace/ui-style.hpp
+++ b/src/stage/workspace/ui-style.hpp
@@ -43,7 +43,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
   
   namespace model      { class Project; }           ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
   namespace controller { class Controller; }        ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
@@ -198,5 +198,5 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_WORKSPACE_UI_STYLE_H*/
diff --git a/src/stage/workspace/workspace-window.cpp b/src/stage/workspace/workspace-window.cpp
index 56a95fda0..f82562087 100644
--- a/src/stage/workspace/workspace-window.cpp
+++ b/src/stage/workspace/workspace-window.cpp
@@ -35,7 +35,7 @@
 
 
 
-namespace gui {
+namespace stage {
 namespace workspace {
   
   using ctrl::UiManager;
@@ -100,4 +100,4 @@ namespace workspace {
   
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
diff --git a/src/stage/workspace/workspace-window.hpp b/src/stage/workspace/workspace-window.hpp
index b33fbda10..803ae84d2 100644
--- a/src/stage/workspace/workspace-window.hpp
+++ b/src/stage/workspace/workspace-window.hpp
@@ -36,7 +36,7 @@
 #include "stage/workspace/panel-manager.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace ctrl {
   class UiManager;
 }
@@ -72,5 +72,5 @@ namespace workspace {
     };
   
   
-}}// namespace gui::workspace
+}}// namespace stage::workspace
 #endif /*STAGE_WORKSPACE_WORKSPACE_WINDOW_H*/
diff --git a/src/steam/asset.cpp b/src/steam/asset.cpp
index bf1556c7d..85055c5c8 100644
--- a/src/steam/asset.cpp
+++ b/src/steam/asset.cpp
@@ -48,7 +48,7 @@ using util::cStr;
 using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
@@ -208,4 +208,4 @@ namespace asset {
   }
 
   
-}} // namespace proc::asset
+}} // namespace steam::asset
diff --git a/src/steam/asset.hpp b/src/steam/asset.hpp
index 3b30b6db6..3a4171a45 100644
--- a/src/steam/asset.hpp
+++ b/src/steam/asset.hpp
@@ -77,7 +77,7 @@ using std::vector;
 using std::set;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   namespace error = lumiera::error;
@@ -350,7 +350,7 @@ namespace asset {
   ID<KIND> ID<KIND>::INVALID = ID{0};
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 
 
 
diff --git a/src/steam/asset/buildinstruct.hpp b/src/steam/asset/buildinstruct.hpp
index 96d87c4f3..80d7ab8ee 100644
--- a/src/steam/asset/buildinstruct.hpp
+++ b/src/steam/asset/buildinstruct.hpp
@@ -41,7 +41,7 @@ using std::string;
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
 
   using lib::Symbol;
@@ -130,5 +130,5 @@ namespace asset {
     
     
     
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/category.cpp b/src/steam/asset/category.cpp
index 1d0406a67..3c77eab54 100644
--- a/src/steam/asset/category.cpp
+++ b/src/steam/asset/category.cpp
@@ -35,7 +35,7 @@
 using boost::algorithm::starts_with;
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /** human readable representation of the asset::Category.
diff --git a/src/steam/asset/category.hpp b/src/steam/asset/category.hpp
index b7abfd70b..618cd6c62 100644
--- a/src/steam/asset/category.hpp
+++ b/src/steam/asset/category.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::Literal;
@@ -119,5 +119,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/clip.cpp b/src/steam/asset/clip.cpp
index db9f52ea3..33eae0fcc 100644
--- a/src/steam/asset/clip.cpp
+++ b/src/steam/asset/clip.cpp
@@ -32,7 +32,7 @@
 using std::static_pointer_cast;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   namespace {
@@ -111,4 +111,4 @@ namespace asset {
 
 
 
-}} // namespace proc::asset
+}} // namespace steam::asset
diff --git a/src/steam/asset/clip.hpp b/src/steam/asset/clip.hpp
index a36815fab..217e943a0 100644
--- a/src/steam/asset/clip.hpp
+++ b/src/steam/asset/clip.hpp
@@ -35,7 +35,7 @@
 
 /////////////////////////TODO: 1/2010 very likely the handling of the clip-asset needs to be rewritten
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /**
@@ -67,5 +67,5 @@ namespace asset {
   
   
   
-}} // namespace proc:asset
+}} // namespace steam:asset
 #endif
diff --git a/src/steam/asset/codec.hpp b/src/steam/asset/codec.hpp
index 5b42211d9..ebbab5868 100644
--- a/src/steam/asset/codec.hpp
+++ b/src/steam/asset/codec.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /**
@@ -48,5 +48,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/compoundmedia.hpp b/src/steam/asset/compoundmedia.hpp
index d24060b89..ee266527c 100644
--- a/src/steam/asset/compoundmedia.hpp
+++ b/src/steam/asset/compoundmedia.hpp
@@ -39,7 +39,7 @@ using std::vector;
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
 
 
@@ -57,5 +57,5 @@ namespace asset {
     
     
     
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/dataset.hpp b/src/steam/asset/dataset.hpp
index 65bcf56be..f65f07091 100644
--- a/src/steam/asset/dataset.hpp
+++ b/src/steam/asset/dataset.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
@@ -45,5 +45,5 @@ namespace asset {
   class Dataset : public Meta
     {};
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/db.hpp b/src/steam/asset/db.hpp
index 44d163a52..25b884b2c 100644
--- a/src/steam/asset/db.hpp
+++ b/src/steam/asset/db.hpp
@@ -43,7 +43,7 @@
 #include <boost/utility.hpp>
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using std::static_pointer_cast;
@@ -190,5 +190,5 @@ namespace asset {
     };
   
     
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/effect.cpp b/src/steam/asset/effect.cpp
index a6d84d3dd..588d340db 100644
--- a/src/steam/asset/effect.cpp
+++ b/src/steam/asset/effect.cpp
@@ -29,7 +29,7 @@
 
 #include "steam/asset/effect.hpp"
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   Proc::ProcFunc*
diff --git a/src/steam/asset/effect.hpp b/src/steam/asset/effect.hpp
index 5bfcc5a19..4f5a57181 100644
--- a/src/steam/asset/effect.hpp
+++ b/src/steam/asset/effect.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /**
@@ -56,5 +56,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/inventory.hpp b/src/steam/asset/inventory.hpp
index 8602fd840..b81fed3d8 100644
--- a/src/steam/asset/inventory.hpp
+++ b/src/steam/asset/inventory.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
 
 
@@ -51,5 +51,5 @@ namespace asset {
   typedef lib::P<Inventory> PInv;
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/media.cpp b/src/steam/asset/media.cpp
index 5c523d983..33b2d2c68 100644
--- a/src/steam/asset/media.cpp
+++ b/src/steam/asset/media.cpp
@@ -55,7 +55,7 @@ using std::dynamic_pointer_cast;
 
 namespace error = lumiera::error;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   namespace { // Implementation details
diff --git a/src/steam/asset/media.hpp b/src/steam/asset/media.hpp
index c4fad67d3..6c420a336 100644
--- a/src/steam/asset/media.hpp
+++ b/src/steam/asset/media.hpp
@@ -45,7 +45,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   class Clip;
@@ -164,5 +164,5 @@ namespace asset {
     
     
     
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/meta.cpp b/src/steam/asset/meta.cpp
index afe35adc1..84fdaa049 100644
--- a/src/steam/asset/meta.cpp
+++ b/src/steam/asset/meta.cpp
@@ -32,7 +32,7 @@
 
 using lib::idi::EntryID;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using meta::Descriptor;
@@ -86,7 +86,7 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 
 
 
@@ -99,7 +99,7 @@ namespace asset {
 #include "steam/asset/meta/error-log.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using meta::Descriptor;
@@ -114,4 +114,4 @@ namespace asset {
   template Builder<ErrorLog>  MetaFactory::operator() (EntryID<ErrorLog>);
   template Builder<ErrorLog>  MetaFactory::operator() (Descriptor const&, EntryID<ErrorLog>);
   
-}} // namespace proc::asset
+}} // namespace steam::asset
diff --git a/src/steam/asset/meta.hpp b/src/steam/asset/meta.hpp
index ed737af65..ab7f8d8ba 100644
--- a/src/steam/asset/meta.hpp
+++ b/src/steam/asset/meta.hpp
@@ -66,7 +66,7 @@
 #include "lib/nocopy.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   class Meta;
@@ -172,5 +172,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/meta/error-log.cpp b/src/steam/asset/meta/error-log.cpp
index 528dcf0f1..106e2336c 100644
--- a/src/steam/asset/meta/error-log.cpp
+++ b/src/steam/asset/meta/error-log.cpp
@@ -42,7 +42,7 @@
 using std::dynamic_pointer_cast;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace meta {
   
diff --git a/src/steam/asset/meta/error-log.hpp b/src/steam/asset/meta/error-log.hpp
index 61ca8efb3..d46add0ef 100644
--- a/src/steam/asset/meta/error-log.hpp
+++ b/src/steam/asset/meta/error-log.hpp
@@ -48,7 +48,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace meta {
   
@@ -109,5 +109,5 @@ namespace meta {
       
     };
   
-}}} // namespace proc::asset::meta
+}}} // namespace steam::asset::meta
 #endif /*ASSET_META_ERROR_LOG_H*/
diff --git a/src/steam/asset/meta/time-grid.cpp b/src/steam/asset/meta/time-grid.cpp
index cb4c65922..60ba3df21 100644
--- a/src/steam/asset/meta/time-grid.cpp
+++ b/src/steam/asset/meta/time-grid.cpp
@@ -43,7 +43,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
 namespace meta {
   
diff --git a/src/steam/asset/meta/time-grid.hpp b/src/steam/asset/meta/time-grid.hpp
index 81be167ba..024780cd6 100644
--- a/src/steam/asset/meta/time-grid.hpp
+++ b/src/steam/asset/meta/time-grid.hpp
@@ -56,7 +56,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
 namespace meta {
   
@@ -135,5 +135,5 @@ namespace meta {
       
     };
   
-}}} // namespace proc::asset::meta
+}}} // namespace steam::asset::meta
 #endif
diff --git a/src/steam/asset/pipe.cpp b/src/steam/asset/pipe.cpp
index 9cb93ac5b..c6a05fc3f 100644
--- a/src/steam/asset/pipe.cpp
+++ b/src/steam/asset/pipe.cpp
@@ -32,7 +32,7 @@
 
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
diff --git a/src/steam/asset/pipe.hpp b/src/steam/asset/pipe.hpp
index 9ac3657ba..66dea9e82 100644
--- a/src/steam/asset/pipe.hpp
+++ b/src/steam/asset/pipe.hpp
@@ -42,7 +42,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lumiera::Query;
@@ -135,5 +135,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/preview.cpp b/src/steam/asset/preview.cpp
index b0788092d..78b7874f7 100644
--- a/src/steam/asset/preview.cpp
+++ b/src/steam/asset/preview.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/asset/preview.hpp"
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
diff --git a/src/steam/asset/preview.hpp b/src/steam/asset/preview.hpp
index ed309b0c7..1b3ba1f7f 100644
--- a/src/steam/asset/preview.hpp
+++ b/src/steam/asset/preview.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /**
@@ -49,5 +49,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/proc.cpp b/src/steam/asset/proc.cpp
index d3d6a722f..540022dc9 100644
--- a/src/steam/asset/proc.cpp
+++ b/src/steam/asset/proc.cpp
@@ -32,7 +32,7 @@
 #include "include/logging.h"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
diff --git a/src/steam/asset/proc.hpp b/src/steam/asset/proc.hpp
index 071b9beba..8e55f37c7 100644
--- a/src/steam/asset/proc.hpp
+++ b/src/steam/asset/proc.hpp
@@ -42,7 +42,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
@@ -129,5 +129,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/procpatt.cpp b/src/steam/asset/procpatt.cpp
index 5b19d6f82..34c6b34dd 100644
--- a/src/steam/asset/procpatt.cpp
+++ b/src/steam/asset/procpatt.cpp
@@ -34,7 +34,7 @@
 
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   
diff --git a/src/steam/asset/procpatt.hpp b/src/steam/asset/procpatt.hpp
index dd5c6f76b..8e2c349c1 100644
--- a/src/steam/asset/procpatt.hpp
+++ b/src/steam/asset/procpatt.hpp
@@ -40,7 +40,7 @@ using std::vector;
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::Symbol;
@@ -82,5 +82,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/sequence.cpp b/src/steam/asset/sequence.cpp
index 95c4d4eaf..eb64b5ea3 100644
--- a/src/steam/asset/sequence.cpp
+++ b/src/steam/asset/sequence.cpp
@@ -32,7 +32,7 @@
 //#include "steam/mobject/placement.hpp"
 //#include "steam/mobject/session/mobjectfactory.hpp"
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::AutoRegistered;
diff --git a/src/steam/asset/sequence.hpp b/src/steam/asset/sequence.hpp
index 5ff40e95e..55e585f6c 100644
--- a/src/steam/asset/sequence.hpp
+++ b/src/steam/asset/sequence.hpp
@@ -69,7 +69,7 @@
 //using std::vector;
 //using std::string;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -111,5 +111,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/struct-factory-impl.hpp b/src/steam/asset/struct-factory-impl.hpp
index a2abdd991..75441ecac 100644
--- a/src/steam/asset/struct-factory-impl.hpp
+++ b/src/steam/asset/struct-factory-impl.hpp
@@ -61,7 +61,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::Symbol;
@@ -247,5 +247,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/struct-scheme.hpp b/src/steam/asset/struct-scheme.hpp
index 364428da2..9bc335a44 100644
--- a/src/steam/asset/struct-scheme.hpp
+++ b/src/steam/asset/struct-scheme.hpp
@@ -46,7 +46,7 @@
 
 
 
-namespace proc {
+namespace steam {
   struct StreamType;
   
 namespace mobject {
diff --git a/src/steam/asset/struct.cpp b/src/steam/asset/struct.cpp
index bdc18dc23..f7a69925f 100644
--- a/src/steam/asset/struct.cpp
+++ b/src/steam/asset/struct.cpp
@@ -59,7 +59,7 @@ using proc::ConfigResolver;
 using util::contains;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   /****** NOTE: not fully implemented yet. What follows is partially a hack to build simple tests *******/
@@ -190,7 +190,7 @@ namespace asset {
 #include "steam/asset/sequence.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   using PPipe = lib::P<Pipe>;
   
diff --git a/src/steam/asset/struct.hpp b/src/steam/asset/struct.hpp
index af263708d..240e26933 100644
--- a/src/steam/asset/struct.hpp
+++ b/src/steam/asset/struct.hpp
@@ -71,7 +71,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using std::string;
@@ -169,5 +169,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/timeline.cpp b/src/steam/asset/timeline.cpp
index 48ee32f72..d0172df53 100644
--- a/src/steam/asset/timeline.cpp
+++ b/src/steam/asset/timeline.cpp
@@ -31,7 +31,7 @@
 #include "steam/assetmanager.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::AutoRegistered;
diff --git a/src/steam/asset/timeline.hpp b/src/steam/asset/timeline.hpp
index e203e2a61..52b482ba1 100644
--- a/src/steam/asset/timeline.hpp
+++ b/src/steam/asset/timeline.hpp
@@ -75,7 +75,7 @@
 //using std::vector;
 //using std::string;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -122,5 +122,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/typed-id.hpp b/src/steam/asset/typed-id.hpp
index b6013cc5d..e749108fc 100644
--- a/src/steam/asset/typed-id.hpp
+++ b/src/steam/asset/typed-id.hpp
@@ -75,7 +75,7 @@ namespace query  {
   
 }}
 
-namespace proc {
+namespace steam {
 namespace asset {
   
 //  using std::string;
@@ -133,5 +133,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/typed-lookup.cpp b/src/steam/asset/typed-lookup.cpp
index b09ea1593..f7baa18f4 100644
--- a/src/steam/asset/typed-lookup.cpp
+++ b/src/steam/asset/typed-lookup.cpp
@@ -32,7 +32,7 @@
 #include "steam/asset/typed-id.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   LUMIERA_ERROR_DEFINE (MISSING_INSTANCE, "Existing ID registration without associated instance");
diff --git a/src/steam/asset/unknown.cpp b/src/steam/asset/unknown.cpp
index cfc8ef2db..bf5442edb 100644
--- a/src/steam/asset/unknown.cpp
+++ b/src/steam/asset/unknown.cpp
@@ -31,7 +31,7 @@
 
 using util::_Fmt;
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   LUMIERA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media referred by placeholder not found");
diff --git a/src/steam/asset/unknown.hpp b/src/steam/asset/unknown.hpp
index cba6b4e86..cc42e1649 100644
--- a/src/steam/asset/unknown.hpp
+++ b/src/steam/asset/unknown.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   using lib::time::FSecs;
@@ -67,5 +67,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/asset/viewer.cpp b/src/steam/asset/viewer.cpp
index e0dfa0790..c97e73bc4 100644
--- a/src/steam/asset/viewer.cpp
+++ b/src/steam/asset/viewer.cpp
@@ -35,7 +35,7 @@
 //#include "steam/assetmanager.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
 //  using lib::AutoRegistered;
@@ -74,4 +74,4 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
diff --git a/src/steam/asset/viewer.hpp b/src/steam/asset/viewer.hpp
index a52de14bf..170363054 100644
--- a/src/steam/asset/viewer.hpp
+++ b/src/steam/asset/viewer.hpp
@@ -62,7 +62,7 @@
 //using std::vector;
 //using std::string;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -103,5 +103,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/src/steam/assetmanager.cpp b/src/steam/assetmanager.cpp
index 71d57bfeb..98914b588 100644
--- a/src/steam/assetmanager.cpp
+++ b/src/steam/assetmanager.cpp
@@ -45,7 +45,7 @@ using lib::Depend;
 using lib::Sync;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   namespace error = lumiera::error;
   
@@ -235,7 +235,7 @@ namespace asset {
   }
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 
 
 
@@ -256,7 +256,7 @@ namespace asset {
 #include "steam/asset/meta/time-grid.hpp"
 #include "steam/asset/meta/error-log.hpp"
 
-namespace proc {
+namespace steam {
 namespace asset {
   using lib::P;
   
@@ -284,4 +284,4 @@ namespace asset {
   template P<ErrorLog> AssetManager::wrap (const ErrorLog& asset);
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
diff --git a/src/steam/assetmanager.hpp b/src/steam/assetmanager.hpp
index adc35dd75..7c7e6896f 100644
--- a/src/steam/assetmanager.hpp
+++ b/src/steam/assetmanager.hpp
@@ -58,7 +58,7 @@ using std::string;
 using std::list;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   class DB;
@@ -134,7 +134,7 @@ namespace asset {
     LUMIERA_ERROR_DECLARE (UNKNOWN_ASSET_ID);  ///< use of a non-registered Asset ID.
     LUMIERA_ERROR_DECLARE (WRONG_ASSET_KIND);  ///< Asset ID of wrong Asset kind, unable to cast.
 
-}} // namespace proc::asset
+}} // namespace steam::asset
 
 
 
diff --git a/src/steam/cmd.hpp b/src/steam/cmd.hpp
index 9f443f6d5..f221371c5 100644
--- a/src/steam/cmd.hpp
+++ b/src/steam/cmd.hpp
@@ -47,7 +47,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace cmd {
   
 //  using std::string;
@@ -83,5 +83,5 @@ namespace cmd {
   extern CommandSetup test_meta_markAction;
   
   
-}} // namespace proc::cmd
+}} // namespace steam::cmd
 #endif /*STEAM_CMD_H*/
diff --git a/src/steam/cmd/meta-cmd.cpp b/src/steam/cmd/meta-cmd.cpp
index 1ac74e48b..760bd2b59 100644
--- a/src/steam/cmd/meta-cmd.cpp
+++ b/src/steam/cmd/meta-cmd.cpp
@@ -64,7 +64,7 @@ using util::isYes;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace cmd {
   namespace error = lumiera::error;
   
@@ -235,4 +235,4 @@ COMMAND_DEFINITION (test_meta_markAction)
   
   
   
-}} // namespace proc::cmd
+}} // namespace steam::cmd
diff --git a/src/steam/cmd/scope-cmd.cpp b/src/steam/cmd/scope-cmd.cpp
index 88354b19f..71a59f905 100644
--- a/src/steam/cmd/scope-cmd.cpp
+++ b/src/steam/cmd/scope-cmd.cpp
@@ -53,7 +53,7 @@ using lib::hash::LuidH;
 //using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace cmd {
   namespace error = lumiera::error;
   
@@ -91,4 +91,4 @@ namespace cmd {
   
   
   
-}} // namespace proc::cmd
+}} // namespace steam::cmd
diff --git a/src/steam/cmd/sequence-cmd.cpp b/src/steam/cmd/sequence-cmd.cpp
index 1d43a7218..544c49929 100644
--- a/src/steam/cmd/sequence-cmd.cpp
+++ b/src/steam/cmd/sequence-cmd.cpp
@@ -50,7 +50,7 @@ using lib::hash::LuidH;
 //using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace cmd {
   namespace error = lumiera::error;
   
@@ -90,4 +90,4 @@ namespace cmd {
   
   
   
-}} // namespace proc::cmd
+}} // namespace steam::cmd
diff --git a/src/steam/cmd/session-cmd.cpp b/src/steam/cmd/session-cmd.cpp
index e79545d96..b3956eee3 100644
--- a/src/steam/cmd/session-cmd.cpp
+++ b/src/steam/cmd/session-cmd.cpp
@@ -49,7 +49,7 @@ using lib::hash::LuidH;
 //using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace cmd {
   namespace error = lumiera::error;
   
@@ -109,4 +109,4 @@ namespace cmd {
   
   
   
-}} // namespace proc::cmd
+}} // namespace steam::cmd
diff --git a/src/steam/common.hpp b/src/steam/common.hpp
index fe30b0968..2c437f027 100644
--- a/src/steam/common.hpp
+++ b/src/steam/common.hpp
@@ -61,7 +61,7 @@
  * the API and backbone of the renderengine. Most render implementation
  * code resides in the vault layer or is loaded from plug-ins though.
  */
-namespace proc { 
+namespace steam { 
   
   
   
diff --git a/src/steam/config-resolver.cpp b/src/steam/config-resolver.cpp
index 804d64610..7462b2240 100644
--- a/src/steam/config-resolver.cpp
+++ b/src/steam/config-resolver.cpp
@@ -39,7 +39,7 @@ using lumiera::LifecycleHook;
 using lumiera::ON_GLOBAL_INIT;
 
 
-namespace proc {
+namespace steam {
   namespace {
     
     /**
@@ -66,7 +66,7 @@ namespace proc {
    */
   lib::Depend<ConfigResolver> ConfigResolver::instance;
   
-} // namespace proc
+} // namespace steam
 
 
 
diff --git a/src/steam/config-resolver.hpp b/src/steam/config-resolver.hpp
index 682d59e02..8ff4d1787 100644
--- a/src/steam/config-resolver.hpp
+++ b/src/steam/config-resolver.hpp
@@ -59,7 +59,7 @@
 
 
 
-namespace proc {
+namespace steam {
   
   
   
@@ -92,5 +92,5 @@ namespace proc {
     };
   
   
-} // namespace proc
+} // namespace steam
 #endif
diff --git a/src/steam/control/argument-erasure.hpp b/src/steam/control/argument-erasure.hpp
index bd7226f84..1caab6465 100644
--- a/src/steam/control/argument-erasure.hpp
+++ b/src/steam/control/argument-erasure.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   
@@ -91,5 +91,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/argument-tuple-accept.hpp b/src/steam/control/argument-tuple-accept.hpp
index 84176e959..cea55056b 100644
--- a/src/steam/control/argument-tuple-accept.hpp
+++ b/src/steam/control/argument-tuple-accept.hpp
@@ -68,7 +68,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   
@@ -571,5 +571,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-closure.hpp b/src/steam/control/command-closure.hpp
index 8e6b00244..9af08a3e6 100644
--- a/src/steam/control/command-closure.hpp
+++ b/src/steam/control/command-closure.hpp
@@ -78,7 +78,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::meta::FunErasure;
@@ -125,5 +125,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_CLOSURE_H*/
diff --git a/src/steam/control/command-def.hpp b/src/steam/control/command-def.hpp
index 94aa2a949..05eba43a6 100644
--- a/src/steam/control/command-def.hpp
+++ b/src/steam/control/command-def.hpp
@@ -75,7 +75,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::shared_ptr;
@@ -330,5 +330,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-dispatch.hpp b/src/steam/control/command-dispatch.hpp
index 186c61d36..b035e30c7 100644
--- a/src/steam/control/command-dispatch.hpp
+++ b/src/steam/control/command-dispatch.hpp
@@ -39,7 +39,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   
@@ -64,5 +64,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_COMMAND_DISPATCH_H*/
diff --git a/src/steam/control/command-impl-clone-builder.hpp b/src/steam/control/command-impl-clone-builder.hpp
index 0e685c41a..6122c709f 100644
--- a/src/steam/control/command-impl-clone-builder.hpp
+++ b/src/steam/control/command-impl-clone-builder.hpp
@@ -52,7 +52,7 @@
 #include "lib/nocopy.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::TypedAllocationManager;
@@ -178,5 +178,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-impl.hpp b/src/steam/control/command-impl.hpp
index 595ebdf51..aed9af22c 100644
--- a/src/steam/control/command-impl.hpp
+++ b/src/steam/control/command-impl.hpp
@@ -52,7 +52,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using util::_Fmt;
@@ -272,5 +272,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-instance-manager.hpp b/src/steam/control/command-instance-manager.hpp
index 161def068..ed4534ef6 100644
--- a/src/steam/control/command-instance-manager.hpp
+++ b/src/steam/control/command-instance-manager.hpp
@@ -69,7 +69,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::string;
@@ -120,5 +120,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_INSTANCE_MANAGER_H*/
diff --git a/src/steam/control/command-invocation.hpp b/src/steam/control/command-invocation.hpp
index f40dfd1ed..c250306b9 100644
--- a/src/steam/control/command-invocation.hpp
+++ b/src/steam/control/command-invocation.hpp
@@ -54,7 +54,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using namespace lib::meta;
@@ -152,5 +152,5 @@ namespace control {
   }
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-mutation.hpp b/src/steam/control/command-mutation.hpp
index a8142c2ff..f502e2dcb 100644
--- a/src/steam/control/command-mutation.hpp
+++ b/src/steam/control/command-mutation.hpp
@@ -51,7 +51,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   
@@ -148,5 +148,5 @@ namespace control {
     };
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-op-closure.hpp b/src/steam/control/command-op-closure.hpp
index 4bd86488e..f97282a74 100644
--- a/src/steam/control/command-op-closure.hpp
+++ b/src/steam/control/command-op-closure.hpp
@@ -54,7 +54,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::meta::_Fun;
@@ -228,5 +228,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_OP_CLOSURE_H*/
diff --git a/src/steam/control/command-queue.hpp b/src/steam/control/command-queue.hpp
index 2a7227165..414cbbe56 100644
--- a/src/steam/control/command-queue.hpp
+++ b/src/steam/control/command-queue.hpp
@@ -48,7 +48,7 @@
 #include "lib/util.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   namespace error = lumiera::error;
@@ -91,5 +91,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_COMMAND_QUEUE_H*/
diff --git a/src/steam/control/command-registry.hpp b/src/steam/control/command-registry.hpp
index 68eee3a09..a28286fe3 100644
--- a/src/steam/control/command-registry.hpp
+++ b/src/steam/control/command-registry.hpp
@@ -78,7 +78,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using boost::hash;
@@ -276,5 +276,5 @@ namespace control {
     };
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-setup.cpp b/src/steam/control/command-setup.cpp
index b62d9ed3b..d66cd65b7 100644
--- a/src/steam/control/command-setup.cpp
+++ b/src/steam/control/command-setup.cpp
@@ -61,7 +61,7 @@ using util::unConst;
 using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace control {
   namespace error = lumiera::error;
   
@@ -318,4 +318,4 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/command-setup.hpp b/src/steam/control/command-setup.hpp
index 6ff87bdf7..dc4b4f8db 100644
--- a/src/steam/control/command-setup.hpp
+++ b/src/steam/control/command-setup.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::string;
@@ -146,5 +146,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_SETUP_H*/
diff --git a/src/steam/control/command-signature.hpp b/src/steam/control/command-signature.hpp
index bd4a3ebe8..ab98065a9 100644
--- a/src/steam/control/command-signature.hpp
+++ b/src/steam/control/command-signature.hpp
@@ -56,7 +56,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::function;
@@ -152,5 +152,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/command-simple-closure.hpp b/src/steam/control/command-simple-closure.hpp
index 571d3b55d..0a64ec06f 100644
--- a/src/steam/control/command-simple-closure.hpp
+++ b/src/steam/control/command-simple-closure.hpp
@@ -54,7 +54,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::InPlaceBuffer;
@@ -232,5 +232,5 @@ namespace control {
     
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_SIMPLE_CLOSURE_H*/
diff --git a/src/steam/control/command-storage-holder.hpp b/src/steam/control/command-storage-holder.hpp
index c3c8636db..e818f1c16 100644
--- a/src/steam/control/command-storage-holder.hpp
+++ b/src/steam/control/command-storage-holder.hpp
@@ -54,7 +54,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::InPlaceBuffer;
@@ -284,5 +284,5 @@ namespace control {
     
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*CONTROL_COMMAND_STORAGE_HOLDER_H*/
diff --git a/src/steam/control/command.cpp b/src/steam/control/command.cpp
index 680dcb954..2844408f4 100644
--- a/src/steam/control/command.cpp
+++ b/src/steam/control/command.cpp
@@ -61,7 +61,7 @@ using util::cStr;
 using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace control {
   namespace error = lumiera::error;
   
@@ -486,4 +486,4 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/command.hpp b/src/steam/control/command.hpp
index baaa89c29..9a654dd48 100644
--- a/src/steam/control/command.hpp
+++ b/src/steam/control/command.hpp
@@ -83,7 +83,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::string;
@@ -334,5 +334,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/handling-pattern.cpp b/src/steam/control/handling-pattern.cpp
index d197192bd..0ef4cc92b 100644
--- a/src/steam/control/handling-pattern.cpp
+++ b/src/steam/control/handling-pattern.cpp
@@ -40,7 +40,7 @@ using util::cStr;
 using util::_Fmt;
 
 
-namespace proc {
+namespace steam {
 namespace control {
   namespace error = lumiera::error;
   
@@ -129,4 +129,4 @@ namespace control {
   }
   
   
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/handling-pattern.hpp b/src/steam/control/handling-pattern.hpp
index 53c866b12..bc2ecf8ae 100644
--- a/src/steam/control/handling-pattern.hpp
+++ b/src/steam/control/handling-pattern.hpp
@@ -51,7 +51,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::string;
@@ -154,5 +154,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/handling-patterns.hpp b/src/steam/control/handling-patterns.hpp
index 2ac27d426..ebfd59b0f 100644
--- a/src/steam/control/handling-patterns.hpp
+++ b/src/steam/control/handling-patterns.hpp
@@ -49,7 +49,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
 
   namespace { // concrete command handling patterns 
@@ -208,5 +208,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/looper.hpp b/src/steam/control/looper.hpp
index deb6b39f2..03ba652be 100644
--- a/src/steam/control/looper.hpp
+++ b/src/steam/control/looper.hpp
@@ -56,7 +56,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::time::Time;
@@ -268,5 +268,5 @@ namespace control {
 
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_LOOPER_H*/
diff --git a/src/steam/control/media-impl-lib.hpp b/src/steam/control/media-impl-lib.hpp
index 7297b1c06..5a6a2893c 100644
--- a/src/steam/control/media-impl-lib.hpp
+++ b/src/steam/control/media-impl-lib.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::Symbol;
@@ -63,5 +63,5 @@ namespace control {
     };
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_MEDIA_IMPL_LIB_H*/
diff --git a/src/steam/control/memento-tie.hpp b/src/steam/control/memento-tie.hpp
index a86207528..71535cf45 100644
--- a/src/steam/control/memento-tie.hpp
+++ b/src/steam/control/memento-tie.hpp
@@ -53,7 +53,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using boost::equality_comparable;
@@ -235,5 +235,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/pathmanager.cpp b/src/steam/control/pathmanager.cpp
index 3587c9a85..32977465a 100644
--- a/src/steam/control/pathmanager.cpp
+++ b/src/steam/control/pathmanager.cpp
@@ -30,7 +30,7 @@
 
 #include "steam/control/pathmanager.hpp"
 
-namespace proc {
+namespace steam {
 namespace control {
 
 
@@ -38,4 +38,4 @@ namespace control {
   /** */
 
 
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/pathmanager.hpp b/src/steam/control/pathmanager.hpp
index f925bc7e6..767661694 100644
--- a/src/steam/control/pathmanager.hpp
+++ b/src/steam/control/pathmanager.hpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   
@@ -54,5 +54,5 @@ namespace control {
 
 
 
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/control/proc-dispatcher.cpp b/src/steam/control/proc-dispatcher.cpp
index 3101e59ac..3457b4cd8 100644
--- a/src/steam/control/proc-dispatcher.cpp
+++ b/src/steam/control/proc-dispatcher.cpp
@@ -99,7 +99,7 @@ using lib::RecursiveLock_Waitable;
 using backend::Thread;
 using std::unique_ptr;
 
-namespace proc {
+namespace steam {
 namespace control {
   
   namespace error = lumiera::error;
@@ -484,4 +484,4 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/proc-dispatcher.hpp b/src/steam/control/proc-dispatcher.hpp
index 04b9f560e..a4ba98098 100644
--- a/src/steam/control/proc-dispatcher.hpp
+++ b/src/steam/control/proc-dispatcher.hpp
@@ -62,7 +62,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using std::unique_ptr;
@@ -112,5 +112,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_PROC_DISPATCHER_H*/
diff --git a/src/steam/control/session-command-interface-proxy.cpp b/src/steam/control/session-command-interface-proxy.cpp
index 35ffdb106..b3b29eb63 100644
--- a/src/steam/control/session-command-interface-proxy.cpp
+++ b/src/steam/control/session-command-interface-proxy.cpp
@@ -35,7 +35,7 @@
 #include "include/session-command-facade.h"
 #include "include/interfaceproxy.hpp"
 
-namespace proc {
+namespace steam {
 namespace control{
   /** static storage for the facade access front-end */
   lib::Depend<SessionCommand> SessionCommand::facade;
diff --git a/src/steam/control/session-command-service.cpp b/src/steam/control/session-command-service.cpp
index 8969163ae..252132807 100644
--- a/src/steam/control/session-command-service.cpp
+++ b/src/steam/control/session-command-service.cpp
@@ -47,7 +47,7 @@ extern "C" {
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::Symbol;
@@ -252,4 +252,4 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
diff --git a/src/steam/control/session-command-service.hpp b/src/steam/control/session-command-service.hpp
index 243058a63..be111a461 100644
--- a/src/steam/control/session-command-service.hpp
+++ b/src/steam/control/session-command-service.hpp
@@ -53,7 +53,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::diff::Rec;
@@ -105,5 +105,5 @@ namespace control {
     
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif /*STEAM_CONTROL_SESSION_COMMAND_SERVICE_H*/
diff --git a/src/steam/control/stypemanager.cpp b/src/steam/control/stypemanager.cpp
index 714d1f824..4ef816aad 100644
--- a/src/steam/control/stypemanager.cpp
+++ b/src/steam/control/stypemanager.cpp
@@ -32,7 +32,7 @@
 #include "include/lifecycle.h"
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::Symbol;
@@ -119,7 +119,7 @@ namespace control {
     UNIMPLEMENTED ("STypeManager basic functionality: wire up implementation facade (impl type) from given raw type of the library");
   }
   
-}} // namespace proc::control
+}} // namespace steam::control
 
 
 // ==== C interface for registering setup of basic stream type configuration =======
diff --git a/src/steam/control/stypemanager.hpp b/src/steam/control/stypemanager.hpp
index f794a1da1..d710b49e8 100644
--- a/src/steam/control/stypemanager.hpp
+++ b/src/steam/control/stypemanager.hpp
@@ -38,7 +38,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace control {
   
   using lib::Symbol;
@@ -110,7 +110,7 @@ namespace control {
   }
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 
 
 namespace proc_interface {
diff --git a/src/steam/control/styperegistry.hpp b/src/steam/control/styperegistry.hpp
index 1250e7080..cc12caa73 100644
--- a/src/steam/control/styperegistry.hpp
+++ b/src/steam/control/styperegistry.hpp
@@ -48,7 +48,7 @@
 //#include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 
   
@@ -80,5 +80,5 @@ namespace control {
   
   
   
-}} // namespace proc::control
+}} // namespace steam::control
 #endif
diff --git a/src/steam/engine/buffer-local-key.hpp b/src/steam/engine/buffer-local-key.hpp
index 2f3b510ef..c21c85af4 100644
--- a/src/steam/engine/buffer-local-key.hpp
+++ b/src/steam/engine/buffer-local-key.hpp
@@ -36,7 +36,7 @@
 #include <boost/functional/hash.hpp>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace metadata {
@@ -127,5 +127,5 @@ namespace engine {
     };
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/buffer-metadata.hpp b/src/steam/engine/buffer-metadata.hpp
index 0f1da6482..3af572e40 100644
--- a/src/steam/engine/buffer-metadata.hpp
+++ b/src/steam/engine/buffer-metadata.hpp
@@ -66,7 +66,7 @@
 #include <unordered_map>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::HashVal;
@@ -791,5 +791,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/buffer-provider.cpp b/src/steam/engine/buffer-provider.cpp
index 073c1ecdb..8a5ca35d8 100644
--- a/src/steam/engine/buffer-provider.cpp
+++ b/src/steam/engine/buffer-provider.cpp
@@ -33,7 +33,7 @@
 
 using util::isSameObject;
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/buffer-provider.hpp b/src/steam/engine/buffer-provider.hpp
index 8e6fd781d..2972f2eef 100644
--- a/src/steam/engine/buffer-provider.hpp
+++ b/src/steam/engine/buffer-provider.hpp
@@ -53,7 +53,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::Literal;
@@ -167,5 +167,5 @@ namespace engine {
   }
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/buffhandle-attach.hpp b/src/steam/engine/buffhandle-attach.hpp
index 6f8630cbb..adb757ad9 100644
--- a/src/steam/engine/buffhandle-attach.hpp
+++ b/src/steam/engine/buffhandle-attach.hpp
@@ -50,7 +50,7 @@
 #include "steam/engine/buffhandle.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
@@ -126,5 +126,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/buffhandle.hpp b/src/steam/engine/buffhandle.hpp
index 9bfd2f7e1..6cdbc2a97 100644
--- a/src/steam/engine/buffhandle.hpp
+++ b/src/steam/engine/buffhandle.hpp
@@ -56,7 +56,7 @@
 #include "steam/streamtype.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -181,5 +181,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/bufftable-obsolete.hpp b/src/steam/engine/bufftable-obsolete.hpp
index 49b428b0e..f74b3f9d3 100644
--- a/src/steam/engine/bufftable-obsolete.hpp
+++ b/src/steam/engine/bufftable-obsolete.hpp
@@ -44,7 +44,7 @@
 ////////////////////////////////WARNING: ...just left in tree to keep it compiling
 ////////////////////////////////TICKET   #826  need to be reworked entirely
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using std::pair;
@@ -190,5 +190,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/bufftable.hpp b/src/steam/engine/bufftable.hpp
index bec3f17c7..ef6a7546e 100644
--- a/src/steam/engine/bufftable.hpp
+++ b/src/steam/engine/bufftable.hpp
@@ -44,7 +44,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using std::pair;
@@ -163,5 +163,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/calc-plan-continuation.cpp b/src/steam/engine/calc-plan-continuation.cpp
index 451e685fd..dfaca80cb 100644
--- a/src/steam/engine/calc-plan-continuation.cpp
+++ b/src/steam/engine/calc-plan-continuation.cpp
@@ -38,7 +38,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/calc-plan-continuation.hpp b/src/steam/engine/calc-plan-continuation.hpp
index 33c373808..e37603093 100644
--- a/src/steam/engine/calc-plan-continuation.hpp
+++ b/src/steam/engine/calc-plan-continuation.hpp
@@ -44,7 +44,7 @@
 #include "vault/engine/job.h"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
 //  using std::function;
@@ -127,5 +127,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/calc-stream.hpp b/src/steam/engine/calc-stream.hpp
index fd7736589..269371236 100644
--- a/src/steam/engine/calc-stream.hpp
+++ b/src/steam/engine/calc-stream.hpp
@@ -58,7 +58,7 @@
 #include <vector>
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
   
   namespace error = lumiera::error;
@@ -156,5 +156,5 @@ namespace engine{
   
   
   
-}}// namespace proc::engine
+}}// namespace steam::engine
 #endif /*STEAM_ENGINE_CALC_STREAM_H*/
diff --git a/src/steam/engine/channel-descriptor.hpp b/src/steam/engine/channel-descriptor.hpp
index a0fb74f46..38618d474 100644
--- a/src/steam/engine/channel-descriptor.hpp
+++ b/src/steam/engine/channel-descriptor.hpp
@@ -41,7 +41,7 @@
 #include "steam/streamtype.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -72,5 +72,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/diagnostic-buffer-provider.cpp b/src/steam/engine/diagnostic-buffer-provider.cpp
index 2c4ddd908..088d45a05 100644
--- a/src/steam/engine/diagnostic-buffer-provider.cpp
+++ b/src/steam/engine/diagnostic-buffer-provider.cpp
@@ -36,7 +36,7 @@
 #include "steam/engine/tracking-heap-block-provider.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/diagnostic-buffer-provider.hpp b/src/steam/engine/diagnostic-buffer-provider.hpp
index 4d1073851..77e648523 100644
--- a/src/steam/engine/diagnostic-buffer-provider.hpp
+++ b/src/steam/engine/diagnostic-buffer-provider.hpp
@@ -40,7 +40,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -107,5 +107,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/dispatch-table.cpp b/src/steam/engine/dispatch-table.cpp
index b6b7c89c2..79afbf819 100644
--- a/src/steam/engine/dispatch-table.cpp
+++ b/src/steam/engine/dispatch-table.cpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   /** */
diff --git a/src/steam/engine/dispatch-table.hpp b/src/steam/engine/dispatch-table.hpp
index 9cae24ad3..2458c6b7f 100644
--- a/src/steam/engine/dispatch-table.hpp
+++ b/src/steam/engine/dispatch-table.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::time::TimeSpan;
@@ -73,5 +73,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/dispatcher.cpp b/src/steam/engine/dispatcher.cpp
index 30d991e2e..d79466621 100644
--- a/src/steam/engine/dispatcher.cpp
+++ b/src/steam/engine/dispatcher.cpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 
   Dispatcher::~Dispatcher() { }  // emit VTables and Typeinfo here....
diff --git a/src/steam/engine/dispatcher.hpp b/src/steam/engine/dispatcher.hpp
index 24af315ab..6baab2887 100644
--- a/src/steam/engine/dispatcher.hpp
+++ b/src/steam/engine/dispatcher.hpp
@@ -46,7 +46,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using std::function;
@@ -140,5 +140,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/engine-diagnostics.hpp b/src/steam/engine/engine-diagnostics.hpp
index 7bb1a909b..140b4dd61 100644
--- a/src/steam/engine/engine-diagnostics.hpp
+++ b/src/steam/engine/engine-diagnostics.hpp
@@ -54,7 +54,7 @@
 //#include <string>
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 
 //    using std::string;
@@ -111,5 +111,5 @@ namespace engine{
   
   
 } // namespace engine
-} // namespace proc
+} // namespace steam
 #endif
diff --git a/src/steam/engine/engine-service-mock.cpp b/src/steam/engine/engine-service-mock.cpp
index 0e6c91304..5010f8528 100644
--- a/src/steam/engine/engine-service-mock.cpp
+++ b/src/steam/engine/engine-service-mock.cpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
   
 //    using std::string;
@@ -77,4 +77,4 @@ namespace engine{
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
diff --git a/src/steam/engine/engine-service-mock.hpp b/src/steam/engine/engine-service-mock.hpp
index a66ce00e5..fc9fe0daf 100644
--- a/src/steam/engine/engine-service-mock.hpp
+++ b/src/steam/engine/engine-service-mock.hpp
@@ -54,7 +54,7 @@
 #include "lib/scoped-ptrvect.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace node { class DummyTick; }  
   
 namespace engine{
@@ -97,5 +97,5 @@ namespace engine{
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/engine-service.cpp b/src/steam/engine/engine-service.cpp
index 343adb17a..a2e87e3e2 100644
--- a/src/steam/engine/engine-service.cpp
+++ b/src/steam/engine/engine-service.cpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
   
 //    using std::string;
@@ -231,4 +231,4 @@ namespace engine{
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
diff --git a/src/steam/engine/engine-service.hpp b/src/steam/engine/engine-service.hpp
index 44db9c431..bd9207564 100644
--- a/src/steam/engine/engine-service.hpp
+++ b/src/steam/engine/engine-service.hpp
@@ -69,7 +69,7 @@
 //#include <string>
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 
 //    using std::string;
@@ -174,5 +174,5 @@ namespace engine{
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif /*STEAM_ENGINE_ENGINE_SERVICE_H*/
diff --git a/src/steam/engine/frame-coord.hpp b/src/steam/engine/frame-coord.hpp
index 8f2d56408..5e8307bbc 100644
--- a/src/steam/engine/frame-coord.hpp
+++ b/src/steam/engine/frame-coord.hpp
@@ -37,7 +37,7 @@
 #include <limits>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using mobject::ModelPort;
@@ -124,5 +124,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/job-planning.hpp b/src/steam/engine/job-planning.hpp
index 3b2ed6ffd..615f75d30 100644
--- a/src/steam/engine/job-planning.hpp
+++ b/src/steam/engine/job-planning.hpp
@@ -75,7 +75,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -449,5 +449,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/job-ticket.cpp b/src/steam/engine/job-ticket.cpp
index b01dc2c0f..122d2b20d 100644
--- a/src/steam/engine/job-ticket.cpp
+++ b/src/steam/engine/job-ticket.cpp
@@ -33,7 +33,7 @@
 #include "steam/engine/job-ticket.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace { // Details...
@@ -104,4 +104,4 @@ using backend::engine::JobClosure;
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
diff --git a/src/steam/engine/job-ticket.hpp b/src/steam/engine/job-ticket.hpp
index 6071ec229..c80fb1465 100644
--- a/src/steam/engine/job-ticket.hpp
+++ b/src/steam/engine/job-ticket.hpp
@@ -46,7 +46,7 @@
 #include <stack>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
 //using lib::time::TimeSpan;
@@ -259,5 +259,5 @@ using util::isnil;
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/mask.cpp b/src/steam/engine/mask.cpp
index 0100130a9..4c9a3de02 100644
--- a/src/steam/engine/mask.cpp
+++ b/src/steam/engine/mask.cpp
@@ -30,7 +30,7 @@
 #include "lib/error.hpp"
 #include "steam/engine/mask.hpp"
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/mask.hpp b/src/steam/engine/mask.hpp
index 042d13c7e..5388ebbd1 100644
--- a/src/steam/engine/mask.hpp
+++ b/src/steam/engine/mask.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine{
   
   
@@ -50,5 +50,5 @@ namespace engine{
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif /*STEAM_ENGINE_MASK_H*/
diff --git a/src/steam/engine/nodefactory.cpp b/src/steam/engine/nodefactory.cpp
index c75810530..1bdb4bf63 100644
--- a/src/steam/engine/nodefactory.cpp
+++ b/src/steam/engine/nodefactory.cpp
@@ -35,7 +35,7 @@
 
 #include "steam/engine/nodewiring.hpp"
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace { // Details of node fabrication
diff --git a/src/steam/engine/nodefactory.hpp b/src/steam/engine/nodefactory.hpp
index 37818572d..7b3da368e 100644
--- a/src/steam/engine/nodefactory.hpp
+++ b/src/steam/engine/nodefactory.hpp
@@ -41,7 +41,7 @@
 
 namespace lib { class AllocationCluster; }
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -84,5 +84,5 @@ namespace engine {
         
     };
 
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/nodeinvocation.hpp b/src/steam/engine/nodeinvocation.hpp
index 5a41d44a6..f745a4511 100644
--- a/src/steam/engine/nodeinvocation.hpp
+++ b/src/steam/engine/nodeinvocation.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
@@ -235,5 +235,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/nodeoperation.hpp b/src/steam/engine/nodeoperation.hpp
index 91588adce..dbc06b441 100644
--- a/src/steam/engine/nodeoperation.hpp
+++ b/src/steam/engine/nodeoperation.hpp
@@ -70,7 +70,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 namespace config {
   
@@ -336,5 +336,5 @@ namespace config {
   
   
   
-}}} // namespace proc::engine::config
+}}} // namespace steam::engine::config
 #endif
diff --git a/src/steam/engine/nodewiring-config.hpp b/src/steam/engine/nodewiring-config.hpp
index 69b9f5fe3..8eaff2422 100644
--- a/src/steam/engine/nodewiring-config.hpp
+++ b/src/steam/engine/nodewiring-config.hpp
@@ -61,7 +61,7 @@
 #include <map>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 namespace config {
   
@@ -230,5 +230,5 @@ namespace config {
   
   
   
-}}} // namespace proc::engine::config
+}}} // namespace steam::engine::config
 #endif
diff --git a/src/steam/engine/nodewiring-def.hpp b/src/steam/engine/nodewiring-def.hpp
index da7c40929..341d40a41 100644
--- a/src/steam/engine/nodewiring-def.hpp
+++ b/src/steam/engine/nodewiring-def.hpp
@@ -47,7 +47,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::RefArray;
@@ -182,5 +182,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/nodewiring.cpp b/src/steam/engine/nodewiring.cpp
index e18cb46fc..0a43a0be1 100644
--- a/src/steam/engine/nodewiring.cpp
+++ b/src/steam/engine/nodewiring.cpp
@@ -35,7 +35,7 @@
 #include "lib/meta/typelist-manip.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 
   namespace config {
@@ -155,4 +155,4 @@ namespace engine {
   }
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
diff --git a/src/steam/engine/nodewiring.hpp b/src/steam/engine/nodewiring.hpp
index 16cca35ce..5c6498aa0 100644
--- a/src/steam/engine/nodewiring.hpp
+++ b/src/steam/engine/nodewiring.hpp
@@ -39,7 +39,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
@@ -101,5 +101,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/procnode.hpp b/src/steam/engine/procnode.hpp
index e5d7bb308..4e23989bd 100644
--- a/src/steam/engine/procnode.hpp
+++ b/src/steam/engine/procnode.hpp
@@ -53,7 +53,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 
   using std::vector;
@@ -184,5 +184,5 @@ namespace engine {
   }
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/render-invocation.cpp b/src/steam/engine/render-invocation.cpp
index 88940a9dd..642a165c3 100644
--- a/src/steam/engine/render-invocation.cpp
+++ b/src/steam/engine/render-invocation.cpp
@@ -32,7 +32,7 @@
 #include "steam/engine/stateproxy.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace { // Details...
diff --git a/src/steam/engine/render-invocation.hpp b/src/steam/engine/render-invocation.hpp
index b03379918..69ecb34dc 100644
--- a/src/steam/engine/render-invocation.hpp
+++ b/src/steam/engine/render-invocation.hpp
@@ -44,7 +44,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
@@ -77,5 +77,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/renderengine.cpp b/src/steam/engine/renderengine.cpp
index 9f68c9f50..30efaa1a3 100644
--- a/src/steam/engine/renderengine.cpp
+++ b/src/steam/engine/renderengine.cpp
@@ -29,7 +29,7 @@
 #include "lib/error.hpp"
 #include "steam/engine/renderengine.hpp"
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/renderengine.hpp b/src/steam/engine/renderengine.hpp
index b29375f36..898249e30 100644
--- a/src/steam/engine/renderengine.hpp
+++ b/src/steam/engine/renderengine.hpp
@@ -42,7 +42,7 @@
 
 //////////TODO for the "real" engine API: look at engine-serivce.hpp
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using std::list;
@@ -68,5 +68,5 @@ namespace engine {
       
     };
 
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif /*STEAM_ENGINE_RENDERENGINE_H*/
diff --git a/src/steam/engine/rendergraph.cpp b/src/steam/engine/rendergraph.cpp
index 3b1cbf348..c6c6b4cf7 100644
--- a/src/steam/engine/rendergraph.cpp
+++ b/src/steam/engine/rendergraph.cpp
@@ -37,7 +37,7 @@ namespace lumiera {
 }
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   /** */
diff --git a/src/steam/engine/rendergraph.hpp b/src/steam/engine/rendergraph.hpp
index 0924fa9b7..185564076 100644
--- a/src/steam/engine/rendergraph.hpp
+++ b/src/steam/engine/rendergraph.hpp
@@ -39,7 +39,7 @@
 /////////////////////////////TODO consequently this will become some kind of root or anchor point for this network
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::time::TimeSpan;
@@ -70,5 +70,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif /*STEAM_ENGINE_RENDERGRAPH_H*/
diff --git a/src/steam/engine/source.cpp b/src/steam/engine/source.cpp
index df8d07a62..26b3218cd 100644
--- a/src/steam/engine/source.cpp
+++ b/src/steam/engine/source.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/engine/source.hpp"
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   Source::Source (WiringDescriptor const& wd)
diff --git a/src/steam/engine/source.hpp b/src/steam/engine/source.hpp
index 63c938b45..279302113 100644
--- a/src/steam/engine/source.hpp
+++ b/src/steam/engine/source.hpp
@@ -40,7 +40,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine
   {
 
@@ -58,5 +58,5 @@ namespace engine
 
 
 
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/stateproxy.cpp b/src/steam/engine/stateproxy.cpp
index ea289c4b1..66d937987 100644
--- a/src/steam/engine/stateproxy.cpp
+++ b/src/steam/engine/stateproxy.cpp
@@ -29,7 +29,7 @@
 
 #include "steam/engine/stateproxy.hpp"
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   
diff --git a/src/steam/engine/stateproxy.hpp b/src/steam/engine/stateproxy.hpp
index bb458fe5d..bbc3ff06f 100644
--- a/src/steam/engine/stateproxy.hpp
+++ b/src/steam/engine/stateproxy.hpp
@@ -40,7 +40,7 @@
 #include "steam/state.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 
 
@@ -69,5 +69,5 @@ namespace engine {
     
     
     
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/time-anchor.hpp b/src/steam/engine/time-anchor.hpp
index 7dfa5c1fb..ee10c9306 100644
--- a/src/steam/engine/time-anchor.hpp
+++ b/src/steam/engine/time-anchor.hpp
@@ -44,7 +44,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using backend::RealClock;
@@ -200,5 +200,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/tracking-heap-block-provider.cpp b/src/steam/engine/tracking-heap-block-provider.cpp
index 09cfc1bda..eca0e0d4b 100644
--- a/src/steam/engine/tracking-heap-block-provider.cpp
+++ b/src/steam/engine/tracking-heap-block-provider.cpp
@@ -44,7 +44,7 @@ using lib::ScopedPtrVect;
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
diff --git a/src/steam/engine/tracking-heap-block-provider.hpp b/src/steam/engine/tracking-heap-block-provider.hpp
index 9632a905d..a1a7869aa 100644
--- a/src/steam/engine/tracking-heap-block-provider.hpp
+++ b/src/steam/engine/tracking-heap-block-provider.hpp
@@ -52,7 +52,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -184,5 +184,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/type-handler.hpp b/src/steam/engine/type-handler.hpp
index 37f09445e..47359afd7 100644
--- a/src/steam/engine/type-handler.hpp
+++ b/src/steam/engine/type-handler.hpp
@@ -50,7 +50,7 @@
 #include <boost/functional/hash.hpp>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
   
   using lib::HashVal;
@@ -180,5 +180,5 @@ namespace engine {
   
   
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 #endif
diff --git a/src/steam/engine/worker/dummy-image-generator.cpp b/src/steam/engine/worker/dummy-image-generator.cpp
index 746b705b7..24ff26299 100644
--- a/src/steam/engine/worker/dummy-image-generator.cpp
+++ b/src/steam/engine/worker/dummy-image-generator.cpp
@@ -31,7 +31,7 @@
 #include "steam/engine/worker/dummy-image-generator.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace node {
 
   
@@ -171,4 +171,4 @@ namespace node {
 
 
 
-}} // namespace proc::node
+}} // namespace steam::node
diff --git a/src/steam/engine/worker/dummy-image-generator.hpp b/src/steam/engine/worker/dummy-image-generator.hpp
index 03cc89d4c..dee95236c 100644
--- a/src/steam/engine/worker/dummy-image-generator.hpp
+++ b/src/steam/engine/worker/dummy-image-generator.hpp
@@ -44,7 +44,7 @@
 #include "include/display-facade.h"
 
 
-namespace proc {
+namespace steam {
 namespace node {
 
       
@@ -84,6 +84,6 @@ namespace node {
   
   
   
-}} // namespace proc::node
+}} // namespace steam::node
 #endif
 
diff --git a/src/steam/engine/worker/dummy-tick.hpp b/src/steam/engine/worker/dummy-tick.hpp
index b62691ca7..a33d72a9f 100644
--- a/src/steam/engine/worker/dummy-tick.hpp
+++ b/src/steam/engine/worker/dummy-tick.hpp
@@ -45,7 +45,7 @@
 #include <limits>
 
 
-namespace proc {
+namespace steam {
 namespace node {
 
   using std::function;
@@ -121,6 +121,6 @@ namespace node {
   
   
   
-}} // namespace proc::node
+}} // namespace steam::node
 #endif
 
diff --git a/src/steam/engine/worker/tick-service.hpp b/src/steam/engine/worker/tick-service.hpp
index a8bde661b..82f085bad 100644
--- a/src/steam/engine/worker/tick-service.hpp
+++ b/src/steam/engine/worker/tick-service.hpp
@@ -47,7 +47,7 @@
 #include <limits>
 
 
-namespace proc {
+namespace steam {
 namespace node {
 
   using std::function;
@@ -123,6 +123,6 @@ namespace node {
   
   
   
-}} // namespace proc::node
+}} // namespace steam::node
 #endif
 
diff --git a/src/steam/external/libgavl.cpp b/src/steam/external/libgavl.cpp
index 891e65eac..65d77506d 100644
--- a/src/steam/external/libgavl.cpp
+++ b/src/steam/external/libgavl.cpp
@@ -36,7 +36,7 @@ extern "C" {
 }
 
 
-namespace proc {
+namespace steam {
 namespace external {
     
     using control::STypeManager;
@@ -72,4 +72,4 @@ namespace external {
   
   
   
-}} // namespace proc::external
+}} // namespace steam::external
diff --git a/src/steam/external/libgavl.hpp b/src/steam/external/libgavl.hpp
index 0ebdd657d..a8f0c9d5b 100644
--- a/src/steam/external/libgavl.hpp
+++ b/src/steam/external/libgavl.hpp
@@ -38,7 +38,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace external {
   
   
@@ -93,5 +93,5 @@ namespace external {
   
   
   
-}} // namespace proc::external
+}} // namespace steam::external
 #endif
diff --git a/src/steam/facade.cpp b/src/steam/facade.cpp
index faa60dabf..ff30d723e 100644
--- a/src/steam/facade.cpp
+++ b/src/steam/facade.cpp
@@ -52,7 +52,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
   
   using std::string;
   using std::unique_ptr;
@@ -164,4 +164,4 @@ namespace proc {
 
 
 
-} // namespace proc
+} // namespace steam
diff --git a/src/steam/facade.hpp b/src/steam/facade.hpp
index 4aa1c3d15..ff41fddbb 100644
--- a/src/steam/facade.hpp
+++ b/src/steam/facade.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
   
   
   /******************************************************************//**
@@ -82,5 +82,5 @@ namespace proc {
     
   
   
-} // namespace proc
+} // namespace steam
 #endif
diff --git a/src/steam/mobject/builder/applicable-builder-target-types.hpp b/src/steam/mobject/builder/applicable-builder-target-types.hpp
index dd16848b7..245b28745 100644
--- a/src/steam/mobject/builder/applicable-builder-target-types.hpp
+++ b/src/steam/mobject/builder/applicable-builder-target-types.hpp
@@ -63,7 +63,7 @@
                                         /////////////////////////////////TICKET #414
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
diff --git a/src/steam/mobject/builder/assembler.cpp b/src/steam/mobject/builder/assembler.cpp
index e0c14b3c7..1208bb1c9 100644
--- a/src/steam/mobject/builder/assembler.cpp
+++ b/src/steam/mobject/builder/assembler.cpp
@@ -29,7 +29,7 @@
 #include "lib/error.hpp"
 #include "steam/mobject/builder/assembler.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -42,4 +42,4 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/assembler.hpp b/src/steam/mobject/builder/assembler.hpp
index 1899dd912..1365a3c2b 100644
--- a/src/steam/mobject/builder/assembler.hpp
+++ b/src/steam/mobject/builder/assembler.hpp
@@ -32,7 +32,7 @@
 #include "steam/engine/renderengine.hpp"
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -52,5 +52,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/buildertool.hpp b/src/steam/mobject/builder/buildertool.hpp
index 61d92a017..0d6317968 100644
--- a/src/steam/mobject/builder/buildertool.hpp
+++ b/src/steam/mobject/builder/buildertool.hpp
@@ -60,7 +60,7 @@
 #include "steam/mobject/explicitplacement.hpp"
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
   
   class Buildable;
@@ -204,5 +204,5 @@ namespace mobject {
     }
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/common.hpp b/src/steam/mobject/builder/common.hpp
index 216f77cc3..f3c5a34a2 100644
--- a/src/steam/mobject/builder/common.hpp
+++ b/src/steam/mobject/builder/common.hpp
@@ -33,7 +33,7 @@
 #include "lib/error.hpp"
 #include "include/logging.h"
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
     
diff --git a/src/steam/mobject/builder/conmanager.cpp b/src/steam/mobject/builder/conmanager.cpp
index e3a30375a..7a01d4bbd 100644
--- a/src/steam/mobject/builder/conmanager.cpp
+++ b/src/steam/mobject/builder/conmanager.cpp
@@ -30,7 +30,7 @@
 #include "steam/mobject/builder/conmanager.hpp"
 #include "steam/control/stypemanager.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -46,4 +46,4 @@ namespace builder {
   }
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/conmanager.hpp b/src/steam/mobject/builder/conmanager.hpp
index 853959f5e..ee4c4a23b 100644
--- a/src/steam/mobject/builder/conmanager.hpp
+++ b/src/steam/mobject/builder/conmanager.hpp
@@ -31,7 +31,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -58,5 +58,5 @@ namespace builder {
 
 
 
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/fixture-change-detector.hpp b/src/steam/mobject/builder/fixture-change-detector.hpp
index 6afcf16b6..b160a4566 100644
--- a/src/steam/mobject/builder/fixture-change-detector.hpp
+++ b/src/steam/mobject/builder/fixture-change-detector.hpp
@@ -51,7 +51,7 @@
 
 //#include <map>
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -78,5 +78,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/model-port-registry.cpp b/src/steam/mobject/builder/model-port-registry.cpp
index 2c58368e0..71273770a 100644
--- a/src/steam/mobject/builder/model-port-registry.cpp
+++ b/src/steam/mobject/builder/model-port-registry.cpp
@@ -43,7 +43,7 @@
 #include "steam/mobject/model-port.hpp"
 #include "steam/mobject/builder/model-port-registry.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
   namespace builder {
     
@@ -300,4 +300,4 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
diff --git a/src/steam/mobject/builder/model-port-registry.hpp b/src/steam/mobject/builder/model-port-registry.hpp
index 77376b193..9063d18cb 100644
--- a/src/steam/mobject/builder/model-port-registry.hpp
+++ b/src/steam/mobject/builder/model-port-registry.hpp
@@ -57,7 +57,7 @@
 
 #include <map>
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -178,5 +178,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/mould.hpp b/src/steam/mobject/builder/mould.hpp
index 80274e48e..5d7f8d891 100644
--- a/src/steam/mobject/builder/mould.hpp
+++ b/src/steam/mobject/builder/mould.hpp
@@ -41,7 +41,7 @@
 
 #include <vector>
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -93,5 +93,5 @@ namespace builder {
     };
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/nodecreatortool.cpp b/src/steam/mobject/builder/nodecreatortool.cpp
index 4ff550751..06390842f 100644
--- a/src/steam/mobject/builder/nodecreatortool.cpp
+++ b/src/steam/mobject/builder/nodecreatortool.cpp
@@ -32,7 +32,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -83,4 +83,4 @@ namespace builder {
 
 
 
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/nodecreatortool.hpp b/src/steam/mobject/builder/nodecreatortool.hpp
index 28763fccc..4d867c06d 100644
--- a/src/steam/mobject/builder/nodecreatortool.hpp
+++ b/src/steam/mobject/builder/nodecreatortool.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -78,5 +78,5 @@ namespace builder {
   
   
   
-}}} // namespace proc:mobject::builder
+}}} // namespace steam:mobject::builder
 #endif /*MOBJECT_BUILDER_NODECREATORTOOL_H*/
diff --git a/src/steam/mobject/builder/operationpoint.cpp b/src/steam/mobject/builder/operationpoint.cpp
index 19b909921..18bf15264 100644
--- a/src/steam/mobject/builder/operationpoint.cpp
+++ b/src/steam/mobject/builder/operationpoint.cpp
@@ -37,7 +37,7 @@
 
 //#include <boost/ptr_container/ptr_vector.hpp>
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -114,4 +114,4 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/operationpoint.hpp b/src/steam/mobject/builder/operationpoint.hpp
index fe9229a81..12fa6ce21 100644
--- a/src/steam/mobject/builder/operationpoint.hpp
+++ b/src/steam/mobject/builder/operationpoint.hpp
@@ -45,7 +45,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 
 namespace asset { class Proc; }
 namespace asset { class Media; }
@@ -91,5 +91,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif /*MOBJECT_BUILDER_OPERATIONPOINT_H*/
diff --git a/src/steam/mobject/builder/renderstate.hpp b/src/steam/mobject/builder/renderstate.hpp
index 20fc09e6d..0b3fcd3d6 100644
--- a/src/steam/mobject/builder/renderstate.hpp
+++ b/src/steam/mobject/builder/renderstate.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace builder {
   
@@ -59,5 +59,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif /*MOBJECT_BUILDER_RENDERSTATE_H*/
diff --git a/src/steam/mobject/builder/segmentation-tool.cpp b/src/steam/mobject/builder/segmentation-tool.cpp
index 751638932..11840742d 100644
--- a/src/steam/mobject/builder/segmentation-tool.cpp
+++ b/src/steam/mobject/builder/segmentation-tool.cpp
@@ -30,7 +30,7 @@
 #include "steam/mobject/builder/segmentation-tool.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -83,4 +83,4 @@ namespace builder {
   }
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/segmentation-tool.hpp b/src/steam/mobject/builder/segmentation-tool.hpp
index 25ec7902b..fd70efa17 100644
--- a/src/steam/mobject/builder/segmentation-tool.hpp
+++ b/src/steam/mobject/builder/segmentation-tool.hpp
@@ -46,7 +46,7 @@ using std::list;
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -85,5 +85,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif /*MOBJECT_BUILDER_SEGMENTATION_TOOL_H*/
diff --git a/src/steam/mobject/builder/toolfactory.cpp b/src/steam/mobject/builder/toolfactory.cpp
index 2795a2874..2f54cd953 100644
--- a/src/steam/mobject/builder/toolfactory.cpp
+++ b/src/steam/mobject/builder/toolfactory.cpp
@@ -32,7 +32,7 @@
 
 #include <memory>
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -98,4 +98,4 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
diff --git a/src/steam/mobject/builder/toolfactory.hpp b/src/steam/mobject/builder/toolfactory.hpp
index abd354167..e86778549 100644
--- a/src/steam/mobject/builder/toolfactory.hpp
+++ b/src/steam/mobject/builder/toolfactory.hpp
@@ -43,7 +43,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -80,5 +80,5 @@ namespace builder {
   
   
   
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builder/wiringrequest.hpp b/src/steam/mobject/builder/wiringrequest.hpp
index a565a157f..f0f32c51a 100644
--- a/src/steam/mobject/builder/wiringrequest.hpp
+++ b/src/steam/mobject/builder/wiringrequest.hpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
   
@@ -59,5 +59,5 @@ namespace builder {
 
 
 
-}}} // namespace proc::mobject::builder
+}}} // namespace steam::mobject::builder
 #endif
diff --git a/src/steam/mobject/builderfacade.cpp b/src/steam/mobject/builderfacade.cpp
index 72521199f..2b83410b2 100644
--- a/src/steam/mobject/builderfacade.cpp
+++ b/src/steam/mobject/builderfacade.cpp
@@ -30,7 +30,7 @@
 #include "steam/mobject/builderfacade.hpp"
 #include "steam/mobject/session/fixture.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   using session::Fixture;
diff --git a/src/steam/mobject/builderfacade.hpp b/src/steam/mobject/builderfacade.hpp
index c723b9faf..5e5fae7dc 100644
--- a/src/steam/mobject/builderfacade.hpp
+++ b/src/steam/mobject/builderfacade.hpp
@@ -39,7 +39,7 @@
 #include "steam/mobject/builder/common.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   namespace session {
     class Fixture;
@@ -61,5 +61,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_BUILDERFACADE_H*/
diff --git a/src/steam/mobject/explicitplacement.hpp b/src/steam/mobject/explicitplacement.hpp
index 3e09b8f54..800da48e2 100644
--- a/src/steam/mobject/explicitplacement.hpp
+++ b/src/steam/mobject/explicitplacement.hpp
@@ -43,7 +43,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   
@@ -99,5 +99,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_EXPLICITPLACEMENT_H*/
diff --git a/src/steam/mobject/interpolator.hpp b/src/steam/mobject/interpolator.hpp
index 92b9eeb53..465ca77b6 100644
--- a/src/steam/mobject/interpolator.hpp
+++ b/src/steam/mobject/interpolator.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   
@@ -49,5 +49,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_INTERPOLATOR_H*/
diff --git a/src/steam/mobject/mobject-ref.cpp b/src/steam/mobject/mobject-ref.cpp
index a206bf79e..11651c3f7 100644
--- a/src/steam/mobject/mobject-ref.cpp
+++ b/src/steam/mobject/mobject-ref.cpp
@@ -39,7 +39,7 @@
 #include "steam/mobject/placement.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   /** */
@@ -53,4 +53,4 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
diff --git a/src/steam/mobject/mobject-ref.hpp b/src/steam/mobject/mobject-ref.hpp
index 21ef52e7c..b10aaaefa 100644
--- a/src/steam/mobject/mobject-ref.hpp
+++ b/src/steam/mobject/mobject-ref.hpp
@@ -69,7 +69,7 @@
 
 ///////////////////////////////////////////TODO: define an C-API representation here, make the header multilingual!
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   namespace error = lumiera::error;
@@ -391,5 +391,5 @@ namespace mobject {
   }
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/mobject.cpp b/src/steam/mobject/mobject.cpp
index 10ca3a971..68fcee203 100644
--- a/src/steam/mobject/mobject.cpp
+++ b/src/steam/mobject/mobject.cpp
@@ -34,7 +34,7 @@
 using lib::time::Time;
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   
diff --git a/src/steam/mobject/mobject.hpp b/src/steam/mobject/mobject.hpp
index 70295f038..059598058 100644
--- a/src/steam/mobject/mobject.hpp
+++ b/src/steam/mobject/mobject.hpp
@@ -56,7 +56,7 @@ using proc_interface::IDA;                   //TODO finally not needed?
 //using proc_interface::PAsset;              //TODO: only temporarily
 using proc_interface::AssetManager;
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   using std::string;
@@ -121,5 +121,5 @@ namespace mobject {
   typedef Placement<MObject> PMO;
 
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_MOBJECT_H*/
diff --git a/src/steam/mobject/model-port.hpp b/src/steam/mobject/model-port.hpp
index 0084d5454..0235a2570 100644
--- a/src/steam/mobject/model-port.hpp
+++ b/src/steam/mobject/model-port.hpp
@@ -69,7 +69,7 @@
 #include "steam/asset/pipe.hpp"
 #include "steam/streamtype.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   LUMIERA_ERROR_DECLARE (INVALID_MODEL_PORT);     ///< Referral to unknown model port
@@ -152,5 +152,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/output-designation.cpp b/src/steam/mobject/output-designation.cpp
index 4875f7ad2..5d681deed 100644
--- a/src/steam/mobject/output-designation.cpp
+++ b/src/steam/mobject/output-designation.cpp
@@ -59,7 +59,7 @@ using proc::ConfigResolver;
 using lib::HashVal;
 using util::uNum;
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   typedef OutputDesignation::PPipe PPipe;
diff --git a/src/steam/mobject/output-designation.hpp b/src/steam/mobject/output-designation.hpp
index 92ff8c0af..9d2a76250 100644
--- a/src/steam/mobject/output-designation.hpp
+++ b/src/steam/mobject/output-designation.hpp
@@ -46,7 +46,7 @@
 #include "lib/meta/typelist-manip.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   namespace mp = lib::meta;
@@ -133,5 +133,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_OUTPUT_DESIGNATION_H*/
diff --git a/src/steam/mobject/output-mapping.hpp b/src/steam/mobject/output-mapping.hpp
index fd6aa9e59..4c36842a4 100644
--- a/src/steam/mobject/output-mapping.hpp
+++ b/src/steam/mobject/output-mapping.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   namespace { // Helper to extract and rebind definition types
@@ -413,5 +413,5 @@ namespace mobject {
   }
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/parameter.cpp b/src/steam/mobject/parameter.cpp
index 0ca66bc4e..f7316aaac 100644
--- a/src/steam/mobject/parameter.cpp
+++ b/src/steam/mobject/parameter.cpp
@@ -32,7 +32,7 @@
 #include "steam/mobject/parameter.hpp"
 #include "steam/mobject/paramprovider.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   
diff --git a/src/steam/mobject/parameter.hpp b/src/steam/mobject/parameter.hpp
index 55d10e1b2..15bc1cdd0 100644
--- a/src/steam/mobject/parameter.hpp
+++ b/src/steam/mobject/parameter.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   template<class VAL> class ParamProvider;
@@ -58,5 +58,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_PROC_MOBJECT_PARAMETER_H*/
diff --git a/src/steam/mobject/paramprovider.cpp b/src/steam/mobject/paramprovider.cpp
index 502b595dd..2d83c1f3d 100644
--- a/src/steam/mobject/paramprovider.cpp
+++ b/src/steam/mobject/paramprovider.cpp
@@ -32,7 +32,7 @@
 #include "steam/mobject/parameter.hpp"
 #include "steam/mobject/interpolator.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 
 
@@ -43,4 +43,4 @@ namespace mobject {
 
 
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
diff --git a/src/steam/mobject/paramprovider.hpp b/src/steam/mobject/paramprovider.hpp
index 79cfe4bee..1f9ca2e88 100644
--- a/src/steam/mobject/paramprovider.hpp
+++ b/src/steam/mobject/paramprovider.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 
   template<class VAL> class Parameter;
@@ -58,5 +58,5 @@ namespace mobject {
 
 
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*STEAM_MOBJECT_PARAMPROVIDER_H*/
diff --git a/src/steam/mobject/placement-ref.hpp b/src/steam/mobject/placement-ref.hpp
index 761ceb3c6..e6628f200 100644
--- a/src/steam/mobject/placement-ref.hpp
+++ b/src/steam/mobject/placement-ref.hpp
@@ -72,7 +72,7 @@
 
 
 
-namespace proc {
+namespace steam {
   namespace error = lumiera::error;
   
   namespace mobject {
@@ -292,5 +292,5 @@ namespace proc {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/placement.cpp b/src/steam/mobject/placement.cpp
index 9d0f5423d..4c2fb3c5d 100644
--- a/src/steam/mobject/placement.cpp
+++ b/src/steam/mobject/placement.cpp
@@ -36,7 +36,7 @@
 using util::_Fmt;
 using lib::meta::typeStr;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 
 
@@ -85,4 +85,4 @@ namespace mobject {
   
 
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
diff --git a/src/steam/mobject/placement.hpp b/src/steam/mobject/placement.hpp
index 955172ffd..a426ac147 100644
--- a/src/steam/mobject/placement.hpp
+++ b/src/steam/mobject/placement.hpp
@@ -80,7 +80,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   namespace session{ class MObjectFactory; }
@@ -287,5 +287,5 @@ namespace mobject {
   
   
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/session.hpp b/src/steam/mobject/session.hpp
index 72d7f533e..8ef74aa5b 100644
--- a/src/steam/mobject/session.hpp
+++ b/src/steam/mobject/session.hpp
@@ -62,7 +62,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   class Timeline;    typedef lib::P<Timeline> PTimeline;
   class Sequence;    typedef lib::P<Sequence> PSequence;
@@ -210,5 +210,5 @@ namespace mobject {
 
   } // namespace mobject::session
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/session/abstractmo.cpp b/src/steam/mobject/session/abstractmo.cpp
index e4a5dabad..917d8ab2b 100644
--- a/src/steam/mobject/session/abstractmo.cpp
+++ b/src/steam/mobject/session/abstractmo.cpp
@@ -33,7 +33,7 @@
 using util::_Fmt;
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/abstractmo.hpp b/src/steam/mobject/session/abstractmo.hpp
index fe86a2b71..738a4d09e 100644
--- a/src/steam/mobject/session/abstractmo.hpp
+++ b/src/steam/mobject/session/abstractmo.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -84,5 +84,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/allocation.cpp b/src/steam/mobject/session/allocation.cpp
index 1b6354392..e64fd3803 100644
--- a/src/steam/mobject/session/allocation.cpp
+++ b/src/steam/mobject/session/allocation.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/mobject/session/allocation.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -43,4 +43,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/allocation.hpp b/src/steam/mobject/session/allocation.hpp
index 04b4cb7c3..57d06f3b0 100644
--- a/src/steam/mobject/session/allocation.hpp
+++ b/src/steam/mobject/session/allocation.hpp
@@ -36,7 +36,7 @@
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -63,5 +63,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/auto.cpp b/src/steam/mobject/session/auto.cpp
index b783b3276..ce1754ed0 100644
--- a/src/steam/mobject/session/auto.cpp
+++ b/src/steam/mobject/session/auto.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/mobject/session/auto.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -43,4 +43,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/auto.hpp b/src/steam/mobject/session/auto.hpp
index 644c7dc7b..9b239c839 100644
--- a/src/steam/mobject/session/auto.hpp
+++ b/src/steam/mobject/session/auto.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -60,5 +60,5 @@ namespace session {
 
 
 
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/binding.cpp b/src/steam/mobject/session/binding.cpp
index 1d02bad21..987ea490e 100644
--- a/src/steam/mobject/session/binding.cpp
+++ b/src/steam/mobject/session/binding.cpp
@@ -31,7 +31,7 @@
 #include "steam/mobject/session/binding.hpp"
 #include "steam/asset/sequence.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -57,4 +57,4 @@ namespace session {
   
 
 
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/binding.hpp b/src/steam/mobject/session/binding.hpp
index 461ddc820..2225f9677 100644
--- a/src/steam/mobject/session/binding.hpp
+++ b/src/steam/mobject/session/binding.hpp
@@ -36,7 +36,7 @@
 #include "steam/mobject/builder/buildertool.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset { 
   class Sequence;
   
@@ -80,5 +80,5 @@ namespace session {
   template class Placement<session::Binding, session::Meta>;
   typedef Placement<session::Binding, session::Meta> PBinding;
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/session/bus-mo.cpp b/src/steam/mobject/session/bus-mo.cpp
index 5e0613249..4b444f470 100644
--- a/src/steam/mobject/session/bus-mo.cpp
+++ b/src/steam/mobject/session/bus-mo.cpp
@@ -30,7 +30,7 @@
 
 #include "steam/mobject/session/bus-mo.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -55,4 +55,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/bus-mo.hpp b/src/steam/mobject/session/bus-mo.hpp
index 8e48e6863..24846f41e 100644
--- a/src/steam/mobject/session/bus-mo.hpp
+++ b/src/steam/mobject/session/bus-mo.hpp
@@ -38,7 +38,7 @@
 #include "steam/mobject/builder/buildertool.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset { 
   
   class Pipe;
@@ -82,5 +82,5 @@ namespace session {
   template class Placement<session::BusMO, session::Meta>;
   typedef Placement<session::BusMO, session::Meta> PBus;
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/session/clip.cpp b/src/steam/mobject/session/clip.cpp
index b1b0ae924..6589aa3a7 100644
--- a/src/steam/mobject/session/clip.cpp
+++ b/src/steam/mobject/session/clip.cpp
@@ -38,7 +38,7 @@
 using lib::time::Mutation;
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 
@@ -90,5 +90,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 
diff --git a/src/steam/mobject/session/clip.hpp b/src/steam/mobject/session/clip.hpp
index eb1375d41..43de72362 100644
--- a/src/steam/mobject/session/clip.hpp
+++ b/src/steam/mobject/session/clip.hpp
@@ -36,7 +36,7 @@
 #include "lib/p.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   class Media;
   class Clip;
@@ -118,5 +118,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/constraint.cpp b/src/steam/mobject/session/constraint.cpp
index f15bb669a..b55ac9af8 100644
--- a/src/steam/mobject/session/constraint.cpp
+++ b/src/steam/mobject/session/constraint.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/mobject/session/constraint.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/constraint.hpp b/src/steam/mobject/session/constraint.hpp
index 0ec32a5c7..6183ac2e0 100644
--- a/src/steam/mobject/session/constraint.hpp
+++ b/src/steam/mobject/session/constraint.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -46,5 +46,5 @@ namespace session {
   class Constraint : public Allocation
     {};
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/dummy-session-connection.cpp b/src/steam/mobject/session/dummy-session-connection.cpp
index 6c5664785..b4c26dfdc 100644
--- a/src/steam/mobject/session/dummy-session-connection.cpp
+++ b/src/steam/mobject/session/dummy-session-connection.cpp
@@ -72,7 +72,7 @@ using std::string;
 using util::contains;
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -131,7 +131,7 @@ namespace session {
   }
   
   
-}}// namespace proc::mobject::session
+}}// namespace steam::mobject::session
 
 namespace cmd {
   
@@ -226,4 +226,4 @@ COMMAND_DEFINITION (test_fake_blubb)
   };
   
   
-}} // namespace proc::mobject::session
+}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/dummy-session-connection.hpp b/src/steam/mobject/session/dummy-session-connection.hpp
index 110a79f7a..d99601231 100644
--- a/src/steam/mobject/session/dummy-session-connection.hpp
+++ b/src/steam/mobject/session/dummy-session-connection.hpp
@@ -57,7 +57,7 @@ namespace lib {
 namespace diff{
   class MutationMessage;
 }}
-namespace proc {
+namespace steam {
 namespace cmd {
   
   using control::Command;
@@ -127,5 +127,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif /*SRC_PROC_MOBJECT_SESSION_DUMMY_SESSION_CONNECTION_HPP_*/
diff --git a/src/steam/mobject/session/effect.cpp b/src/steam/mobject/session/effect.cpp
index 8e16152bd..c32673ad0 100644
--- a/src/steam/mobject/session/effect.cpp
+++ b/src/steam/mobject/session/effect.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/mobject/session/effect.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -43,4 +43,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/effect.hpp b/src/steam/mobject/session/effect.hpp
index 897854f9e..29f44cf45 100644
--- a/src/steam/mobject/session/effect.hpp
+++ b/src/steam/mobject/session/effect.hpp
@@ -38,7 +38,7 @@
 
 using std::string;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -69,5 +69,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/element-query.hpp b/src/steam/mobject/session/element-query.hpp
index 7b4827550..a3c8cceb4 100644
--- a/src/steam/mobject/session/element-query.hpp
+++ b/src/steam/mobject/session/element-query.hpp
@@ -43,7 +43,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -135,5 +135,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/fixedlocation.cpp b/src/steam/mobject/session/fixedlocation.cpp
index 562b604d6..43e29f432 100644
--- a/src/steam/mobject/session/fixedlocation.cpp
+++ b/src/steam/mobject/session/fixedlocation.cpp
@@ -29,7 +29,7 @@
 
 #include "steam/mobject/session/fixedlocation.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -60,4 +60,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/fixedlocation.hpp b/src/steam/mobject/session/fixedlocation.hpp
index cf547cbe3..7a6aa8afc 100644
--- a/src/steam/mobject/session/fixedlocation.hpp
+++ b/src/steam/mobject/session/fixedlocation.hpp
@@ -39,7 +39,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   class ExplicitPlacement; //TODO trac #100
@@ -73,5 +73,5 @@ namespace mobject {
     
     
     
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/fixture.cpp b/src/steam/mobject/session/fixture.cpp
index 0fa69e8c5..fb1578308 100644
--- a/src/steam/mobject/session/fixture.cpp
+++ b/src/steam/mobject/session/fixture.cpp
@@ -31,7 +31,7 @@
 #include "steam/mobject/session/fixture.hpp"
 #include "include/logging.h"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -66,4 +66,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/fixture.hpp b/src/steam/mobject/session/fixture.hpp
index 11dc0371b..dc579eabf 100644
--- a/src/steam/mobject/session/fixture.hpp
+++ b/src/steam/mobject/session/fixture.hpp
@@ -59,7 +59,7 @@ using std::unique_ptr;
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -100,5 +100,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/fork.cpp b/src/steam/mobject/session/fork.cpp
index a3586b3c0..22b2c5c22 100644
--- a/src/steam/mobject/session/fork.cpp
+++ b/src/steam/mobject/session/fork.cpp
@@ -31,7 +31,7 @@
 #include "steam/mobject/session/fork.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -58,4 +58,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/fork.hpp b/src/steam/mobject/session/fork.hpp
index 3891dd073..5cd3297b3 100644
--- a/src/steam/mobject/session/fork.hpp
+++ b/src/steam/mobject/session/fork.hpp
@@ -60,7 +60,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {     //////////////////////////////////////////////////////TICKET #637
   
@@ -141,5 +141,5 @@ namespace session {     //////////////////////////////////////////////////////TI
   template class Placement<session::Fork, session::Meta>;
   typedef Placement<session::Fork, session::Meta> PFork;
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif /*MOBJECT_SESSION_FORK_H*/
diff --git a/src/steam/mobject/session/generator-mo.cpp b/src/steam/mobject/session/generator-mo.cpp
index edb6ab77f..9f5cb567d 100644
--- a/src/steam/mobject/session/generator-mo.cpp
+++ b/src/steam/mobject/session/generator-mo.cpp
@@ -37,7 +37,7 @@
 //using lib::time::Mutation;
 //using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 
diff --git a/src/steam/mobject/session/generator-mo.hpp b/src/steam/mobject/session/generator-mo.hpp
index db2e5013e..4da6b810b 100644
--- a/src/steam/mobject/session/generator-mo.hpp
+++ b/src/steam/mobject/session/generator-mo.hpp
@@ -36,7 +36,7 @@
 #include "lib/time/timevalue.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   class Media;
   class Clip;
@@ -94,5 +94,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/label.cpp b/src/steam/mobject/session/label.cpp
index 542d21c2e..39f40903a 100644
--- a/src/steam/mobject/session/label.cpp
+++ b/src/steam/mobject/session/label.cpp
@@ -31,7 +31,7 @@
 
 using util::isnil;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -45,4 +45,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/label.hpp b/src/steam/mobject/session/label.hpp
index e3e909f10..6f57a787d 100644
--- a/src/steam/mobject/session/label.hpp
+++ b/src/steam/mobject/session/label.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -81,5 +81,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/lifecycle-advisor.hpp b/src/steam/mobject/session/lifecycle-advisor.hpp
index ca83022b8..997f40ae2 100644
--- a/src/steam/mobject/session/lifecycle-advisor.hpp
+++ b/src/steam/mobject/session/lifecycle-advisor.hpp
@@ -56,7 +56,7 @@
 #include "lib/symbol.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/locatingpin.cpp b/src/steam/mobject/session/locatingpin.cpp
index 84be763db..8a303c728 100644
--- a/src/steam/mobject/session/locatingpin.cpp
+++ b/src/steam/mobject/session/locatingpin.cpp
@@ -38,7 +38,7 @@
 
 using std::unique_ptr;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -209,4 +209,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/locatingpin.hpp b/src/steam/mobject/session/locatingpin.hpp
index e8314b772..33a4f06b1 100644
--- a/src/steam/mobject/session/locatingpin.hpp
+++ b/src/steam/mobject/session/locatingpin.hpp
@@ -56,7 +56,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset { class Pipe; }
 
 namespace mobject {
@@ -187,5 +187,5 @@ protected:
       
       
 
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/meta.cpp b/src/steam/mobject/session/meta.cpp
index 91c758dea..8341fa861 100644
--- a/src/steam/mobject/session/meta.cpp
+++ b/src/steam/mobject/session/meta.cpp
@@ -31,7 +31,7 @@
 
 #include "steam/mobject/session/meta.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -39,4 +39,4 @@ namespace session {
   
   
     
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/meta.hpp b/src/steam/mobject/session/meta.hpp
index 6e2351596..85e077d92 100644
--- a/src/steam/mobject/session/meta.hpp
+++ b/src/steam/mobject/session/meta.hpp
@@ -34,7 +34,7 @@
 #include "steam/mobject/session/abstractmo.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/mobjectfactory.cpp b/src/steam/mobject/session/mobjectfactory.cpp
index 7683a069b..ff9a8528f 100644
--- a/src/steam/mobject/session/mobjectfactory.cpp
+++ b/src/steam/mobject/session/mobjectfactory.cpp
@@ -40,7 +40,7 @@
 
 using lumiera::query::DefsManager;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
     ////////////////////////////////////////////////////////////////////////////////TICKET #414
diff --git a/src/steam/mobject/session/mobjectfactory.hpp b/src/steam/mobject/session/mobjectfactory.hpp
index ad79e4fa7..cadc2e00c 100644
--- a/src/steam/mobject/session/mobjectfactory.hpp
+++ b/src/steam/mobject/session/mobjectfactory.hpp
@@ -42,7 +42,7 @@ namespace query {
   class DefsManager;
 }}
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   class Clip;
@@ -88,5 +88,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/placement-index-query-resolver.cpp b/src/steam/mobject/session/placement-index-query-resolver.cpp
index 21c41d51d..776d29610 100644
--- a/src/steam/mobject/session/placement-index-query-resolver.cpp
+++ b/src/steam/mobject/session/placement-index-query-resolver.cpp
@@ -39,7 +39,7 @@
 #include <stack>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -407,4 +407,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/placement-index-query-resolver.hpp b/src/steam/mobject/session/placement-index-query-resolver.hpp
index 4c88c0480..e1c860735 100644
--- a/src/steam/mobject/session/placement-index-query-resolver.hpp
+++ b/src/steam/mobject/session/placement-index-query-resolver.hpp
@@ -64,7 +64,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
  
@@ -116,5 +116,5 @@ namespace session {
     };
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/placement-index.cpp b/src/steam/mobject/session/placement-index.cpp
index c48d58e3d..dd8b1a6dd 100644
--- a/src/steam/mobject/session/placement-index.cpp
+++ b/src/steam/mobject/session/placement-index.cpp
@@ -66,7 +66,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -725,4 +725,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/placement-index.hpp b/src/steam/mobject/session/placement-index.hpp
index c280e3fe1..e145fde5a 100644
--- a/src/steam/mobject/session/placement-index.hpp
+++ b/src/steam/mobject/session/placement-index.hpp
@@ -133,7 +133,7 @@ namespace std {
 }
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   class MObject;
@@ -344,5 +344,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/plug.cpp b/src/steam/mobject/session/plug.cpp
index cbff047f6..bc91ee82e 100644
--- a/src/steam/mobject/session/plug.cpp
+++ b/src/steam/mobject/session/plug.cpp
@@ -29,7 +29,7 @@
 #include "steam/mobject/session/plug.hpp"
 #include "steam/asset/pipe.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -37,4 +37,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/plug.hpp b/src/steam/mobject/session/plug.hpp
index fa963b99b..4822cafc9 100644
--- a/src/steam/mobject/session/plug.hpp
+++ b/src/steam/mobject/session/plug.hpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset { class Pipe; }
 
 namespace mobject {
@@ -50,5 +50,5 @@ namespace session {
       
     };
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/query-focus-stack.hpp b/src/steam/mobject/session/query-focus-stack.hpp
index 11683acac..e4240a85a 100644
--- a/src/steam/mobject/session/query-focus-stack.hpp
+++ b/src/steam/mobject/session/query-focus-stack.hpp
@@ -39,7 +39,7 @@
 using std::list;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/query-focus.cpp b/src/steam/mobject/session/query-focus.cpp
index cce4f3497..e6fdd0664 100644
--- a/src/steam/mobject/session/query-focus.cpp
+++ b/src/steam/mobject/session/query-focus.cpp
@@ -33,7 +33,7 @@
 
 using util::_Fmt;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -174,4 +174,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/query-focus.hpp b/src/steam/mobject/session/query-focus.hpp
index dcfb34324..33179335f 100644
--- a/src/steam/mobject/session/query-focus.hpp
+++ b/src/steam/mobject/session/query-focus.hpp
@@ -55,7 +55,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <string>
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -218,5 +218,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/query/fake-configrules.cpp b/src/steam/mobject/session/query/fake-configrules.cpp
index 8353fba11..9527931b2 100644
--- a/src/steam/mobject/session/query/fake-configrules.cpp
+++ b/src/steam/mobject/session/query/fake-configrules.cpp
@@ -54,7 +54,7 @@ using util::isnil;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #710 : to be removed entirely in Alpha
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -308,4 +308,4 @@ namespace session {
   
   
   } // namespace query
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/query/fake-configrules.hpp b/src/steam/mobject/session/query/fake-configrules.hpp
index 808b381b1..7208f7500 100644
--- a/src/steam/mobject/session/query/fake-configrules.hpp
+++ b/src/steam/mobject/session/query/fake-configrules.hpp
@@ -59,7 +59,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   namespace query {
@@ -303,5 +303,5 @@ namespace session {
     
     
   } // namespace query
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/relativelocation.cpp b/src/steam/mobject/session/relativelocation.cpp
index b23e107df..03aec7757 100644
--- a/src/steam/mobject/session/relativelocation.cpp
+++ b/src/steam/mobject/session/relativelocation.cpp
@@ -31,7 +31,7 @@
 #include "steam/mobject/session/relativelocation.hpp"
 #include "steam/mobject/mobject.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -51,4 +51,4 @@ namespace session {
   }
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/relativelocation.hpp b/src/steam/mobject/session/relativelocation.hpp
index ed7c6c6fb..8ce6f0487 100644
--- a/src/steam/mobject/session/relativelocation.hpp
+++ b/src/steam/mobject/session/relativelocation.hpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -86,5 +86,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/root.cpp b/src/steam/mobject/session/root.cpp
index 9fb79aa8f..29c9df4ef 100644
--- a/src/steam/mobject/session/root.cpp
+++ b/src/steam/mobject/session/root.cpp
@@ -33,7 +33,7 @@
 using lumiera::query::DefsManager;
 using lib::idi::EntryID;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -82,4 +82,4 @@ namespace session {
   /////////////////////////////////TODO more to come.....
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/root.hpp b/src/steam/mobject/session/root.hpp
index fbd323da7..e27b819a1 100644
--- a/src/steam/mobject/session/root.hpp
+++ b/src/steam/mobject/session/root.hpp
@@ -47,7 +47,7 @@ namespace query {
   class DefsManager;
 }}
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
     
@@ -99,5 +99,5 @@ namespace session {
   template class Placement<session::Root, session::Meta>;
   typedef Placement<session::Root, session::Meta> PRoot;
   
-}} // namespace proc::mobject
+}} // namespace steam::mobject
 #endif
diff --git a/src/steam/mobject/session/scope-locator.hpp b/src/steam/mobject/session/scope-locator.hpp
index 42dfde42f..97d6f452a 100644
--- a/src/steam/mobject/session/scope-locator.hpp
+++ b/src/steam/mobject/session/scope-locator.hpp
@@ -40,7 +40,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -153,5 +153,5 @@ namespace session {
   }
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/scope-path.cpp b/src/steam/mobject/session/scope-path.cpp
index 52e23116f..43ab39593 100644
--- a/src/steam/mobject/session/scope-path.cpp
+++ b/src/steam/mobject/session/scope-path.cpp
@@ -39,7 +39,7 @@
 
 #include <algorithm>
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/scope-path.hpp b/src/steam/mobject/session/scope-path.hpp
index 28cede3b1..ddce6babc 100644
--- a/src/steam/mobject/session/scope-path.hpp
+++ b/src/steam/mobject/session/scope-path.hpp
@@ -117,7 +117,7 @@ namespace meta{
     };
 }}
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
diff --git a/src/steam/mobject/session/scope-query.hpp b/src/steam/mobject/session/scope-query.hpp
index b3c13d317..71e3b46a2 100644
--- a/src/steam/mobject/session/scope-query.hpp
+++ b/src/steam/mobject/session/scope-query.hpp
@@ -49,7 +49,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -233,5 +233,5 @@ namespace session {
   
 
 
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/scope.cpp b/src/steam/mobject/session/scope.cpp
index 085ad292f..f723161fd 100644
--- a/src/steam/mobject/session/scope.cpp
+++ b/src/steam/mobject/session/scope.cpp
@@ -53,7 +53,7 @@ using std::vector;
 using lib::IterSource;
 using lib::iter_source::wrapIter;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -255,4 +255,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/scope.hpp b/src/steam/mobject/session/scope.hpp
index c6012e87a..00d3bd6fa 100644
--- a/src/steam/mobject/session/scope.hpp
+++ b/src/steam/mobject/session/scope.hpp
@@ -37,7 +37,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -123,5 +123,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/segment.cpp b/src/steam/mobject/session/segment.cpp
index 962098f0e..b977c41c3 100644
--- a/src/steam/mobject/session/segment.cpp
+++ b/src/steam/mobject/session/segment.cpp
@@ -31,7 +31,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -39,4 +39,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/segment.hpp b/src/steam/mobject/session/segment.hpp
index 8eaea136a..b288da305 100644
--- a/src/steam/mobject/session/segment.hpp
+++ b/src/steam/mobject/session/segment.hpp
@@ -39,7 +39,7 @@
 
 using std::list;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -71,5 +71,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/segmentation.cpp b/src/steam/mobject/session/segmentation.cpp
index ebaedfb76..b7e4e9237 100644
--- a/src/steam/mobject/session/segmentation.cpp
+++ b/src/steam/mobject/session/segmentation.cpp
@@ -32,7 +32,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -77,4 +77,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/segmentation.hpp b/src/steam/mobject/session/segmentation.hpp
index 2fa2219e1..7d5ffb290 100644
--- a/src/steam/mobject/session/segmentation.hpp
+++ b/src/steam/mobject/session/segmentation.hpp
@@ -54,7 +54,7 @@
 using std::list;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -81,5 +81,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/sess-manager-impl.cpp b/src/steam/mobject/session/sess-manager-impl.cpp
index 10359ed35..192e4d2ba 100644
--- a/src/steam/mobject/session/sess-manager-impl.cpp
+++ b/src/steam/mobject/session/sess-manager-impl.cpp
@@ -53,7 +53,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -303,4 +303,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/sess-manager-impl.hpp b/src/steam/mobject/session/sess-manager-impl.hpp
index 5fdfc8dac..0bb955b6f 100644
--- a/src/steam/mobject/session/sess-manager-impl.hpp
+++ b/src/steam/mobject/session/sess-manager-impl.hpp
@@ -44,7 +44,7 @@
 #include "lib/sync.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -89,5 +89,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-impl.cpp b/src/steam/mobject/session/session-impl.cpp
index 875e5f742..431b8aa2d 100644
--- a/src/steam/mobject/session/session-impl.cpp
+++ b/src/steam/mobject/session/session-impl.cpp
@@ -36,7 +36,7 @@
 #include "lib/error.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -156,4 +156,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/session-impl.hpp b/src/steam/mobject/session/session-impl.hpp
index 5670df90f..4528a2856 100644
--- a/src/steam/mobject/session/session-impl.hpp
+++ b/src/steam/mobject/session/session-impl.hpp
@@ -63,7 +63,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -290,5 +290,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-interface-modules.hpp b/src/steam/mobject/session/session-interface-modules.hpp
index 0645cb9c3..a94484e5a 100644
--- a/src/steam/mobject/session/session-interface-modules.hpp
+++ b/src/steam/mobject/session/session-interface-modules.hpp
@@ -79,7 +79,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -130,5 +130,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-query.hpp b/src/steam/mobject/session/session-query.hpp
index e8376edd8..b45d1b5c8 100644
--- a/src/steam/mobject/session/session-query.hpp
+++ b/src/steam/mobject/session/session-query.hpp
@@ -48,7 +48,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -68,5 +68,5 @@ namespace session {
                 };
   }
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-service-defaults.hpp b/src/steam/mobject/session/session-service-defaults.hpp
index 295ae80de..2b966882e 100644
--- a/src/steam/mobject/session/session-service-defaults.hpp
+++ b/src/steam/mobject/session/session-service-defaults.hpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -56,5 +56,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-service-explore-scope.hpp b/src/steam/mobject/session/session-service-explore-scope.hpp
index 91deff56d..c608070ea 100644
--- a/src/steam/mobject/session/session-service-explore-scope.hpp
+++ b/src/steam/mobject/session/session-service-explore-scope.hpp
@@ -52,7 +52,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -77,5 +77,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-service-fetch.hpp b/src/steam/mobject/session/session-service-fetch.hpp
index 0c679b012..83dba87c4 100644
--- a/src/steam/mobject/session/session-service-fetch.hpp
+++ b/src/steam/mobject/session/session-service-fetch.hpp
@@ -44,7 +44,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -70,5 +70,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-service-mock-index.hpp b/src/steam/mobject/session/session-service-mock-index.hpp
index d01b02afe..af0072e87 100644
--- a/src/steam/mobject/session/session-service-mock-index.hpp
+++ b/src/steam/mobject/session/session-service-mock-index.hpp
@@ -51,7 +51,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -75,5 +75,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-service-mutate.hpp b/src/steam/mobject/session/session-service-mutate.hpp
index 029bf0073..441ac9cf4 100644
--- a/src/steam/mobject/session/session-service-mutate.hpp
+++ b/src/steam/mobject/session/session-service-mutate.hpp
@@ -46,7 +46,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -71,5 +71,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session-services.cpp b/src/steam/mobject/session/session-services.cpp
index 7e4b9d563..6dffde7fa 100644
--- a/src/steam/mobject/session/session-services.cpp
+++ b/src/steam/mobject/session/session-services.cpp
@@ -56,7 +56,7 @@
 
 using lib::Symbol;
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -199,4 +199,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/session-services.hpp b/src/steam/mobject/session/session-services.hpp
index ee5ee8fd0..c5e502dec 100644
--- a/src/steam/mobject/session/session-services.hpp
+++ b/src/steam/mobject/session/session-services.hpp
@@ -82,7 +82,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -137,5 +137,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/session.cpp b/src/steam/mobject/session/session.cpp
index 6d96ce825..4fff77d24 100644
--- a/src/steam/mobject/session/session.cpp
+++ b/src/steam/mobject/session/session.cpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
   
   using lib::Symbol;
@@ -153,4 +153,4 @@ namespace mobject {
 
 
 
-}} // namespace proc::mobject
+}} // namespace steam::mobject
diff --git a/src/steam/mobject/session/specific-contents-query.hpp b/src/steam/mobject/session/specific-contents-query.hpp
index 01b17e109..90c219492 100644
--- a/src/steam/mobject/session/specific-contents-query.hpp
+++ b/src/steam/mobject/session/specific-contents-query.hpp
@@ -42,7 +42,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -183,5 +183,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/session/wish.cpp b/src/steam/mobject/session/wish.cpp
index 5aa45734b..d9078e078 100644
--- a/src/steam/mobject/session/wish.cpp
+++ b/src/steam/mobject/session/wish.cpp
@@ -28,7 +28,7 @@
 
 #include "steam/mobject/session/wish.hpp"
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -36,4 +36,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
diff --git a/src/steam/mobject/session/wish.hpp b/src/steam/mobject/session/wish.hpp
index 3ef26ca9c..3bce2b999 100644
--- a/src/steam/mobject/session/wish.hpp
+++ b/src/steam/mobject/session/wish.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -51,5 +51,5 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/src/steam/mobject/test-dummy-mobject.hpp b/src/steam/mobject/test-dummy-mobject.hpp
index 552999e2e..3d9226b13 100644
--- a/src/steam/mobject/test-dummy-mobject.hpp
+++ b/src/steam/mobject/test-dummy-mobject.hpp
@@ -59,7 +59,7 @@ using std::rand;
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace test    {
   
@@ -162,5 +162,5 @@ namespace test    {
   
   
   
-}}} // namespace proc::mobject::test
+}}} // namespace steam::mobject::test
 #endif
diff --git a/src/steam/play/dummy-play-connection.cpp b/src/steam/play/dummy-play-connection.cpp
index 97afd8a31..bc734034b 100644
--- a/src/steam/play/dummy-play-connection.cpp
+++ b/src/steam/play/dummy-play-connection.cpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   
@@ -51,4 +51,4 @@ namespace play {
   /** */  
   
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/dummy-play-connection.hpp b/src/steam/play/dummy-play-connection.hpp
index 3ebee78ed..413235fca 100644
--- a/src/steam/play/dummy-play-connection.hpp
+++ b/src/steam/play/dummy-play-connection.hpp
@@ -98,7 +98,7 @@
 #include <vector>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
 //    using std::string;
@@ -275,5 +275,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif /*STEAM_PLAY_DUMMY_PLAY_CONNECTION_H*/
diff --git a/src/steam/play/dummy-player-service.cpp b/src/steam/play/dummy-player-service.cpp
index 09489b252..de6379467 100644
--- a/src/steam/play/dummy-player-service.cpp
+++ b/src/steam/play/dummy-player-service.cpp
@@ -42,7 +42,7 @@ extern "C" {
 
 
 
-namespace proc  {
+namespace steam  {
   namespace play{
   
     using std::string;
@@ -366,7 +366,7 @@ namespace proc  {
   
   } // namespace play
   
-} // namespace proc
+} // namespace steam
 
 
 
diff --git a/src/steam/play/dummy-player-service.hpp b/src/steam/play/dummy-player-service.hpp
index 9be9b553d..9da754f39 100644
--- a/src/steam/play/dummy-player-service.hpp
+++ b/src/steam/play/dummy-player-service.hpp
@@ -50,7 +50,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
   namespace node {
     class DummyImageGenerator;
     class TickService;
@@ -158,6 +158,6 @@ namespace proc {
     
   } // namespace play
 
-} // namespace proc
+} // namespace steam
 #endif
 
diff --git a/src/steam/play/output-director.cpp b/src/steam/play/output-director.cpp
index fae48bde2..a1b240f9a 100644
--- a/src/steam/play/output-director.cpp
+++ b/src/steam/play/output-director.cpp
@@ -34,7 +34,7 @@
 using backend::Thread;
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   
@@ -153,4 +153,4 @@ namespace play {
       }
   }
 
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/output-director.hpp b/src/steam/play/output-director.hpp
index aa5971725..284e125af 100644
--- a/src/steam/play/output-director.hpp
+++ b/src/steam/play/output-director.hpp
@@ -49,7 +49,7 @@
 namespace lumiera {
   class Play;
 }
-namespace proc {
+namespace steam {
 namespace play {
   
 //using std::string;
@@ -97,5 +97,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/output-manager.hpp b/src/steam/play/output-manager.hpp
index 6eda378b7..9c79ff213 100644
--- a/src/steam/play/output-manager.hpp
+++ b/src/steam/play/output-manager.hpp
@@ -41,7 +41,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
 //using std::string;
@@ -78,5 +78,5 @@ namespace play {
   typedef shared_ptr<OutputManager> POutputManager;
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/output-slot-connection.hpp b/src/steam/play/output-slot-connection.hpp
index 45574c71c..054f9ade0 100644
--- a/src/steam/play/output-slot-connection.hpp
+++ b/src/steam/play/output-slot-connection.hpp
@@ -57,7 +57,7 @@
 //#include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
   using proc::engine::BuffHandle;
@@ -247,5 +247,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/output-slot.cpp b/src/steam/play/output-slot.cpp
index 96c42f502..2fafdf858 100644
--- a/src/steam/play/output-slot.cpp
+++ b/src/steam/play/output-slot.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   using std::vector;
@@ -120,4 +120,4 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/output-slot.hpp b/src/steam/play/output-slot.hpp
index 006493493..26b50a82d 100644
--- a/src/steam/play/output-slot.hpp
+++ b/src/steam/play/output-slot.hpp
@@ -77,7 +77,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   using proc::engine::BuffHandle;
@@ -181,5 +181,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/play-controller.cpp b/src/steam/play/play-controller.cpp
index cdab60241..7df89704e 100644
--- a/src/steam/play/play-controller.cpp
+++ b/src/steam/play/play-controller.cpp
@@ -203,7 +203,7 @@ namespace lumiera {
 }
 
 
-namespace proc{
+namespace steam{
 namespace play{
   
 //    using std::string;
@@ -223,4 +223,4 @@ namespace play{
     /** */
   
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/play-controller.hpp b/src/steam/play/play-controller.hpp
index 5de6150a2..bc8ce4853 100644
--- a/src/steam/play/play-controller.hpp
+++ b/src/steam/play/play-controller.hpp
@@ -41,7 +41,7 @@
 //#include <string>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
   using std::string;
@@ -65,5 +65,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/play-process.cpp b/src/steam/play/play-process.cpp
index 7ec84c25c..25c380612 100644
--- a/src/steam/play/play-process.cpp
+++ b/src/steam/play/play-process.cpp
@@ -39,7 +39,7 @@ using lib::iter_source::transform;
 using lib::append_all;
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
 //    using std::string;
@@ -90,4 +90,4 @@ namespace play {
 
   
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/play-process.hpp b/src/steam/play/play-process.hpp
index a3cf6d606..420f1683d 100644
--- a/src/steam/play/play-process.hpp
+++ b/src/steam/play/play-process.hpp
@@ -67,7 +67,7 @@
 #include <vector>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
 //    using std::string;
@@ -141,5 +141,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/play-service.cpp b/src/steam/play/play-service.cpp
index ac9f16105..be8675eec 100644
--- a/src/steam/play/play-service.cpp
+++ b/src/steam/play/play-service.cpp
@@ -53,7 +53,7 @@ namespace lumiera {
 }//(End) namespace lumiera
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
 //using std::string;
@@ -198,7 +198,7 @@ namespace play {
  
 
 
-}} // namespace proc::play
+}} // namespace steam::play
 
 
 namespace lumiera {
diff --git a/src/steam/play/play-service.hpp b/src/steam/play/play-service.hpp
index c3babe30e..eb0eae720 100644
--- a/src/steam/play/play-service.hpp
+++ b/src/steam/play/play-service.hpp
@@ -64,7 +64,7 @@
 //#include <string>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
   using std::string;
@@ -120,5 +120,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/render-configurator.cpp b/src/steam/play/render-configurator.cpp
index 98052d050..e8a22ead4 100644
--- a/src/steam/play/render-configurator.cpp
+++ b/src/steam/play/render-configurator.cpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   namespace error = lumiera::error;
@@ -167,4 +167,4 @@ namespace play {
   
  
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/render-configurator.hpp b/src/steam/play/render-configurator.hpp
index 307e260b7..2c4c365ef 100644
--- a/src/steam/play/render-configurator.hpp
+++ b/src/steam/play/render-configurator.hpp
@@ -53,7 +53,7 @@
 //#include <string>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
 //    using std::string;
@@ -125,5 +125,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/play/sound/jack-output.cpp b/src/steam/play/sound/jack-output.cpp
index 038ecfa25..950feaf3f 100644
--- a/src/steam/play/sound/jack-output.cpp
+++ b/src/steam/play/sound/jack-output.cpp
@@ -30,9 +30,9 @@
 
 #include "steam/play/sound/jack-output.hpp"
   
-namespace proc {
+namespace steam {
 namespace play {
 namespace sound {
   
   
-}}} // namespace proc::play::sound
+}}} // namespace steam::play::sound
diff --git a/src/steam/play/sound/jack-output.hpp b/src/steam/play/sound/jack-output.hpp
index 31ac1f51f..27e4077d4 100644
--- a/src/steam/play/sound/jack-output.hpp
+++ b/src/steam/play/sound/jack-output.hpp
@@ -45,10 +45,10 @@
 //#include <vector>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 namespace sound {
   
   
-}}} // namespace proc::play::sound
+}}} // namespace steam::play::sound
 #endif
diff --git a/src/steam/play/timings.cpp b/src/steam/play/timings.cpp
index 663dc38f0..70288bfe8 100644
--- a/src/steam/play/timings.cpp
+++ b/src/steam/play/timings.cpp
@@ -37,7 +37,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
   
   using backend::engine::EngineConfig;
@@ -215,4 +215,4 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
diff --git a/src/steam/play/timings.hpp b/src/steam/play/timings.hpp
index 9bfc0bc9a..260cabaf0 100644
--- a/src/steam/play/timings.hpp
+++ b/src/steam/play/timings.hpp
@@ -61,7 +61,7 @@ namespace time{
   typedef std::shared_ptr<const Quantiser> PQuant;
 }}
 
-namespace proc {
+namespace steam {
 namespace play {
 
   using lib::time::FrameCnt;
@@ -199,5 +199,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/src/steam/state.hpp b/src/steam/state.hpp
index acf5bbeec..0b78c58af 100644
--- a/src/steam/state.hpp
+++ b/src/steam/state.hpp
@@ -37,7 +37,7 @@
 #include <cstddef>
 
 
-namespace proc {
+namespace steam {
 namespace engine { 
   
   using lumiera::FrameID;
@@ -115,7 +115,7 @@ namespace engine {
       friend class engine::StateAdapter;
     };
   
-}} // namespace proc::engine
+}} // namespace steam::engine
 
 
 
diff --git a/src/steam/streamtype.cpp b/src/steam/streamtype.cpp
index 8e6313006..8a110b68c 100644
--- a/src/steam/streamtype.cpp
+++ b/src/steam/streamtype.cpp
@@ -29,7 +29,7 @@
 #include "steam/streamtype.hpp"
 
 
-namespace proc {
+namespace steam {
 
    /** @internal defined here non-inline place the vtable in this object file.*/
    StreamType::ImplFacade::ImplFacade (Symbol libID)
@@ -38,4 +38,4 @@ namespace proc {
 
   
 
-} // namespace proc
+} // namespace steam
diff --git a/src/steam/streamtype.hpp b/src/steam/streamtype.hpp
index 6a5ca6f79..28002e672 100644
--- a/src/steam/streamtype.hpp
+++ b/src/steam/streamtype.hpp
@@ -40,7 +40,7 @@
 
 
 
-namespace proc {
+namespace steam {
   
   using lib::Symbol;
 
@@ -192,7 +192,7 @@ namespace proc {
   
   
   
-} // namespace proc
+} // namespace steam
 
 
 namespace lumiera {
diff --git a/src/vault/engine/engine-config.cpp b/src/vault/engine/engine-config.cpp
index 4e0ba27e2..7cf4dc6a2 100644
--- a/src/vault/engine/engine-config.cpp
+++ b/src/vault/engine/engine-config.cpp
@@ -37,7 +37,7 @@ using lib::time::FrameRate;
 using lib::time::FSecs;
 
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   namespace { // Hard wired placeholder settings...
@@ -82,7 +82,7 @@ namespace engine {
     return DEFAULT_JOB_PLANNING_TURNOVER;
   }
   
-}} // namespace backend::engine
+}} // namespace vault::engine
 
 namespace {
   using backend::engine::EngineConfig;
diff --git a/src/vault/engine/engine-config.h b/src/vault/engine/engine-config.h
index d8930c447..f910abbf9 100644
--- a/src/vault/engine/engine-config.h
+++ b/src/vault/engine/engine-config.h
@@ -40,7 +40,7 @@
 #include "lib/depend.hpp"
 
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   using lib::time::Duration;
@@ -100,7 +100,7 @@ namespace engine {
       Duration currentJobPlanningRhythm()  const;
     };
 
-}} // namespace backend::engine
+}} // namespace vault::engine
 
 
 
diff --git a/src/vault/engine/job.cpp b/src/vault/engine/job.cpp
index 914a94d05..c9ff17087 100644
--- a/src/vault/engine/job.cpp
+++ b/src/vault/engine/job.cpp
@@ -40,7 +40,7 @@
 #include <typeinfo>
 
 
-namespace backend {
+namespace vault {
 namespace engine {
   
   namespace { // Details...
@@ -143,7 +143,7 @@ namespace engine {
     }
   
   
-}} // namespace backend::engine
+}} // namespace vault::engine
 
 namespace {
   using backend::engine::Job;
diff --git a/src/vault/engine/job.h b/src/vault/engine/job.h
index 890168fa7..6e8ebbf3f 100644
--- a/src/vault/engine/job.h
+++ b/src/vault/engine/job.h
@@ -189,7 +189,7 @@ typedef lumiera_jobDescriptor* LumieraJobDescriptor;
 
 
 
-namespace backend {
+namespace vault {
 namespace engine {
   
   using lib::time::TimeValue;
@@ -304,7 +304,7 @@ namespace engine {
   
   
   
-}} // namespace backend::engine
+}} // namespace vault::engine
 
 
 
diff --git a/src/vault/engine/scheduler-diagnostics.hpp b/src/vault/engine/scheduler-diagnostics.hpp
index d0955f22d..a6a56c41b 100644
--- a/src/vault/engine/scheduler-diagnostics.hpp
+++ b/src/vault/engine/scheduler-diagnostics.hpp
@@ -44,7 +44,7 @@
 #include "vault/engine/scheduler-frontend.hpp"
 
 
-namespace backend{
+namespace vault{
 namespace engine {
 
 //    using std::string;
@@ -141,5 +141,5 @@ namespace engine {
   
   
   
-}} // namespace backend::engine
+}} // namespace vault::engine
 #endif
diff --git a/src/vault/engine/scheduler-frontend.cpp b/src/vault/engine/scheduler-frontend.cpp
index 5692a28d9..389105ba1 100644
--- a/src/vault/engine/scheduler-frontend.cpp
+++ b/src/vault/engine/scheduler-frontend.cpp
@@ -29,7 +29,7 @@
 #include "lib/error.h"
 #include "vault/engine/scheduler-frontend.hpp"
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   
@@ -60,4 +60,4 @@ namespace engine {
   
   
   
-}} // namespace backend::engine
+}} // namespace vault::engine
diff --git a/src/vault/engine/scheduler-frontend.hpp b/src/vault/engine/scheduler-frontend.hpp
index 4e012061a..c12a61c4f 100644
--- a/src/vault/engine/scheduler-frontend.hpp
+++ b/src/vault/engine/scheduler-frontend.hpp
@@ -37,7 +37,7 @@
 #include "vault/engine/job.h"
 
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   using lib::time::Time;
@@ -176,5 +176,5 @@ namespace engine {
       
     };
 
-}} // namespace backend::engine
+}} // namespace vault::engine
 #endif
diff --git a/src/vault/enginefacade.cpp b/src/vault/enginefacade.cpp
index 1de7b505b..bf4a627a7 100644
--- a/src/vault/enginefacade.cpp
+++ b/src/vault/enginefacade.cpp
@@ -38,7 +38,7 @@
 #include <string>
 
 
-namespace backend {
+namespace vault {
 
   using std::string;
   using lumiera::Subsys;
@@ -93,4 +93,4 @@ namespace backend {
 
 
 
-} // namespace backend
+} // namespace vault
diff --git a/src/vault/enginefacade.hpp b/src/vault/enginefacade.hpp
index bfad1aea5..b4c0df7f6 100644
--- a/src/vault/enginefacade.hpp
+++ b/src/vault/enginefacade.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace backend {
+namespace vault {
   
   
   /**************************************************************//**
@@ -67,5 +67,5 @@ namespace backend {
     
   
   
-} // namespace backend
+} // namespace vault
 #endif
diff --git a/src/vault/media-access-facade.cpp b/src/vault/media-access-facade.cpp
index 8a4ecf1a1..5f89bd8ed 100644
--- a/src/vault/media-access-facade.cpp
+++ b/src/vault/media-access-facade.cpp
@@ -36,7 +36,7 @@
 using util::isnil;
 using lumiera::error::Invalid;
 
-namespace backend {
+namespace vault {
   
   /** storage for the SingletonFactory 
    *  (actually a lumiera::test::MockInjector) */
@@ -64,4 +64,4 @@ namespace backend {
 
 
 
-} // namespace backend
+} // namespace vault
diff --git a/src/vault/media-access-facade.hpp b/src/vault/media-access-facade.hpp
index ba3817a72..9100f5661 100644
--- a/src/vault/media-access-facade.hpp
+++ b/src/vault/media-access-facade.hpp
@@ -44,7 +44,7 @@
 
 
 
-namespace backend {
+namespace vault {
   
   using lib::time::Duration;
   using std::string;
@@ -145,7 +145,7 @@ namespace backend {
         { }
     };
   
-} // namespace backend
+} // namespace vault
 
 
 namespace backend_interface {
diff --git a/src/vault/netnodefacade.cpp b/src/vault/netnodefacade.cpp
index f0c5c5f5c..af347d532 100644
--- a/src/vault/netnodefacade.cpp
+++ b/src/vault/netnodefacade.cpp
@@ -34,7 +34,7 @@
 
 #include <string>
 
-namespace backend {
+namespace vault {
   
   using std::string;
   using lumiera::Subsys;
@@ -89,4 +89,4 @@ namespace backend {
 
 
 
-} // namespace backend
+} // namespace vault
diff --git a/src/vault/netnodefacade.hpp b/src/vault/netnodefacade.hpp
index 4b1b2452e..90fe60909 100644
--- a/src/vault/netnodefacade.hpp
+++ b/src/vault/netnodefacade.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace backend {
+namespace vault {
   
   
   /**************************************************************//**
@@ -65,5 +65,5 @@ namespace backend {
     
   
   
-} // namespace backend
+} // namespace vault
 #endif
diff --git a/src/vault/real-clock.cpp b/src/vault/real-clock.cpp
index 8b893f928..9b4344846 100644
--- a/src/vault/real-clock.cpp
+++ b/src/vault/real-clock.cpp
@@ -36,7 +36,7 @@
 #include <ctime>
 
 
-namespace backend {
+namespace vault {
   
 #define MICRO_TICS_PER_NANOSECOND (1000*1000*1000 / GAVL_TIME_SCALE)
   
@@ -60,4 +60,4 @@ namespace backend {
   
   
   
-} // namespace backend
+} // namespace vault
diff --git a/src/vault/real-clock.hpp b/src/vault/real-clock.hpp
index f6a51faf8..ee98b01f7 100644
--- a/src/vault/real-clock.hpp
+++ b/src/vault/real-clock.hpp
@@ -59,7 +59,7 @@
 //  typedef std::shared_ptr<const Quantiser> PQuant;
 //}}
 
-namespace backend {
+namespace vault {
 
   using lib::time::Time;
   using lib::time::TimeValue;
@@ -91,5 +91,5 @@ namespace backend {
   
   
   
-} // namespace backend
+} // namespace vault
 #endif
diff --git a/src/vault/scriptrunnerfacade.cpp b/src/vault/scriptrunnerfacade.cpp
index c24330015..c04dd852a 100644
--- a/src/vault/scriptrunnerfacade.cpp
+++ b/src/vault/scriptrunnerfacade.cpp
@@ -36,7 +36,7 @@
 #include <string>
 
 
-namespace backend {
+namespace vault {
   
   using std::string;
   using lumiera::Subsys;
@@ -91,4 +91,4 @@ namespace backend {
 
 
 
-} // namespace backend
+} // namespace vault
diff --git a/src/vault/scriptrunnerfacade.hpp b/src/vault/scriptrunnerfacade.hpp
index 34f44dfee..715592c96 100644
--- a/src/vault/scriptrunnerfacade.hpp
+++ b/src/vault/scriptrunnerfacade.hpp
@@ -37,7 +37,7 @@
 
 
 
-namespace backend {
+namespace vault {
   
   
   /*******************************************************************//**
@@ -63,5 +63,5 @@ namespace backend {
     
   
   
-} // namespace backend
+} // namespace vault
 #endif
diff --git a/src/vault/thread-wrapper.hpp b/src/vault/thread-wrapper.hpp
index fc48bfab9..f8c71f13b 100644
--- a/src/vault/thread-wrapper.hpp
+++ b/src/vault/thread-wrapper.hpp
@@ -55,7 +55,7 @@ extern "C" {
 #include <utility>
 
 
-namespace backend {
+namespace vault {
   
   using lib::Literal;
   namespace error = lumiera::error;
@@ -294,5 +294,5 @@ namespace backend {
   
   
   
-} // namespace backend
+} // namespace vault
 #endif /*LIB_THREADWRAPPER_H*/
diff --git a/tests/basics/diagnostic-context-test.cpp b/tests/basics/diagnostic-context-test.cpp
index 395c9f058..a621aedfd 100644
--- a/tests/basics/diagnostic-context-test.cpp
+++ b/tests/basics/diagnostic-context-test.cpp
@@ -221,4 +221,4 @@ namespace test{
   
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/basics/stream-type-basics-test.cpp b/tests/basics/stream-type-basics-test.cpp
index ff3d0bb2b..56b611f17 100644
--- a/tests/basics/stream-type-basics-test.cpp
+++ b/tests/basics/stream-type-basics-test.cpp
@@ -35,7 +35,7 @@ using ::test::Test;
 using util::isnil;
 
 
-namespace proc {
+namespace steam {
 namespace test_format {
   
   using control::STypeManager;
@@ -117,5 +117,5 @@ namespace test_format {
   LAUNCHER (StreamTypeBasics_test, "unit common");
   
   
-}} // namespace proc::test_format
+}} // namespace steam::test_format
 
diff --git a/tests/basics/stream-type-lifecycle-test.cpp b/tests/basics/stream-type-lifecycle-test.cpp
index 2b5007d7b..4154bbc09 100644
--- a/tests/basics/stream-type-lifecycle-test.cpp
+++ b/tests/basics/stream-type-lifecycle-test.cpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace test_format {
   
   using mobject::Session;
@@ -112,5 +112,5 @@ namespace test_format {
   LAUNCHER (StreamTypeLifecycle_test, "unit common");
   
   
-}} // namespace proc::test_format
+}} // namespace steam::test_format
 
diff --git a/tests/basics/teststreamtypes.hpp b/tests/basics/teststreamtypes.hpp
index e7d17bfe0..e9bff1255 100644
--- a/tests/basics/teststreamtypes.hpp
+++ b/tests/basics/teststreamtypes.hpp
@@ -39,7 +39,7 @@ extern "C" {
 }
 
 
-namespace proc {
+namespace steam {
 namespace test_format {
   
   namespace { // constants used to parametrise tests
@@ -94,5 +94,5 @@ namespace test_format {
   
   
   
-}} // namespace proc::test_format
+}} // namespace steam::test_format
 #endif
diff --git a/tests/core/steam/asset/asset-category-test.cpp b/tests/core/steam/asset/asset-category-test.cpp
index 1e897105a..6a0c0df1b 100644
--- a/tests/core/steam/asset/asset-category-test.cpp
+++ b/tests/core/steam/asset/asset-category-test.cpp
@@ -38,7 +38,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -141,4 +141,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/asset-diagnostics.hpp b/tests/core/steam/asset/asset-diagnostics.hpp
index 8b12a6c81..9480a54fb 100644
--- a/tests/core/steam/asset/asset-diagnostics.hpp
+++ b/tests/core/steam/asset/asset-diagnostics.hpp
@@ -50,7 +50,7 @@ using std::string;
 using std::cout;
 
 
-namespace proc {
+namespace steam {
 namespace asset {
   
   inline void
@@ -89,5 +89,5 @@ namespace asset {
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/tests/core/steam/asset/basicpipetest.cpp b/tests/core/steam/asset/basicpipetest.cpp
index a663bea82..4a075b386 100644
--- a/tests/core/steam/asset/basicpipetest.cpp
+++ b/tests/core/steam/asset/basicpipetest.cpp
@@ -43,7 +43,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc  {
+namespace steam  {
 namespace asset {
 namespace test  {
   
@@ -213,4 +213,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/compoundmediatest.cpp b/tests/core/steam/asset/compoundmediatest.cpp
index 9cb9fa28e..d85ce1ad4 100644
--- a/tests/core/steam/asset/compoundmediatest.cpp
+++ b/tests/core/steam/asset/compoundmediatest.cpp
@@ -39,7 +39,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -105,4 +105,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/create-asset-test.cpp b/tests/core/steam/asset/create-asset-test.cpp
index 6f5572aca..8584353f0 100644
--- a/tests/core/steam/asset/create-asset-test.cpp
+++ b/tests/core/steam/asset/create-asset-test.cpp
@@ -47,7 +47,7 @@ using lib::time::FrameRate;
 using lib::test::randStr;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -252,4 +252,4 @@ namespace test {
 
 
 
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/deleteassettest.cpp b/tests/core/steam/asset/deleteassettest.cpp
index 6b3a3fb51..abe2ef507 100644
--- a/tests/core/steam/asset/deleteassettest.cpp
+++ b/tests/core/steam/asset/deleteassettest.cpp
@@ -32,7 +32,7 @@
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -61,4 +61,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/dependent-assets-test.cpp b/tests/core/steam/asset/dependent-assets-test.cpp
index ed7ff2e20..24822a28f 100644
--- a/tests/core/steam/asset/dependent-assets-test.cpp
+++ b/tests/core/steam/asset/dependent-assets-test.cpp
@@ -38,7 +38,7 @@ using util::contains;
 using util::isnil;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -218,4 +218,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/identity-of-assets-test.cpp b/tests/core/steam/asset/identity-of-assets-test.cpp
index be3438550..1df41d917 100644
--- a/tests/core/steam/asset/identity-of-assets-test.cpp
+++ b/tests/core/steam/asset/identity-of-assets-test.cpp
@@ -41,7 +41,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -113,4 +113,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/make-clip-test.cpp b/tests/core/steam/asset/make-clip-test.cpp
index b5387d1b6..e0689b6a3 100644
--- a/tests/core/steam/asset/make-clip-test.cpp
+++ b/tests/core/steam/asset/make-clip-test.cpp
@@ -43,7 +43,7 @@ using std::string;
 
 using std::static_pointer_cast; //TODO only temporarily;
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -94,4 +94,4 @@ TODO ("implement Processing Pattern!!!");
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/media-structure-query-test.cpp b/tests/core/steam/asset/media-structure-query-test.cpp
index 7685ddc07..d7990e260 100644
--- a/tests/core/steam/asset/media-structure-query-test.cpp
+++ b/tests/core/steam/asset/media-structure-query-test.cpp
@@ -38,7 +38,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -66,4 +66,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/meta/time-grid-basics-test.cpp b/tests/core/steam/asset/meta/time-grid-basics-test.cpp
index 530a4f005..54f77303e 100644
--- a/tests/core/steam/asset/meta/time-grid-basics-test.cpp
+++ b/tests/core/steam/asset/meta/time-grid-basics-test.cpp
@@ -41,7 +41,7 @@ using lib::test::randStr;
 
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace meta {
 namespace test {
@@ -132,4 +132,4 @@ namespace test {
   LAUNCHER (TimeGridBasics_test, "unit asset");
   
   
-}}}} // namespace proc::asset::meta::test
+}}}} // namespace steam::asset::meta::test
diff --git a/tests/core/steam/asset/ordering-of-assets-test.cpp b/tests/core/steam/asset/ordering-of-assets-test.cpp
index a8d03d3ca..bf14aa557 100644
--- a/tests/core/steam/asset/ordering-of-assets-test.cpp
+++ b/tests/core/steam/asset/ordering-of-assets-test.cpp
@@ -40,7 +40,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -136,4 +136,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/testasset.cpp b/tests/core/steam/asset/testasset.cpp
index 1786a1f5d..4910e0238 100644
--- a/tests/core/steam/asset/testasset.cpp
+++ b/tests/core/steam/asset/testasset.cpp
@@ -31,7 +31,7 @@
 using std::static_pointer_cast;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -92,7 +92,7 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
 
 
 
@@ -105,7 +105,7 @@ namespace test {
 #include "steam/asset/unknown.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -120,4 +120,4 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
diff --git a/tests/core/steam/asset/testasset.hpp b/tests/core/steam/asset/testasset.hpp
index 90eb6cc64..6d0c52d6a 100644
--- a/tests/core/steam/asset/testasset.hpp
+++ b/tests/core/steam/asset/testasset.hpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace asset{
 namespace test {
   
@@ -73,5 +73,5 @@ namespace test {
   
   
   
-}}} // namespace proc::asset::test
+}}} // namespace steam::asset::test
 #endif
diff --git a/tests/core/steam/asset/testclipasset.hpp b/tests/core/steam/asset/testclipasset.hpp
index b10925925..b23d524f1 100644
--- a/tests/core/steam/asset/testclipasset.hpp
+++ b/tests/core/steam/asset/testclipasset.hpp
@@ -36,7 +36,7 @@
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace asset{
   
   /**
@@ -53,5 +53,5 @@ namespace asset{
   
   
   
-}} // namespace proc::asset
+}} // namespace steam::asset
 #endif
diff --git a/tests/core/steam/asset/typed-id-test.cpp b/tests/core/steam/asset/typed-id-test.cpp
index 5d9f4cf9f..e8e086d5e 100644
--- a/tests/core/steam/asset/typed-id-test.cpp
+++ b/tests/core/steam/asset/typed-id-test.cpp
@@ -56,7 +56,7 @@ using lib::P;
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test {
diff --git a/tests/core/steam/control/argument-tuple-accept-test.cpp b/tests/core/steam/control/argument-tuple-accept-test.cpp
index a3bbe80fe..da12bb7d6 100644
--- a/tests/core/steam/control/argument-tuple-accept-test.cpp
+++ b/tests/core/steam/control/argument-tuple-accept-test.cpp
@@ -36,7 +36,7 @@
 #include <tuple>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -125,4 +125,4 @@ namespace test    {
   LAUNCHER (ArgumentTupleAccept_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-argument-test.cpp b/tests/core/steam/control/command-argument-test.cpp
index 7339bd600..ba3b39c80 100644
--- a/tests/core/steam/control/command-argument-test.cpp
+++ b/tests/core/steam/control/command-argument-test.cpp
@@ -52,7 +52,7 @@ using std::make_tuple;
 using std::rand;
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -411,4 +411,4 @@ namespace test    {
   LAUNCHER (CommandArgument_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-basic-test.cpp b/tests/core/steam/control/command-basic-test.cpp
index b86d2d855..e0c9047c8 100644
--- a/tests/core/steam/control/command-basic-test.cpp
+++ b/tests/core/steam/control/command-basic-test.cpp
@@ -35,7 +35,7 @@
 using std::rand;
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -127,4 +127,4 @@ namespace test    {
   LAUNCHER (CommandBasic_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-binding-test.cpp b/tests/core/steam/control/command-binding-test.cpp
index 0c492bc32..cca76b142 100644
--- a/tests/core/steam/control/command-binding-test.cpp
+++ b/tests/core/steam/control/command-binding-test.cpp
@@ -31,7 +31,7 @@
 #include "lib/format-cout.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -122,4 +122,4 @@ namespace test    {
   LAUNCHER (CommandBinding_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-clone-builder-test.cpp b/tests/core/steam/control/command-clone-builder-test.cpp
index 236d210c8..bccb0df22 100644
--- a/tests/core/steam/control/command-clone-builder-test.cpp
+++ b/tests/core/steam/control/command-clone-builder-test.cpp
@@ -38,7 +38,7 @@
 #include "steam/control/test-dummy-commands.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -177,4 +177,4 @@ namespace test    {
   LAUNCHER (CommandCloneBuilder_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-equality-test.cpp b/tests/core/steam/control/command-equality-test.cpp
index c8e08c989..963bee5d5 100644
--- a/tests/core/steam/control/command-equality-test.cpp
+++ b/tests/core/steam/control/command-equality-test.cpp
@@ -42,7 +42,7 @@
 #include <string>
 #include <tuple>
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -328,4 +328,4 @@ namespace test    {
   LAUNCHER (CommandEquality_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-instance-manager-test.cpp b/tests/core/steam/control/command-instance-manager-test.cpp
index a957e4b59..52b08610a 100644
--- a/tests/core/steam/control/command-instance-manager-test.cpp
+++ b/tests/core/steam/control/command-instance-manager-test.cpp
@@ -40,7 +40,7 @@
 #include <deque>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test {
   
@@ -416,4 +416,4 @@ namespace test {
   LAUNCHER (CommandInstanceManager_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-message-binding-test.cpp b/tests/core/steam/control/command-message-binding-test.cpp
index 892d4d4f2..e578ab28d 100644
--- a/tests/core/steam/control/command-message-binding-test.cpp
+++ b/tests/core/steam/control/command-message-binding-test.cpp
@@ -32,7 +32,7 @@
 #include "lib/diff/gen-node.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -133,4 +133,4 @@ namespace test    {
   LAUNCHER (CommandMessageBinding_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-mutation-test.cpp b/tests/core/steam/control/command-mutation-test.cpp
index db5e32ccf..9ef89c987 100644
--- a/tests/core/steam/control/command-mutation-test.cpp
+++ b/tests/core/steam/control/command-mutation-test.cpp
@@ -43,7 +43,7 @@ using std::string;
 using std::rand;
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -217,4 +217,4 @@ namespace test    {
   LAUNCHER (CommandMutation_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-queue-test.cpp b/tests/core/steam/control/command-queue-test.cpp
index 5d5c565c1..a851e155a 100644
--- a/tests/core/steam/control/command-queue-test.cpp
+++ b/tests/core/steam/control/command-queue-test.cpp
@@ -34,7 +34,7 @@
 //#include <cstdlib>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -157,4 +157,4 @@ namespace test    {
   LAUNCHER (CommandQueue_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-registry-test.cpp b/tests/core/steam/control/command-registry-test.cpp
index ad903cc1b..8137fe36a 100644
--- a/tests/core/steam/control/command-registry-test.cpp
+++ b/tests/core/steam/control/command-registry-test.cpp
@@ -37,7 +37,7 @@
 #include <functional>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -241,4 +241,4 @@ namespace test    {
   LAUNCHER (CommandRegistry_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-setup-test.cpp b/tests/core/steam/control/command-setup-test.cpp
index 788217c88..11223c5ca 100644
--- a/tests/core/steam/control/command-setup-test.cpp
+++ b/tests/core/steam/control/command-setup-test.cpp
@@ -36,7 +36,7 @@
 #include <regex>
 
 
-namespace proc {
+namespace steam {
 namespace cmd  {
 namespace test {
   
@@ -280,4 +280,4 @@ namespace test {
   LAUNCHER (CommandSetup_test, "unit controller");
   
   
-}}} // namespace proc::cmd::test
+}}} // namespace steam::cmd::test
diff --git a/tests/core/steam/control/command-use1-test.cpp b/tests/core/steam/control/command-use1-test.cpp
index f8d33eba9..c5e08e02a 100644
--- a/tests/core/steam/control/command-use1-test.cpp
+++ b/tests/core/steam/control/command-use1-test.cpp
@@ -35,7 +35,7 @@
 #include "steam/control/test-dummy-commands.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -400,4 +400,4 @@ namespace test    {
   LAUNCHER (CommandUse1_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-use2-test.cpp b/tests/core/steam/control/command-use2-test.cpp
index d2fe121d6..afd06d51a 100644
--- a/tests/core/steam/control/command-use2-test.cpp
+++ b/tests/core/steam/control/command-use2-test.cpp
@@ -48,7 +48,7 @@ extern "C" {
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
 
@@ -268,4 +268,4 @@ namespace test    {
   LAUNCHER (CommandUse2_test, "function controller");
       
       
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/command-use3-test.cpp b/tests/core/steam/control/command-use3-test.cpp
index 6b11e4848..83427560c 100644
--- a/tests/core/steam/control/command-use3-test.cpp
+++ b/tests/core/steam/control/command-use3-test.cpp
@@ -39,7 +39,7 @@
 //#include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
 
@@ -104,4 +104,4 @@ namespace test    {
   LAUNCHER (CommandUse3_test, "function controller");
       
       
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/dispatcher-looper-test.cpp b/tests/core/steam/control/dispatcher-looper-test.cpp
index 6c5bb3268..0da8858e4 100644
--- a/tests/core/steam/control/dispatcher-looper-test.cpp
+++ b/tests/core/steam/control/dispatcher-looper-test.cpp
@@ -28,7 +28,7 @@
 #include <thread>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -506,4 +506,4 @@ namespace test    {
   LAUNCHER (DispatcherLooper_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/handling-pattern-basics-test.cpp b/tests/core/steam/control/handling-pattern-basics-test.cpp
index 67094376b..c2a53de63 100644
--- a/tests/core/steam/control/handling-pattern-basics-test.cpp
+++ b/tests/core/steam/control/handling-pattern-basics-test.cpp
@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -243,4 +243,4 @@ namespace test    {
   LAUNCHER (HandlingPatternBasics_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
index edfd5a782..3fcb32efb 100644
--- a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
+++ b/tests/core/steam/control/handling-pattern-standard-impl-test.cpp
@@ -52,7 +52,7 @@
 //#include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
 
@@ -120,4 +120,4 @@ namespace test    {
   LAUNCHER (HandlingPatternStandardImpl_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/memento-tie-test.cpp b/tests/core/steam/control/memento-tie-test.cpp
index f73f73f98..7b5e73495 100644
--- a/tests/core/steam/control/memento-tie-test.cpp
+++ b/tests/core/steam/control/memento-tie-test.cpp
@@ -37,7 +37,7 @@ using std::bind;
 using std::rand;
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -185,4 +185,4 @@ namespace test    {
   LAUNCHER (MementoTie_test, "unit controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/session-command-function-test.cpp b/tests/core/steam/control/session-command-function-test.cpp
index 87ed07148..61eb7f716 100644
--- a/tests/core/steam/control/session-command-function-test.cpp
+++ b/tests/core/steam/control/session-command-function-test.cpp
@@ -93,7 +93,7 @@ extern "C" {
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -415,4 +415,4 @@ namespace test    {
   LAUNCHER (SessionCommandFunction_test, "function controller");
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/test-dummy-commands.cpp b/tests/core/steam/control/test-dummy-commands.cpp
index 1072b35f1..9d17af1b7 100644
--- a/tests/core/steam/control/test-dummy-commands.cpp
+++ b/tests/core/steam/control/test-dummy-commands.cpp
@@ -30,7 +30,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -86,4 +86,4 @@ namespace test    {
   
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
diff --git a/tests/core/steam/control/test-dummy-commands.hpp b/tests/core/steam/control/test-dummy-commands.hpp
index 6d2dbaf16..f33f49998 100644
--- a/tests/core/steam/control/test-dummy-commands.hpp
+++ b/tests/core/steam/control/test-dummy-commands.hpp
@@ -47,7 +47,7 @@
 #include <string>
 
 
-namespace proc {
+namespace steam {
 namespace control {
 namespace test    {
   
@@ -165,5 +165,5 @@ namespace test    {
   extern CommandSetup test_Dummy_command3;
   
   
-}}} // namespace proc::control::test
+}}} // namespace steam::control::test
 #endif
diff --git a/tests/core/steam/engine/buff-table-test.cpp b/tests/core/steam/engine/buff-table-test.cpp
index b2d975220..0a78a5e2b 100644
--- a/tests/core/steam/engine/buff-table-test.cpp
+++ b/tests/core/steam/engine/buff-table-test.cpp
@@ -38,7 +38,7 @@
 using test::Test;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
 
@@ -183,4 +183,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/buffer-metadata-key-test.cpp b/tests/core/steam/engine/buffer-metadata-key-test.cpp
index 4f64c973a..9126517f9 100644
--- a/tests/core/steam/engine/buffer-metadata-key-test.cpp
+++ b/tests/core/steam/engine/buffer-metadata-key-test.cpp
@@ -38,7 +38,7 @@ using util::isnil;
 using util::isSameObject;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace metadata{
 namespace test  {
@@ -403,4 +403,4 @@ namespace test  {
   
   
   
-}}}} // namespace proc::engine::metadata::test
+}}}} // namespace steam::engine::metadata::test
diff --git a/tests/core/steam/engine/buffer-metadata-test.cpp b/tests/core/steam/engine/buffer-metadata-test.cpp
index f496308f6..c79493341 100644
--- a/tests/core/steam/engine/buffer-metadata-test.cpp
+++ b/tests/core/steam/engine/buffer-metadata-test.cpp
@@ -43,7 +43,7 @@ using util::isSameObject;
 using util::isnil;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -405,4 +405,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/buffer-provider-protocol-test.cpp b/tests/core/steam/engine/buffer-provider-protocol-test.cpp
index ab079bf67..b93b885e3 100644
--- a/tests/core/steam/engine/buffer-provider-protocol-test.cpp
+++ b/tests/core/steam/engine/buffer-provider-protocol-test.cpp
@@ -39,7 +39,7 @@ using util::isSameObject;
 using util::for_each;
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 namespace test  {
   
@@ -237,4 +237,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/calc-stream-test.cpp b/tests/core/steam/engine/calc-stream-test.cpp
index d1390b7ed..d6efd2317 100644
--- a/tests/core/steam/engine/calc-stream-test.cpp
+++ b/tests/core/steam/engine/calc-stream-test.cpp
@@ -36,7 +36,7 @@ using test::Test;
 //using std::rand;
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 namespace test  {
 
@@ -74,4 +74,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/dispatcher-interface-test.cpp b/tests/core/steam/engine/dispatcher-interface-test.cpp
index 409812029..e2998336e 100644
--- a/tests/core/steam/engine/dispatcher-interface-test.cpp
+++ b/tests/core/steam/engine/dispatcher-interface-test.cpp
@@ -52,7 +52,7 @@ using std::function;
 //using std::rand;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -308,4 +308,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/engine-interface-test.cpp b/tests/core/steam/engine/engine-interface-test.cpp
index d21ad595c..d358c6938 100644
--- a/tests/core/steam/engine/engine-interface-test.cpp
+++ b/tests/core/steam/engine/engine-interface-test.cpp
@@ -43,7 +43,7 @@ using test::Test;
 //using std::rand;
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 namespace test  {
   
@@ -115,4 +115,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/node-basic-test.cpp b/tests/core/steam/engine/node-basic-test.cpp
index 13dcfe601..2faba0166 100644
--- a/tests/core/steam/engine/node-basic-test.cpp
+++ b/tests/core/steam/engine/node-basic-test.cpp
@@ -39,7 +39,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -107,4 +107,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/node-fabrication-test.cpp b/tests/core/steam/engine/node-fabrication-test.cpp
index 78a2500ca..af33eca92 100644
--- a/tests/core/steam/engine/node-fabrication-test.cpp
+++ b/tests/core/steam/engine/node-fabrication-test.cpp
@@ -32,7 +32,7 @@
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -56,4 +56,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/node-operation-test.cpp b/tests/core/steam/engine/node-operation-test.cpp
index 65930421b..f5845b050 100644
--- a/tests/core/steam/engine/node-operation-test.cpp
+++ b/tests/core/steam/engine/node-operation-test.cpp
@@ -32,7 +32,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -56,4 +56,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/node-source-test.cpp b/tests/core/steam/engine/node-source-test.cpp
index e34b64042..3ef03b43a 100644
--- a/tests/core/steam/engine/node-source-test.cpp
+++ b/tests/core/steam/engine/node-source-test.cpp
@@ -32,7 +32,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -56,4 +56,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/testframe-test.cpp b/tests/core/steam/engine/testframe-test.cpp
index 875c56f5b..dee144ce2 100644
--- a/tests/core/steam/engine/testframe-test.cpp
+++ b/tests/core/steam/engine/testframe-test.cpp
@@ -38,7 +38,7 @@ using util::isSameObject;
 using std::unique_ptr;
 
 
-namespace proc {
+namespace steam {
 namespace engine{
 namespace test  {
   
@@ -211,4 +211,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/testframe.cpp b/tests/core/steam/engine/testframe.cpp
index a54eae7ae..551d4830c 100644
--- a/tests/core/steam/engine/testframe.cpp
+++ b/tests/core/steam/engine/testframe.cpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 namespace test   {
   
@@ -293,4 +293,4 @@ namespace test   {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/engine/testframe.hpp b/tests/core/steam/engine/testframe.hpp
index f3f64c955..dac3b9805 100644
--- a/tests/core/steam/engine/testframe.hpp
+++ b/tests/core/steam/engine/testframe.hpp
@@ -33,7 +33,7 @@
 #include <stdint.h>
 
 
-namespace proc {
+namespace steam {
 namespace engine {
 namespace test   {
   
@@ -121,5 +121,5 @@ namespace test   {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
 #endif
diff --git a/tests/core/steam/engine/tracking-heap-block-provider-test.cpp b/tests/core/steam/engine/tracking-heap-block-provider-test.cpp
index 5767133e0..9879f4bb5 100644
--- a/tests/core/steam/engine/tracking-heap-block-provider-test.cpp
+++ b/tests/core/steam/engine/tracking-heap-block-provider-test.cpp
@@ -37,7 +37,7 @@
 using std::rand;
 
 
-namespace proc  {
+namespace steam  {
 namespace engine{
 namespace test  {
   
@@ -224,4 +224,4 @@ namespace test  {
   
   
   
-}}} // namespace proc::engine::test
+}}} // namespace steam::engine::test
diff --git a/tests/core/steam/mobject/builder/build-segment-test.cpp b/tests/core/steam/mobject/builder/build-segment-test.cpp
index 5d0be8df5..06c049a0a 100644
--- a/tests/core/steam/mobject/builder/build-segment-test.cpp
+++ b/tests/core/steam/mobject/builder/build-segment-test.cpp
@@ -32,7 +32,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
 namespace test {
@@ -58,4 +58,4 @@ namespace test {
   
   
   
-}}}} // namespace proc::mobject::builder::test
+}}}} // namespace steam::mobject::builder::test
diff --git a/tests/core/steam/mobject/builder/builder-tool-test.cpp b/tests/core/steam/mobject/builder/builder-tool-test.cpp
index a172e132a..ddeea3b54 100644
--- a/tests/core/steam/mobject/builder/builder-tool-test.cpp
+++ b/tests/core/steam/mobject/builder/builder-tool-test.cpp
@@ -43,7 +43,7 @@ using std::string;
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
 namespace test    {
@@ -151,4 +151,4 @@ namespace test    {
       
       
       
-}}}} // namespace proc::mobject::builder::test
+}}}} // namespace steam::mobject::builder::test
diff --git a/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp b/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp
index 1379c88e3..3f38f4c37 100644
--- a/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp
+++ b/tests/core/steam/mobject/builder/fixture-change-detector-test.cpp
@@ -34,7 +34,7 @@
 #include "lib/util.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
 namespace test  {
@@ -116,4 +116,4 @@ namespace test  {
   
   
   
-}}}} // namespace proc::mobject::builder::test
+}}}} // namespace steam::mobject::builder::test
diff --git a/tests/core/steam/mobject/builder/model-port-registry-test.cpp b/tests/core/steam/mobject/builder/model-port-registry-test.cpp
index 84dafdc28..2dbfcfa26 100644
--- a/tests/core/steam/mobject/builder/model-port-registry-test.cpp
+++ b/tests/core/steam/mobject/builder/model-port-registry-test.cpp
@@ -34,7 +34,7 @@
 #include "lib/util.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
 namespace test  {
@@ -278,4 +278,4 @@ namespace test  {
   
   
   
-}}}} // namespace proc::mobject::builder::test
+}}}} // namespace steam::mobject::builder::test
diff --git a/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp b/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp
index ba0e07d74..7d232f172 100644
--- a/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp
+++ b/tests/core/steam/mobject/builder/segmentation-datastructure-test.cpp
@@ -34,7 +34,7 @@
 #include "lib/util.hpp"
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace builder {
 namespace test  {
@@ -115,4 +115,4 @@ namespace test  {
   
   
   
-}}}} // namespace proc::mobject::builder::test
+}}}} // namespace steam::mobject::builder::test
diff --git a/tests/core/steam/mobject/controller/render-segment-test.cpp b/tests/core/steam/mobject/controller/render-segment-test.cpp
index 1fbfe65aa..8efe9340e 100644
--- a/tests/core/steam/mobject/controller/render-segment-test.cpp
+++ b/tests/core/steam/mobject/controller/render-segment-test.cpp
@@ -31,7 +31,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace controller {
 namespace test {
@@ -63,4 +63,4 @@ namespace test {
   
   
   
-}}}} // namespace proc::mobject::controller::test
+}}}} // namespace steam::mobject::controller::test
diff --git a/tests/core/steam/mobject/mobject-interface-test.cpp b/tests/core/steam/mobject/mobject-interface-test.cpp
index b967681d6..0f211bf6e 100644
--- a/tests/core/steam/mobject/mobject-interface-test.cpp
+++ b/tests/core/steam/mobject/mobject-interface-test.cpp
@@ -48,7 +48,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace test    {
   
@@ -132,4 +132,4 @@ namespace test    {
   LAUNCHER (MObjectInterface_test, "unit session");
   
   
-}}} // namespace proc::mobject::test
+}}} // namespace steam::mobject::test
diff --git a/tests/core/steam/mobject/mobject-ref-test.cpp b/tests/core/steam/mobject/mobject-ref-test.cpp
index 98af503e3..d15c62a83 100644
--- a/tests/core/steam/mobject/mobject-ref-test.cpp
+++ b/tests/core/steam/mobject/mobject-ref-test.cpp
@@ -52,7 +52,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace test    {
   
@@ -385,4 +385,4 @@ namespace test    {
   LAUNCHER (MObjectRef_test, "unit session");
   
   
-}}} // namespace proc::mobject::test
+}}} // namespace steam::mobject::test
diff --git a/tests/core/steam/mobject/output-mapping-test.cpp b/tests/core/steam/mobject/output-mapping-test.cpp
index 60ad18fa3..2a7d5baf6 100644
--- a/tests/core/steam/mobject/output-mapping-test.cpp
+++ b/tests/core/steam/mobject/output-mapping-test.cpp
@@ -39,7 +39,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace test {
   
@@ -184,4 +184,4 @@ namespace test {
   
   
   
-}}} // namespace proc::mobject::test
+}}} // namespace steam::mobject::test
diff --git a/tests/core/steam/mobject/placement-basic-test.cpp b/tests/core/steam/mobject/placement-basic-test.cpp
index 92d0911be..5106f439e 100644
--- a/tests/core/steam/mobject/placement-basic-test.cpp
+++ b/tests/core/steam/mobject/placement-basic-test.cpp
@@ -39,7 +39,7 @@
 using lib::time::Time;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -94,4 +94,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/placement-hierarchy-test.cpp b/tests/core/steam/mobject/placement-hierarchy-test.cpp
index 948194e44..ec61e0c90 100644
--- a/tests/core/steam/mobject/placement-hierarchy-test.cpp
+++ b/tests/core/steam/mobject/placement-hierarchy-test.cpp
@@ -41,7 +41,7 @@
 using lib::HashIndexed;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -172,4 +172,4 @@ namespace test    {
   LAUNCHER (PlacementHierarchy_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/placement-object-identity-test.cpp b/tests/core/steam/mobject/placement-object-identity-test.cpp
index 56f8cfd91..346f1f553 100644
--- a/tests/core/steam/mobject/placement-object-identity-test.cpp
+++ b/tests/core/steam/mobject/placement-object-identity-test.cpp
@@ -41,7 +41,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace test    {
   
@@ -155,4 +155,4 @@ namespace test    {
   LAUNCHER (PlacementObjectIdentity_test, "function session");
   
   
-}}} // namespace proc::mobject::test
+}}} // namespace steam::mobject::test
diff --git a/tests/core/steam/mobject/placement-ref-test.cpp b/tests/core/steam/mobject/placement-ref-test.cpp
index 29a4dc243..3bb8445ef 100644
--- a/tests/core/steam/mobject/placement-ref-test.cpp
+++ b/tests/core/steam/mobject/placement-ref-test.cpp
@@ -41,7 +41,7 @@
 using util::isSameObject;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -190,4 +190,4 @@ namespace test    {
   LAUNCHER (PlacementRef_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/add-clip-test.cpp b/tests/core/steam/mobject/session/add-clip-test.cpp
index 60166aa25..a3787910a 100644
--- a/tests/core/steam/mobject/session/add-clip-test.cpp
+++ b/tests/core/steam/mobject/session/add-clip-test.cpp
@@ -37,7 +37,7 @@ using util::contains;
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test {
@@ -71,4 +71,4 @@ namespace test {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
index 8aa9b6f49..9ad83afa4 100644
--- a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
+++ b/tests/core/steam/mobject/session/defs-manager-impl-test.cpp
@@ -44,7 +44,7 @@ using util::isnil;
 using std::string;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -181,4 +181,4 @@ lumiera::query::setFakeBypass(pipeWithSpecificStream); /////////////////////////
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/defs-manager-test.cpp b/tests/core/steam/mobject/session/defs-manager-test.cpp
index 35230f5ba..7e6498e69 100644
--- a/tests/core/steam/mobject/session/defs-manager-test.cpp
+++ b/tests/core/steam/mobject/session/defs-manager-test.cpp
@@ -45,7 +45,7 @@ using std::string;
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -203,4 +203,4 @@ namespace test    {
   LAUNCHER (DefsManager_test, "function session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/deletecliptest.cpp b/tests/core/steam/mobject/session/deletecliptest.cpp
index edbf92d77..a3e126a24 100644
--- a/tests/core/steam/mobject/session/deletecliptest.cpp
+++ b/tests/core/steam/mobject/session/deletecliptest.cpp
@@ -43,7 +43,7 @@ using proc_interface::IDA;
 using std::dynamic_pointer_cast;        /// TODO only temp
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -93,4 +93,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/dummy-session-connection-test.cpp b/tests/core/steam/mobject/session/dummy-session-connection-test.cpp
index 95be893ce..4545e808a 100644
--- a/tests/core/steam/mobject/session/dummy-session-connection-test.cpp
+++ b/tests/core/steam/mobject/session/dummy-session-connection-test.cpp
@@ -40,7 +40,7 @@ using std::string;
 //using std::cout;
 //using std::endl;
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -84,4 +84,4 @@ namespace test    {
   /** Register this test class... */
   LAUNCHER(DummySessionConnection_test, "unit session");
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/placement-index-query-test.cpp b/tests/core/steam/mobject/session/placement-index-query-test.cpp
index 817185f50..1d8480504 100644
--- a/tests/core/steam/mobject/session/placement-index-query-test.cpp
+++ b/tests/core/steam/mobject/session/placement-index-query-test.cpp
@@ -36,7 +36,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -122,4 +122,4 @@ namespace test    {
   LAUNCHER (PlacementIndexQuery_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/placement-index-test.cpp b/tests/core/steam/mobject/session/placement-index-test.cpp
index de1b25e87..d441d63f4 100644
--- a/tests/core/steam/mobject/session/placement-index-test.cpp
+++ b/tests/core/steam/mobject/session/placement-index-test.cpp
@@ -44,7 +44,7 @@ using util::isSameObject;
 using std::string;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -340,4 +340,4 @@ namespace test    {
   LAUNCHER (PlacementIndex_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/placement-scope-test.cpp b/tests/core/steam/mobject/session/placement-scope-test.cpp
index 0eb4f55c4..399e9010b 100644
--- a/tests/core/steam/mobject/session/placement-scope-test.cpp
+++ b/tests/core/steam/mobject/session/placement-scope-test.cpp
@@ -38,7 +38,7 @@
 using util::isSameObject;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -201,4 +201,4 @@ namespace test    {
   LAUNCHER (PlacementScope_test, "function session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/query-focus-stack-test.cpp b/tests/core/steam/mobject/session/query-focus-stack-test.cpp
index a4814d80b..a2a300a44 100644
--- a/tests/core/steam/mobject/session/query-focus-stack-test.cpp
+++ b/tests/core/steam/mobject/session/query-focus-stack-test.cpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -251,4 +251,4 @@ namespace test    {
   LAUNCHER (QueryFocusStack_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/query-focus-test.cpp b/tests/core/steam/mobject/session/query-focus-test.cpp
index 4756af201..73d63eb15 100644
--- a/tests/core/steam/mobject/session/query-focus-test.cpp
+++ b/tests/core/steam/mobject/session/query-focus-test.cpp
@@ -34,7 +34,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -179,4 +179,4 @@ namespace test    {
   LAUNCHER (QueryFocus_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/rebuildfixturetest.cpp b/tests/core/steam/mobject/session/rebuildfixturetest.cpp
index c2069a989..5f43170bf 100644
--- a/tests/core/steam/mobject/session/rebuildfixturetest.cpp
+++ b/tests/core/steam/mobject/session/rebuildfixturetest.cpp
@@ -34,7 +34,7 @@
 //using util::contains; 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -88,4 +88,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/scope-path-test.cpp b/tests/core/steam/mobject/session/scope-path-test.cpp
index 4b17c7292..31563bb76 100644
--- a/tests/core/steam/mobject/session/scope-path-test.cpp
+++ b/tests/core/steam/mobject/session/scope-path-test.cpp
@@ -37,7 +37,7 @@
 #include <string>
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -408,4 +408,4 @@ namespace test    {
   LAUNCHER (ScopePath_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/scope-query-test.cpp b/tests/core/steam/mobject/session/scope-query-test.cpp
index f94ea5ed8..1956d767c 100644
--- a/tests/core/steam/mobject/session/scope-query-test.cpp
+++ b/tests/core/steam/mobject/session/scope-query-test.cpp
@@ -39,7 +39,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -148,4 +148,4 @@ namespace test    {
   LAUNCHER (ScopeQuery_test, "unit session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-element-query-test.cpp b/tests/core/steam/mobject/session/session-element-query-test.cpp
index 81ae8f8ad..3a7ba1338 100644
--- a/tests/core/steam/mobject/session/session-element-query-test.cpp
+++ b/tests/core/steam/mobject/session/session-element-query-test.cpp
@@ -38,7 +38,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -151,4 +151,4 @@ namespace test    {
   LAUNCHER (SessionElementQuery_test, "function session");
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-element-tracker-test.cpp b/tests/core/steam/mobject/session/session-element-tracker-test.cpp
index 06d22d967..dceafbea0 100644
--- a/tests/core/steam/mobject/session/session-element-tracker-test.cpp
+++ b/tests/core/steam/mobject/session/session-element-tracker-test.cpp
@@ -38,7 +38,7 @@
 
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -229,4 +229,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-manager-test.cpp b/tests/core/steam/mobject/session/session-manager-test.cpp
index 195452bd3..c23451fdd 100644
--- a/tests/core/steam/mobject/session/session-manager-test.cpp
+++ b/tests/core/steam/mobject/session/session-manager-test.cpp
@@ -33,7 +33,7 @@
 //using std::string;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -139,4 +139,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-modify-parts-test.cpp b/tests/core/steam/mobject/session/session-modify-parts-test.cpp
index 9a1d22292..ba71723cc 100644
--- a/tests/core/steam/mobject/session/session-modify-parts-test.cpp
+++ b/tests/core/steam/mobject/session/session-modify-parts-test.cpp
@@ -48,7 +48,7 @@ using util::and_all;
 using std::set;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -330,4 +330,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-service-access-test.cpp b/tests/core/steam/mobject/session/session-service-access-test.cpp
index 61d40ac61..139aa526b 100644
--- a/tests/core/steam/mobject/session/session-service-access-test.cpp
+++ b/tests/core/steam/mobject/session/session-service-access-test.cpp
@@ -36,7 +36,7 @@
 #include <string>
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -347,4 +347,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/session-structure-test.cpp b/tests/core/steam/mobject/session/session-structure-test.cpp
index 5eb950a2f..3f0f636f9 100644
--- a/tests/core/steam/mobject/session/session-structure-test.cpp
+++ b/tests/core/steam/mobject/session/session-structure-test.cpp
@@ -37,7 +37,7 @@
 using util::isSameObject;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -140,4 +140,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/test-scope-invalid.hpp b/tests/core/steam/mobject/session/test-scope-invalid.hpp
index eae2230cd..15106c618 100644
--- a/tests/core/steam/mobject/session/test-scope-invalid.hpp
+++ b/tests/core/steam/mobject/session/test-scope-invalid.hpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -65,5 +65,5 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
 #endif
diff --git a/tests/core/steam/mobject/session/test-scopes.cpp b/tests/core/steam/mobject/session/test-scopes.cpp
index 8f96e8ec5..01532818d 100644
--- a/tests/core/steam/mobject/session/test-scopes.cpp
+++ b/tests/core/steam/mobject/session/test-scopes.cpp
@@ -33,7 +33,7 @@
 #include "steam/mobject/session/scope-query.hpp"
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -113,4 +113,4 @@ namespace test    {
   }
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/test-scopes.hpp b/tests/core/steam/mobject/session/test-scopes.hpp
index 50b7fe719..3666792a5 100644
--- a/tests/core/steam/mobject/session/test-scopes.hpp
+++ b/tests/core/steam/mobject/session/test-scopes.hpp
@@ -40,7 +40,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -82,5 +82,5 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
 #endif
diff --git a/tests/core/steam/mobject/session/testclip.cpp b/tests/core/steam/mobject/session/testclip.cpp
index 2c4821535..03d50d5b9 100644
--- a/tests/core/steam/mobject/session/testclip.cpp
+++ b/tests/core/steam/mobject/session/testclip.cpp
@@ -34,7 +34,7 @@
 #include "lib/depend.hpp"
 #include "lib/time/timevalue.hpp"
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -97,4 +97,4 @@ namespace test    {
   const Duration LENGTH_TestClip(Time(0,25,0,0));   //////TODO hard wired as of (1/10). See MediaFactory::operator()  in media.cpp / mediaaccessmock.cpp
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/mobject/session/testclip.hpp b/tests/core/steam/mobject/session/testclip.hpp
index 9f838889b..155439fdd 100644
--- a/tests/core/steam/mobject/session/testclip.hpp
+++ b/tests/core/steam/mobject/session/testclip.hpp
@@ -38,7 +38,7 @@ using std::shared_ptr;
 using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -86,5 +86,5 @@ namespace test    {
   extern const lib::time::Duration LENGTH_TestClip;
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
 #endif
diff --git a/tests/core/steam/mobject/session/testroot.hpp b/tests/core/steam/mobject/session/testroot.hpp
index 01a195c4a..313f107a4 100644
--- a/tests/core/steam/mobject/session/testroot.hpp
+++ b/tests/core/steam/mobject/session/testroot.hpp
@@ -38,7 +38,7 @@
 using lib::Symbol;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -54,5 +54,5 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
 #endif
diff --git a/tests/core/steam/mobject/session/testsession1.hpp b/tests/core/steam/mobject/session/testsession1.hpp
index 067fb3191..3e6afab1c 100644
--- a/tests/core/steam/mobject/session/testsession1.hpp
+++ b/tests/core/steam/mobject/session/testsession1.hpp
@@ -41,7 +41,7 @@
 //using std::string;
 
 
-namespace proc {
+namespace steam {
 namespace mobject {
 namespace session {
   
@@ -73,5 +73,5 @@ namespace session {
   const string SESSION1_CLIP("TODO: some sensible way to refer to a clip");
   
   
-}}} // namespace proc::mobject::session
+}}} // namespace steam::mobject::session
 #endif
diff --git a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
index 327f75ff3..bdbee55d1 100644
--- a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
+++ b/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp
@@ -42,7 +42,7 @@ using util::isSameObject;
 using util::contains;
 
 
-namespace proc    {
+namespace steam    {
 namespace mobject {
 namespace session {
 namespace test    {
@@ -317,4 +317,4 @@ namespace test    {
   
   
   
-}}}} // namespace proc::mobject::session::test
+}}}} // namespace steam::mobject::session::test
diff --git a/tests/core/steam/play/diagnostic-output-slot.hpp b/tests/core/steam/play/diagnostic-output-slot.hpp
index 44ce573b1..78f63d0f9 100644
--- a/tests/core/steam/play/diagnostic-output-slot.hpp
+++ b/tests/core/steam/play/diagnostic-output-slot.hpp
@@ -54,7 +54,7 @@
 #include <memory>
 
 
-namespace proc {
+namespace steam {
 namespace play {
 
 //using std::string;
@@ -436,5 +436,5 @@ namespace play {
   
   
   
-}} // namespace proc::play
+}} // namespace steam::play
 #endif
diff --git a/tests/core/steam/play/dummy-play-connection-test.cpp b/tests/core/steam/play/dummy-play-connection-test.cpp
index 5006f8925..08dd60438 100644
--- a/tests/core/steam/play/dummy-play-connection-test.cpp
+++ b/tests/core/steam/play/dummy-play-connection-test.cpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
 namespace test {
   
@@ -107,4 +107,4 @@ namespace test {
   
   
   
-}}} // namespace proc::play::test
+}}} // namespace steam::play::test
diff --git a/tests/core/steam/play/output-slot-protocol-test.cpp b/tests/core/steam/play/output-slot-protocol-test.cpp
index 6e80e3d8a..12a7edf77 100644
--- a/tests/core/steam/play/output-slot-protocol-test.cpp
+++ b/tests/core/steam/play/output-slot-protocol-test.cpp
@@ -33,7 +33,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
 namespace test {
   
@@ -136,4 +136,4 @@ namespace test {
   
   
   
-}}} // namespace proc::play::test
+}}} // namespace steam::play::test
diff --git a/tests/core/steam/play/timing-constraints-test.cpp b/tests/core/steam/play/timing-constraints-test.cpp
index f0c60b981..0afe2a2c4 100644
--- a/tests/core/steam/play/timing-constraints-test.cpp
+++ b/tests/core/steam/play/timing-constraints-test.cpp
@@ -35,7 +35,7 @@
 
 
 
-namespace proc {
+namespace steam {
 namespace play {
 namespace test {
   
@@ -90,4 +90,4 @@ namespace test {
   
   
   
-}}} // namespace proc::play::test
+}}} // namespace steam::play::test
diff --git a/tests/core/vault/engine/dummy-job.cpp b/tests/core/vault/engine/dummy-job.cpp
index b54827721..061af4be1 100644
--- a/tests/core/vault/engine/dummy-job.cpp
+++ b/tests/core/vault/engine/dummy-job.cpp
@@ -39,7 +39,7 @@
 #include <boost/functional/hash.hpp>
 
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   namespace { // DummyJob implementation details...
@@ -191,4 +191,4 @@ namespace engine {
   }
   
   
-}} // namespace backend::engine
+}} // namespace vault::engine
diff --git a/tests/core/vault/engine/dummy-job.hpp b/tests/core/vault/engine/dummy-job.hpp
index d79c9ce7e..0078fdec8 100644
--- a/tests/core/vault/engine/dummy-job.hpp
+++ b/tests/core/vault/engine/dummy-job.hpp
@@ -34,7 +34,7 @@
 #include "lib/time/timevalue.hpp"
 
 
-namespace backend{
+namespace vault{
 namespace engine {
   
   using lib::time::Time;
@@ -56,5 +56,5 @@ namespace engine {
     };
   
 
-}} // namespace backend::engine
+}} // namespace vault::engine
 #endif
diff --git a/tests/core/vault/engine/job-hash-test.cpp b/tests/core/vault/engine/job-hash-test.cpp
index aed243f81..c57449d8d 100644
--- a/tests/core/vault/engine/job-hash-test.cpp
+++ b/tests/core/vault/engine/job-hash-test.cpp
@@ -34,7 +34,7 @@
 #include <boost/functional/hash.hpp>
 
 
-namespace backend {
+namespace vault {
 namespace engine {
 namespace test {
   
@@ -129,4 +129,4 @@ namespace test {
   /** Register this test class... */
   LAUNCHER(JobHash_test, "unit engine");
   
-}}} // namespace backend::engine::test
+}}} // namespace vault::engine::test
diff --git a/tests/core/vault/engine/scheduler-interface-test.cpp b/tests/core/vault/engine/scheduler-interface-test.cpp
index ca1432a72..89cd5eef5 100644
--- a/tests/core/vault/engine/scheduler-interface-test.cpp
+++ b/tests/core/vault/engine/scheduler-interface-test.cpp
@@ -34,7 +34,7 @@
 #include "vault/engine/dummy-job.hpp"
 
 
-namespace backend {
+namespace vault {
 namespace engine {
 namespace test {
   
@@ -195,4 +195,4 @@ namespace test {
   /** Register this test class... */
   LAUNCHER(SchedulerInterface_test, "unit engine");
   
-}}} // namespace backend::engine::test
+}}} // namespace vault::engine::test
diff --git a/tests/core/vault/media-access-mock-test.cpp b/tests/core/vault/media-access-mock-test.cpp
index e6c45042f..372165b7c 100644
--- a/tests/core/vault/media-access-mock-test.cpp
+++ b/tests/core/vault/media-access-mock-test.cpp
@@ -40,7 +40,7 @@ using lib::Literal;
 using std::string;
 
 
-namespace backend {
+namespace vault {
 namespace test {
   
   
@@ -92,4 +92,4 @@ namespace test {
   
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/core/vault/media-access-mock.cpp b/tests/core/vault/media-access-mock.cpp
index 84f1e8b91..c50a51304 100644
--- a/tests/core/vault/media-access-mock.cpp
+++ b/tests/core/vault/media-access-mock.cpp
@@ -55,7 +55,7 @@ using std::vector;
 using std::map;
 
 
-namespace backend {
+namespace vault {
 namespace test {
   
   typedef MediaAccessFacade::ChanHandle ChanHandle;
@@ -156,4 +156,4 @@ namespace test {
   }
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/core/vault/media-access-mock.hpp b/tests/core/vault/media-access-mock.hpp
index 03f6dc4fe..abf443e9c 100644
--- a/tests/core/vault/media-access-mock.hpp
+++ b/tests/core/vault/media-access-mock.hpp
@@ -38,7 +38,7 @@
 
 
 
-namespace backend {
+namespace vault {
 namespace test {
   
   /**
@@ -53,5 +53,5 @@ namespace test {
     };
   
   
-}} // namespace backend::test
+}} // namespace vault::test
 #endif
diff --git a/tests/stage/abstract-tangible-test.cpp b/tests/stage/abstract-tangible-test.cpp
index dbd1cb4b6..0a7b23e1a 100644
--- a/tests/stage/abstract-tangible-test.cpp
+++ b/tests/stage/abstract-tangible-test.cpp
@@ -80,7 +80,7 @@ using proc::control::CommandDef;
 
 
 
-namespace gui  {
+namespace stage  {
 namespace model{
 namespace test {
   
@@ -760,4 +760,4 @@ namespace test {
   LAUNCHER (AbstractTangible_test, "unit gui");
   
   
-}}} // namespace gui::model::test
+}}} // namespace stage::model::test
diff --git a/tests/stage/bus-term-test.cpp b/tests/stage/bus-term-test.cpp
index 59b54f2c4..4765e227b 100644
--- a/tests/stage/bus-term-test.cpp
+++ b/tests/stage/bus-term-test.cpp
@@ -64,7 +64,7 @@ using util::isnil;
 using util::_Fmt;
 
 
-namespace gui  {
+namespace stage  {
 namespace model{
 namespace test {
   
@@ -791,4 +791,4 @@ namespace test {
   LAUNCHER (BusTerm_test, "unit gui");
   
   
-}}} // namespace gui::model::test
+}}} // namespace stage::model::test
diff --git a/tests/stage/ctrl/state-map-grouping-storage-test.cpp b/tests/stage/ctrl/state-map-grouping-storage-test.cpp
index a7ac7006b..045058045 100644
--- a/tests/stage/ctrl/state-map-grouping-storage-test.cpp
+++ b/tests/stage/ctrl/state-map-grouping-storage-test.cpp
@@ -42,7 +42,7 @@ using util::isSameObject;
 using util::isnil;
 
 
-namespace gui  {
+namespace stage  {
 namespace ctrl {
 namespace test {
   
@@ -162,4 +162,4 @@ namespace test {
   LAUNCHER (StateMapGroupingStorage_test, "unit gui");
   
   
-}}} // namespace gui::ctrl::test
+}}} // namespace stage::ctrl::test
diff --git a/tests/stage/gen-node-location-query.hpp b/tests/stage/gen-node-location-query.hpp
index 972b3bdec..71d2be68a 100644
--- a/tests/stage/gen-node-location-query.hpp
+++ b/tests/stage/gen-node-location-query.hpp
@@ -75,7 +75,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace interact {
   
   namespace error = lumiera::error;
@@ -303,5 +303,5 @@ namespace interact {
   
   
   
-}}// namespace gui::interact
+}}// namespace stage::interact
 #endif /*STAGE_INTERACT_GEN_NODE_LOCATION_QUERY_H*/
diff --git a/tests/stage/interact/cmd-context-test.cpp b/tests/stage/interact/cmd-context-test.cpp
index 43fdc443d..e00c592a8 100644
--- a/tests/stage/interact/cmd-context-test.cpp
+++ b/tests/stage/interact/cmd-context-test.cpp
@@ -44,7 +44,7 @@
 //using util::isnil;
 
 
-namespace gui  {
+namespace stage  {
 namespace interact {
 namespace test {
   
@@ -74,4 +74,4 @@ namespace test {
   LAUNCHER (CmdContext_test, "unit gui");
   
   
-}}} // namespace gui::interact::test
+}}} // namespace stage::interact::test
diff --git a/tests/stage/interact/ui-coord-resolver-test.cpp b/tests/stage/interact/ui-coord-resolver-test.cpp
index 2a61e58cb..e5de14fe6 100644
--- a/tests/stage/interact/ui-coord-resolver-test.cpp
+++ b/tests/stage/interact/ui-coord-resolver-test.cpp
@@ -46,7 +46,7 @@ using util::join;
 
 
 
-namespace gui  {
+namespace stage  {
 namespace interact {
 namespace test {
   
@@ -752,4 +752,4 @@ namespace test {
   LAUNCHER (UICoordResolver_test, "unit gui");
   
   
-}}} // namespace gui::interact::test
+}}} // namespace stage::interact::test
diff --git a/tests/stage/interact/ui-coord-test.cpp b/tests/stage/interact/ui-coord-test.cpp
index 9cda88f8a..f8413ea94 100644
--- a/tests/stage/interact/ui-coord-test.cpp
+++ b/tests/stage/interact/ui-coord-test.cpp
@@ -41,7 +41,7 @@ using util::join;
 
 
 
-namespace gui  {
+namespace stage  {
 namespace interact {
 namespace test {
   
@@ -455,4 +455,4 @@ namespace test {
   LAUNCHER (UICoord_test, "unit gui");
   
   
-}}} // namespace gui::interact::test
+}}} // namespace stage::interact::test
diff --git a/tests/stage/interact/ui-location-solver-test.cpp b/tests/stage/interact/ui-location-solver-test.cpp
index 00b070911..9979e8609 100644
--- a/tests/stage/interact/ui-location-solver-test.cpp
+++ b/tests/stage/interact/ui-location-solver-test.cpp
@@ -42,7 +42,7 @@ using lib::diff::Rec;
 using util::isnil;
 
 
-namespace gui  {
+namespace stage  {
 namespace interact {
 namespace test {
   
@@ -484,4 +484,4 @@ namespace test {
   LAUNCHER (UILocationSolver_test, "unit gui");
   
   
-}}} // namespace gui::interact::test
+}}} // namespace stage::interact::test
diff --git a/tests/stage/interact/view-spec-dsl-test.cpp b/tests/stage/interact/view-spec-dsl-test.cpp
index e980af63a..6c212e83e 100644
--- a/tests/stage/interact/view-spec-dsl-test.cpp
+++ b/tests/stage/interact/view-spec-dsl-test.cpp
@@ -52,7 +52,7 @@ using lib::diff::Rec;
 using util::contains;
 
 
-namespace gui {
+namespace stage {
 namespace idi { //------Mock ViewSpec definitions for component test
   
   
@@ -231,4 +231,4 @@ namespace test {
   LAUNCHER (ViewSpecDSL_test, "unit gui");
   
   
-}}} // namespace gui::interact::test
+}}} // namespace stage::interact::test
diff --git a/tests/stage/model/element-access-test.cpp b/tests/stage/model/element-access-test.cpp
index b7a091f9e..5f6a2dc98 100644
--- a/tests/stage/model/element-access-test.cpp
+++ b/tests/stage/model/element-access-test.cpp
@@ -50,7 +50,7 @@ using util::isSameObject;
 //using util::isnil;
 
 
-namespace gui  {
+namespace stage  {
 namespace model{
 namespace test {
   
@@ -160,4 +160,4 @@ namespace test {
   LAUNCHER (ElementAccess_test, "unit gui");
   
   
-}}} // namespace gui::model::test
+}}} // namespace stage::model::test
diff --git a/tests/stage/model/w-link-test.cpp b/tests/stage/model/w-link-test.cpp
index f34513ea6..5a6d63637 100644
--- a/tests/stage/model/w-link-test.cpp
+++ b/tests/stage/model/w-link-test.cpp
@@ -39,7 +39,7 @@ using std::make_unique;
 using std::move;
 
 
-namespace gui  {
+namespace stage  {
 namespace model{
 namespace test {
   
@@ -216,4 +216,4 @@ namespace test {
   LAUNCHER (WLink_test, "unit gui");
   
   
-}}} // namespace gui::model::test
+}}} // namespace stage::model::test
diff --git a/tests/stage/session-structure-mapping-test.cpp b/tests/stage/session-structure-mapping-test.cpp
index 476519edb..c2f87faf5 100644
--- a/tests/stage/session-structure-mapping-test.cpp
+++ b/tests/stage/session-structure-mapping-test.cpp
@@ -58,7 +58,7 @@
 //using std::string;
 
 
-namespace gui  {
+namespace stage  {
 namespace model{
 namespace test {
   
@@ -114,4 +114,4 @@ namespace test {
   LAUNCHER (SessionStructureMapping_test, "unit gui");
   
   
-}}} // namespace gui::model::test
+}}} // namespace stage::model::test
diff --git a/tests/stage/test-gui-test.cpp b/tests/stage/test-gui-test.cpp
index cb5e9d2c4..ac2e73bc7 100644
--- a/tests/stage/test-gui-test.cpp
+++ b/tests/stage/test-gui-test.cpp
@@ -31,7 +31,7 @@
 #include "lib/format-cout.hpp"
 
 
-namespace gui {
+namespace stage {
 namespace test{
   
   /************************************************************************************//**
@@ -58,4 +58,4 @@ namespace test{
   
   
   
-}} // namespace gui::test
+}} // namespace stage::test
diff --git a/tests/stage/test/mock-elm.hpp b/tests/stage/test/mock-elm.hpp
index b0bb781da..4f502428a 100644
--- a/tests/stage/test/mock-elm.hpp
+++ b/tests/stage/test/mock-elm.hpp
@@ -78,7 +78,7 @@
 #include <map>
 
 
-namespace gui {
+namespace stage {
   namespace error = lumiera::error;
   using error::LUMIERA_ERROR_ASSERTION;
   using lib::test::EventLog;
@@ -489,5 +489,5 @@ namespace test{
   
   
   
-}} // namespace gui::test
+}} // namespace stage::test
 #endif /*STAGE_TEST_MOCK_ELM_H*/
diff --git a/tests/stage/test/placeholder-command.hpp b/tests/stage/test/placeholder-command.hpp
index 8f6e509d8..9fe2788dc 100644
--- a/tests/stage/test/placeholder-command.hpp
+++ b/tests/stage/test/placeholder-command.hpp
@@ -52,7 +52,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace test{
   
   using std::string;
@@ -133,5 +133,5 @@ namespace test{
   
   
   
-}} // namespace gui::test
+}} // namespace stage::test
 #endif /*STAGE_TEST_PLACEHOLDER_COMMAND_H*/
diff --git a/tests/stage/test/test-element-access.hpp b/tests/stage/test/test-element-access.hpp
index 1bb890d3c..d48bc564e 100644
--- a/tests/stage/test/test-element-access.hpp
+++ b/tests/stage/test/test-element-access.hpp
@@ -55,7 +55,7 @@
 
 
   
-namespace gui  {
+namespace stage  {
 namespace test {
   namespace error = lumiera::error;
   
@@ -151,5 +151,5 @@ namespace test {
   
   
   
-}} // namespace gui::test
+}} // namespace stage::test
 #endif /*STAGE_TEST_ELEMENT_ACCESS_H*/
diff --git a/tests/stage/test/test-nexus.cpp b/tests/stage/test/test-nexus.cpp
index 012053f93..cc7836996 100644
--- a/tests/stage/test/test-nexus.cpp
+++ b/tests/stage/test/test-nexus.cpp
@@ -81,7 +81,7 @@ using proc::control::CommandImpl;
 using proc::control::HandlingPattern;
 using util::_Fmt;
 
-namespace gui {
+namespace stage {
 namespace test{
   
   
@@ -601,4 +601,4 @@ namespace test{
     testNexus().getLog().event(lateName + " successfully zombificated.");
   }
 
-}} // namespace gui::test
+}} // namespace stage::test
diff --git a/tests/stage/test/test-nexus.hpp b/tests/stage/test/test-nexus.hpp
index 740422df8..f0d21753d 100644
--- a/tests/stage/test/test-nexus.hpp
+++ b/tests/stage/test/test-nexus.hpp
@@ -58,7 +58,7 @@
 #include <string>
 
 
-namespace gui {
+namespace stage {
 namespace test{
   
   
@@ -205,5 +205,5 @@ namespace test{
   
   
   
-}} // namespace gui::test
+}} // namespace stage::test
 #endif /*STAGE_TEST_TEST_NEXUS_H*/
diff --git a/tests/vault/thread-local-test.cpp b/tests/vault/thread-local-test.cpp
index 5952e0452..dc394f154 100644
--- a/tests/vault/thread-local-test.cpp
+++ b/tests/vault/thread-local-test.cpp
@@ -114,4 +114,4 @@ namespace test{
   
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/vault/thread-wrapper-join-test.cpp b/tests/vault/thread-wrapper-join-test.cpp
index b70456f39..dda6980ef 100644
--- a/tests/vault/thread-wrapper-join-test.cpp
+++ b/tests/vault/thread-wrapper-join-test.cpp
@@ -38,7 +38,7 @@ using test::Test;
 
 
 
-namespace backend {
+namespace vault {
 namespace test {
   
   using lumiera::error::LUMIERA_ERROR_LOGIC;
@@ -139,4 +139,4 @@ namespace test {
   
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/vault/thread-wrapper-self-recognition-test.cpp b/tests/vault/thread-wrapper-self-recognition-test.cpp
index e88b3065b..a02e3ea79 100644
--- a/tests/vault/thread-wrapper-self-recognition-test.cpp
+++ b/tests/vault/thread-wrapper-self-recognition-test.cpp
@@ -31,7 +31,7 @@ using test::Test;
 
 
 
-namespace backend {
+namespace vault {
 namespace test {
   
   namespace {
@@ -86,4 +86,4 @@ namespace test {
   
   
   
-}} // namespace backend::test
+}} // namespace vault::test
diff --git a/tests/vault/thread-wrapper-test.cpp b/tests/vault/thread-wrapper-test.cpp
index d7193bfb3..3756eb09d 100644
--- a/tests/vault/thread-wrapper-test.cpp
+++ b/tests/vault/thread-wrapper-test.cpp
@@ -37,7 +37,7 @@ using std::bind;
 using test::Test;
 
 
-namespace backend {
+namespace vault {
   namespace test  {
   
     namespace { // private test classes and data...
@@ -145,4 +145,4 @@ namespace backend {
     
     
     
-}} // namespace backend::test
+}} // namespace vault::test