diff --git a/DVRTransferFunction/src/GlobalAlphaAction.cpp b/DVRTransferFunction/src/GlobalAlphaAction.cpp
index 242a587..ef20b4f 100644
--- a/DVRTransferFunction/src/GlobalAlphaAction.cpp
+++ b/DVRTransferFunction/src/GlobalAlphaAction.cpp
@@ -51,8 +51,8 @@ void GlobalAlphaAction::connectToPublicAction(WidgetAction* publicAction, bool r
         return;
 
     if (recursive) {
-		actions().connectPrivateActionToPublicAction(&_globalAlphaToggle, &publicGlobalAlphaAction->getAlphaToggleAction(), recursive);
-		actions().connectPrivateActionToPublicAction(&_globalAlphaValue, &publicGlobalAlphaAction->getAlphaIntegerAction(), recursive);
+        mv::actions().connectPrivateActionToPublicAction(&_globalAlphaToggle, &publicGlobalAlphaAction->getAlphaToggleAction(), recursive);
+        mv::actions().connectPrivateActionToPublicAction(&_globalAlphaValue, &publicGlobalAlphaAction->getAlphaIntegerAction(), recursive);
     }
 
     GroupAction::connectToPublicAction(publicAction, recursive);
@@ -64,8 +64,8 @@ void GlobalAlphaAction::disconnectFromPublicAction(bool recursive)
         return;
 
     if (recursive) {
-        actions().disconnectPrivateActionFromPublicAction(&_globalAlphaToggle, recursive);
-        actions().disconnectPrivateActionFromPublicAction(&_globalAlphaValue, recursive);
+        mv::actions().disconnectPrivateActionFromPublicAction(&_globalAlphaToggle, recursive);
+        mv::actions().disconnectPrivateActionFromPublicAction(&_globalAlphaValue, recursive);
     }
 
     GroupAction::disconnectFromPublicAction(recursive);
diff --git a/DVRTransferFunction/src/PointAction.cpp b/DVRTransferFunction/src/PointAction.cpp
index ce536f1..a83bdbb 100644
--- a/DVRTransferFunction/src/PointAction.cpp
+++ b/DVRTransferFunction/src/PointAction.cpp
@@ -5,7 +5,7 @@
 
 #include <DataHierarchyItem.h>
 
-using namespace gui;
+using namespace mv::gui;
 
 PointAction::PointAction(QObject* parent, const QString& title) :
     HorizontalGroupAction(parent, title),
@@ -27,8 +27,8 @@ void PointAction::connectToPublicAction(WidgetAction* publicAction, bool recursi
         return;
 
     if (recursive) {
-        actions().connectPrivateActionToPublicAction(&_sizeAction, &publicPointAction->getSizeAction(), recursive);
-        actions().connectPrivateActionToPublicAction(&_opacityAction, &publicPointAction->getOpacityAction(), recursive);
+        mv::actions().connectPrivateActionToPublicAction(&_sizeAction, &publicPointAction->getSizeAction(), recursive);
+        mv::actions().connectPrivateActionToPublicAction(&_opacityAction, &publicPointAction->getOpacityAction(), recursive);
     }
 
     GroupAction::connectToPublicAction(publicAction, recursive);
@@ -40,8 +40,8 @@ void PointAction::disconnectFromPublicAction(bool recursive)
         return;
 
     if (recursive) {
-        actions().disconnectPrivateActionFromPublicAction(&_sizeAction, recursive);
-        actions().disconnectPrivateActionFromPublicAction(&_opacityAction, recursive);
+        mv::actions().disconnectPrivateActionFromPublicAction(&_sizeAction, recursive);
+        mv::actions().disconnectPrivateActionFromPublicAction(&_opacityAction, recursive);
     }
 
     GroupAction::disconnectFromPublicAction(recursive);
diff --git a/DVRTransferFunction/src/SelectionAction.cpp b/DVRTransferFunction/src/SelectionAction.cpp
index 9f092a5..92db11a 100644
--- a/DVRTransferFunction/src/SelectionAction.cpp
+++ b/DVRTransferFunction/src/SelectionAction.cpp
@@ -14,7 +14,7 @@ SelectionAction::SelectionAction(QObject* parent, const QString& title) :
     GroupAction(parent, title),
     _pixelSelectionAction(this, "Point Selection")
 {
-    setIcon(util::StyledIcon("mouse-pointer"));
+    setIcon(mv::util::StyledIcon("mouse-pointer"));
 
     setConfigurationFlag(WidgetAction::ConfigurationFlag::HiddenInActionContextMenu);
     setConfigurationFlag(WidgetAction::ConfigurationFlag::ForceCollapsedInGroup);
@@ -47,7 +47,7 @@ void SelectionAction::connectToPublicAction(WidgetAction* publicAction, bool rec
         return;
 
     if (recursive) {
-        actions().connectPrivateActionToPublicAction(&_pixelSelectionAction, &publicSelectionAction->getPixelSelectionAction(), recursive);
+        mv::actions().connectPrivateActionToPublicAction(&_pixelSelectionAction, &publicSelectionAction->getPixelSelectionAction(), recursive);
     }
 
     GroupAction::connectToPublicAction(publicAction, recursive);
@@ -59,7 +59,7 @@ void SelectionAction::disconnectFromPublicAction(bool recursive)
         return;
 
     if (recursive) {
-        actions().disconnectPrivateActionFromPublicAction(&_pixelSelectionAction, recursive);
+        mv::actions().disconnectPrivateActionFromPublicAction(&_pixelSelectionAction, recursive);
     }
 
     GroupAction::disconnectFromPublicAction(recursive);
diff --git a/DVRTransferFunction/src/TransferFunctionPlugin.h b/DVRTransferFunction/src/TransferFunctionPlugin.h
index 16381a6..dde7f01 100644
--- a/DVRTransferFunction/src/TransferFunctionPlugin.h
+++ b/DVRTransferFunction/src/TransferFunctionPlugin.h
@@ -39,7 +39,7 @@ class TransferFunctionPlugin : public ViewPlugin
      * Load one (or more datasets in the view)
      * @param datasets Dataset(s) to load
      */
-    void loadData(const Datasets& datasets) override;
+    void loadData(const mv::Datasets& datasets) override;
 
     /** Get number of points in the position dataset */
     std::uint32_t getNumberOfPoints() const;
@@ -56,7 +56,7 @@ class TransferFunctionPlugin : public ViewPlugin
 public: // Miscellaneous
 
     /** Get smart pointer to points dataset for point position */
-    Dataset<Points>& getPositionDataset();
+    mv::Dataset<Points>& getPositionDataset();
 
 public:
 
@@ -87,7 +87,7 @@ class TransferFunctionPlugin : public ViewPlugin
     QPointer<TransferFunctionWidget>    _transferFunctionWidget;    /** The visualization widget */
     mv::gui::DropWidget*                _dropWidget;                /** Widget for dropping datasets */
 
-    Dataset<Points>                     _positionDataset;           /** Smart pointer to points dataset for point position */
+    mv::Dataset<Points>                 _positionDataset;           /** Smart pointer to points dataset for point position */
     std::vector<mv::Vector2f>           _positions;                 /** Point positions */
     unsigned int                        _numPoints;                 /** Number of point positions */