diff --git a/pv_app/src/application.cpp b/pv_app/src/application.cpp
index 2d6c1cbf2704a8a1cc24c53436aff932c09e6aed..729af9c34b8005c82b3f7ce8fd6c775f441c4b86 100644
--- a/pv_app/src/application.cpp
+++ b/pv_app/src/application.cpp
@@ -92,17 +92,17 @@ application::setup_ui
   mp_main_splitter->setWindowTitle("pv_app");
   mp_main_splitter->setOrientation(Qt::Vertical);
   
-  mp_perf_data_viewer_widget_top    = new perf_data_viewer_widget(
+  mp_perf_data_viewer_widget_top    = new qpvt::perf_data_viewer_widget(
     &m_perf_data,
-    perf_data_viewer_widget::metric_cnode_views);
+    qpvt::perf_data_viewer_widget::metric_cnode_views);
 
-  mp_perf_data_viewer_widget_bottom = new perf_data_viewer_widget(
+  mp_perf_data_viewer_widget_bottom = new qpvt::perf_data_viewer_widget(
     &m_perf_data,
-    perf_data_viewer_widget::correlated_views);
+    qpvt::perf_data_viewer_widget::correlated_views);
   
   QObject::connect(
     mp_perf_data_viewer_widget_top,
-    &perf_data_viewer_widget::find_correlated_views_requested,
+    &qpvt::perf_data_viewer_widget::find_correlated_views_requested,
     [this] ()
     {
       find_correlated_views();
@@ -110,7 +110,7 @@ application::setup_ui
   
   QObject::connect(
     mp_perf_data_viewer_widget_top,
-    &perf_data_viewer_widget::filter_range_from_other_requested,
+    &qpvt::perf_data_viewer_widget::filter_range_from_other_requested,
     [this] ()
     {
       assign_filter_range_from_other(mp_perf_data_viewer_widget_bottom,
@@ -119,7 +119,7 @@ application::setup_ui
 
   QObject::connect(
     mp_perf_data_viewer_widget_bottom,
-    &perf_data_viewer_widget::filter_range_from_other_requested,
+    &qpvt::perf_data_viewer_widget::filter_range_from_other_requested,
     [this]()
     {
       assign_filter_range_from_other(mp_perf_data_viewer_widget_top,
@@ -195,8 +195,8 @@ application::find_correlated_views
 //------------------------------------------------------------------------------
 void
 application::assign_filter_range_from_other
-(perf_data_viewer_widget* p_source_perf_data_viewer_widget,
- perf_data_viewer_widget* p_target_perf_data_viewer_widget)
+(qpvt::perf_data_viewer_widget* p_source_perf_data_viewer_widget,
+ qpvt::perf_data_viewer_widget* p_target_perf_data_viewer_widget)
 {
   auto range = p_source_perf_data_viewer_widget->get_filter_range();
   p_target_perf_data_viewer_widget->set_filter_range(range.first, range.second);
diff --git a/pv_app/src/application.hpp b/pv_app/src/application.hpp
index 5e94b3794faee54fef7fd18c7d259621b0be79c6..1fb6e7d15e29e524d8cb37d64eff8ec13062f502 100644
--- a/pv_app/src/application.hpp
+++ b/pv_app/src/application.hpp
@@ -49,15 +49,15 @@ private:
   
   void find_correlated_views         ();
   void assign_filter_range_from_other(
-    perf_data_viewer_widget* p_source_perf_data_viewer_widget,
-    perf_data_viewer_widget* p_target_perf_data_viewer_widget);
+    qpvt::perf_data_viewer_widget* p_source_perf_data_viewer_widget,
+    qpvt::perf_data_viewer_widget* p_target_perf_data_viewer_widget);
 
   pvt::perf_data                             m_perf_data;
   std::vector<pvt::correlated_severity_view> m_correlated_views;
 
-  perf_data_viewer_widget* mp_perf_data_viewer_widget_top    = nullptr;
-  perf_data_viewer_widget* mp_perf_data_viewer_widget_bottom = nullptr;
-  QSplitter*               mp_main_splitter                  = nullptr;
+  qpvt::perf_data_viewer_widget* mp_perf_data_viewer_widget_top    = nullptr;
+  qpvt::perf_data_viewer_widget* mp_perf_data_viewer_widget_bottom = nullptr;
+  QSplitter*                     mp_main_splitter                  = nullptr;
 };
 
 } // namespace pv_app
diff --git a/qpvt/include/qpvt/delegates/directed_variation_glyph_delegate.hpp b/qpvt/include/qpvt/delegates/directed_variation_glyph_delegate.hpp
index 7fb2480006885ba5d1435a4a8fb65d5bbc3ad899..ddf1e1fe31dc2e5c6dc9800d0d879b783031eab6 100644
--- a/qpvt/include/qpvt/delegates/directed_variation_glyph_delegate.hpp
+++ b/qpvt/include/qpvt/delegates/directed_variation_glyph_delegate.hpp
@@ -30,7 +30,7 @@
 
 #include <qpvt/api.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API directed_variation_glyph_delegate : public QAbstractItemDelegate
@@ -59,6 +59,6 @@ private:
   bool m_fade_out_enabled = true;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_DIRECTED_VARIATION_GLYPH_DELEGATE_HPP_
diff --git a/qpvt/include/qpvt/delegates/severity_glyph_delegate.hpp b/qpvt/include/qpvt/delegates/severity_glyph_delegate.hpp
index e2f07a946a40a6699835d37ff4b96d5657e354a4..78b1962ab74d0793836602b9c530217242c08608 100644
--- a/qpvt/include/qpvt/delegates/severity_glyph_delegate.hpp
+++ b/qpvt/include/qpvt/delegates/severity_glyph_delegate.hpp
@@ -30,7 +30,7 @@
 
 #include <qpvt/api.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API severity_glyph_delegate : public QAbstractItemDelegate
@@ -47,6 +47,6 @@ public:
                  const QModelIndex&          index) const override;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_SEVERITY_GLYPH_DELEGATE_HPP_
diff --git a/qpvt/include/qpvt/models/cnode_impact_list_model.hpp b/qpvt/include/qpvt/models/cnode_impact_list_model.hpp
index e593706352d6979fbf55fc42a3e55edcc3c31014..fba8710f6e7b637305464374dbaac21bc8d19139 100644
--- a/qpvt/include/qpvt/models/cnode_impact_list_model.hpp
+++ b/qpvt/include/qpvt/models/cnode_impact_list_model.hpp
@@ -37,7 +37,7 @@ class severity_view;
 class suitable_3d_view_computer;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API cnode_impact_list_model : public QAbstractTableModel
@@ -93,6 +93,6 @@ private:
   
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_CNODE_IMPACT_LIST_MODEL_HPP_
diff --git a/qpvt/include/qpvt/models/cnode_tree_model.hpp b/qpvt/include/qpvt/models/cnode_tree_model.hpp
index c505f77002d4a36cd053d6a9cef5f977216f500e..6f32d1a4857ba5b34420d1db90bf4305f2cce469 100644
--- a/qpvt/include/qpvt/models/cnode_tree_model.hpp
+++ b/qpvt/include/qpvt/models/cnode_tree_model.hpp
@@ -36,7 +36,7 @@ class cnode;
 class metric;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API cnode_tree_model : public perf_data_tree_model<pvt::cnode>
@@ -66,6 +66,6 @@ private:
   mutable pvt::perf_data_cache_cnode m_perf_data_cache;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_CNODE_TREE_MODEL_HPP_
diff --git a/qpvt/include/qpvt/models/correlated_views_model.hpp b/qpvt/include/qpvt/models/correlated_views_model.hpp
index 9ff0258f6f6f74aa56d7485bd8bcd5aba9b01c69..c1f3342db12109f4c0f84c978c6756fc8131d41a 100644
--- a/qpvt/include/qpvt/models/correlated_views_model.hpp
+++ b/qpvt/include/qpvt/models/correlated_views_model.hpp
@@ -34,7 +34,7 @@
 
 #include <qpvt/api.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API correlated_views_model : public QAbstractTableModel
@@ -80,6 +80,6 @@ private:
   std::vector<pvt::correlated_severity_view> m_correlated_views;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_CORRELATED_VIEWS_MODEL_HPP_
diff --git a/qpvt/include/qpvt/models/metric_tree_model.hpp b/qpvt/include/qpvt/models/metric_tree_model.hpp
index e9050a40e991ef3c09a1e0d49f3f80a5a594fc5c..951e6b6714512087dd101c426481e0037f55efb1 100644
--- a/qpvt/include/qpvt/models/metric_tree_model.hpp
+++ b/qpvt/include/qpvt/models/metric_tree_model.hpp
@@ -35,7 +35,7 @@ namespace pvt {
 class severity_view;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API metric_tree_model : public perf_data_tree_model<pvt::metric>
@@ -52,6 +52,6 @@ private:
   mutable pvt::perf_data_cache_metric m_perf_data_cache;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_METRIC_TREE_MODEL_HPP_
diff --git a/qpvt/include/qpvt/models/perf_data_tree_model.hpp b/qpvt/include/qpvt/models/perf_data_tree_model.hpp
index a900959e2879ead2fb9a7f322ed66456a5da465b..344ecbea694ef7bd699f54381a93d92e3286eedb 100644
--- a/qpvt/include/qpvt/models/perf_data_tree_model.hpp
+++ b/qpvt/include/qpvt/models/perf_data_tree_model.hpp
@@ -34,7 +34,7 @@
 
 #include <qpvt/api.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 template <typename perf_data_item>
@@ -202,6 +202,6 @@ protected:
   std::vector<column_info>  m_column_infos;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_PERF_DATA_TREE_MODEL_HPP_
diff --git a/qpvt/include/qpvt/utility/camera_tools.hpp b/qpvt/include/qpvt/utility/camera_tools.hpp
index ae5d4d5d2a8ebda35420fa7aedb973591c0df3ee..0182b47bbf38368a395c56759931b57872cee7af 100644
--- a/qpvt/include/qpvt/utility/camera_tools.hpp
+++ b/qpvt/include/qpvt/utility/camera_tools.hpp
@@ -38,7 +38,7 @@ namespace pvt {
 class camera;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API camera_tools
@@ -85,6 +85,6 @@ private:
   Eigen::Vector3f            m_initial_coi;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_CAMERA_TOOLS_HPP_
diff --git a/qpvt/include/qpvt/widgets/cartesian_topology_viewer_widget.hpp b/qpvt/include/qpvt/widgets/cartesian_topology_viewer_widget.hpp
index f7f6d794dee55e7550a5db29a6e60138f4186f1a..d65b41d4ff9170a719b81bbd42220d9217177539 100644
--- a/qpvt/include/qpvt/widgets/cartesian_topology_viewer_widget.hpp
+++ b/qpvt/include/qpvt/widgets/cartesian_topology_viewer_widget.hpp
@@ -56,7 +56,7 @@ class renderable_axes;
 class scene;
 }
 
-namespace pv_app {
+namespace qpvt {
   
 class data_range_h_slider;
 class data_range_v_slider;
@@ -258,6 +258,6 @@ cartesian_topology_viewer_widget::map_data_to_topology
   update_slider_plots();
 }
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef PV_CARTESIAN_TOPOLOGY_VIEWER_WIDGET__H_
diff --git a/qpvt/include/qpvt/widgets/cnode_impact_selector_widget.hpp b/qpvt/include/qpvt/widgets/cnode_impact_selector_widget.hpp
index 91c93048ab618121aba71397b2afb497f6c56b1c..419025a429a3187436ff8d6b26c144d787486e57 100644
--- a/qpvt/include/qpvt/widgets/cnode_impact_selector_widget.hpp
+++ b/qpvt/include/qpvt/widgets/cnode_impact_selector_widget.hpp
@@ -45,7 +45,7 @@ class perf_data;
 class severity_view;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 class cnode_impact_list_model;
 class cnode_tree_model;
@@ -103,6 +103,6 @@ private:
   QLineEdit*               mp_variation_threshold;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_CNODE_IMPACT_SELECTOR_WIDGET_HPP_
diff --git a/qpvt/include/qpvt/widgets/data_range_h_slider.hpp b/qpvt/include/qpvt/widgets/data_range_h_slider.hpp
index a7a11ae568aad6a3eac33ea901054c456c731bf7..aa0454b438f453fd00f6ab0a27280e1bb8236e34 100644
--- a/qpvt/include/qpvt/widgets/data_range_h_slider.hpp
+++ b/qpvt/include/qpvt/widgets/data_range_h_slider.hpp
@@ -31,7 +31,7 @@
 #include <qpvt/api.hpp>
 #include <qpvt/widgets/range_h_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API data_range_h_slider : public range_h_slider
@@ -125,6 +125,6 @@ private:
   pvt::optional<pvt::shader_program> m_shader_program_v;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_DATA_RANGE_H_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/data_range_v_slider.hpp b/qpvt/include/qpvt/widgets/data_range_v_slider.hpp
index 6b822acfdbe7d3ff020f20ce73bf9726ce78315a..56c9912966ff25ca769cace8d9de231105e6d153 100644
--- a/qpvt/include/qpvt/widgets/data_range_v_slider.hpp
+++ b/qpvt/include/qpvt/widgets/data_range_v_slider.hpp
@@ -31,7 +31,7 @@
 #include <qpvt/api.hpp>
 #include <qpvt/widgets/range_v_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API data_range_v_slider : public range_v_slider
@@ -87,6 +87,6 @@ private:
   pvt::optional<pvt::vertex_buffer>  m_vertex_buffer;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_DATA_RANGE_V_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/geometry_viewer_widget.hpp b/qpvt/include/qpvt/widgets/geometry_viewer_widget.hpp
index dc564290afecffbd1b11150654ba542e1e6804fd..0b3fbfa168da10c550025bdfec60b1558cf2088f 100644
--- a/qpvt/include/qpvt/widgets/geometry_viewer_widget.hpp
+++ b/qpvt/include/qpvt/widgets/geometry_viewer_widget.hpp
@@ -42,7 +42,7 @@
 #include <qpvt/widgets/parallel_coordinates_plot_widget.hpp>
 #include <qpvt/widgets/viewer_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API geometry_viewer_widget : public QSplitter
@@ -107,6 +107,6 @@ geometry_viewer_widget::map_geometric_severities
   }
 }
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_GEOMETRY_VIEWER_WIDGET_HPP_
diff --git a/qpvt/include/qpvt/widgets/parallel_coordinates_plot_widget.hpp b/qpvt/include/qpvt/widgets/parallel_coordinates_plot_widget.hpp
index 7a5be3ce2ce782eed3dd534d564f5bb381102ff8..4cbca2871eadcb1e3674034a4c7e9d580343f0dc 100644
--- a/qpvt/include/qpvt/widgets/parallel_coordinates_plot_widget.hpp
+++ b/qpvt/include/qpvt/widgets/parallel_coordinates_plot_widget.hpp
@@ -44,7 +44,7 @@ class camera;
 class scene;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 class viewer_widget;
 
@@ -90,6 +90,6 @@ private slots:
   void on_lower_button_clicked(int index);
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_PARALLEL_COORDINATES_PLOT_WIDGET_HPP_
diff --git a/qpvt/include/qpvt/widgets/perf_data_viewer_widget.hpp b/qpvt/include/qpvt/widgets/perf_data_viewer_widget.hpp
index 2f180559d1c6a2691c68c613ce3829094ce2c324..ab73e7428678f807f51063f69b24ea32d89e6188 100644
--- a/qpvt/include/qpvt/widgets/perf_data_viewer_widget.hpp
+++ b/qpvt/include/qpvt/widgets/perf_data_viewer_widget.hpp
@@ -51,7 +51,7 @@ class camera;
 class perf_data;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 class cnode_impact_selector_widget;
 class cnode_tree_model;
@@ -165,6 +165,6 @@ private:
   std::vector<QCheckBox*>            m_filter_check_boxes;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_PERF_DATA_VIEWER_WIDGET_HPP_
diff --git a/qpvt/include/qpvt/widgets/range_h_slider.hpp b/qpvt/include/qpvt/widgets/range_h_slider.hpp
index 91347da48fbb17e0de0d99fea5f74e6e15646ec1..6135d5b75bf16a858d36a2b3af5d3dda9abf298d 100644
--- a/qpvt/include/qpvt/widgets/range_h_slider.hpp
+++ b/qpvt/include/qpvt/widgets/range_h_slider.hpp
@@ -29,7 +29,7 @@
 #include <qpvt/api.hpp>
 #include <qpvt/widgets/range_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API range_h_slider : public range_slider
@@ -50,6 +50,6 @@ protected:
   slider_handle inside_handle       (const QPointF& pos) const override;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_RANGE_H_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/range_slider.hpp b/qpvt/include/qpvt/widgets/range_slider.hpp
index d825ec4729b4cbd0294520371ef0a60db95c6bc3..6c4660b184daab74370a6ab41484f4dca6d059bb 100644
--- a/qpvt/include/qpvt/widgets/range_slider.hpp
+++ b/qpvt/include/qpvt/widgets/range_slider.hpp
@@ -36,7 +36,7 @@
 // Native GL must be included before any other GL.
 #include <QOpenGLWidget>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API range_slider : public QOpenGLWidget
@@ -121,6 +121,6 @@ protected:
   pvt::optional<pvt::shader_program> m_cover_shader_program;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_RANGE_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/range_v_slider.hpp b/qpvt/include/qpvt/widgets/range_v_slider.hpp
index 0a6eca54a8aca278b0f796b125721f9d8ba4d93b..4960a2f198d7a1f86cc3ece92235213149d5948c 100644
--- a/qpvt/include/qpvt/widgets/range_v_slider.hpp
+++ b/qpvt/include/qpvt/widgets/range_v_slider.hpp
@@ -29,7 +29,7 @@
 #include <qpvt/api.hpp>
 #include <qpvt/widgets/range_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API range_v_slider : public range_slider
@@ -53,6 +53,6 @@ protected:
   slider_handle inside_handle       (const QPointF& position) const override;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_RANGE_V_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/slice_slider.hpp b/qpvt/include/qpvt/widgets/slice_slider.hpp
index c9203515e757964dd1dc7b00ff8f37a8e9c847fc..079c3cb9e46668fe26d2c6becca0b5ccca37b05d 100644
--- a/qpvt/include/qpvt/widgets/slice_slider.hpp
+++ b/qpvt/include/qpvt/widgets/slice_slider.hpp
@@ -39,7 +39,7 @@ class renderable_line_plot_axes;
 class scene;
 }
 
-namespace pv_app {
+namespace qpvt {
 class viewer_widget;
 
 //------------------------------------------------------------------------------
@@ -101,6 +101,6 @@ private:
   QSlider*                        mp_slider;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_SLICE_SLIDER_HPP_
diff --git a/qpvt/include/qpvt/widgets/squarified_cushion_treemap_widget.hpp b/qpvt/include/qpvt/widgets/squarified_cushion_treemap_widget.hpp
index 30780d4926824be0a5a400588e3e2d2bc837258f..72043bda3708bb91238dec65c56549197bce968d 100644
--- a/qpvt/include/qpvt/widgets/squarified_cushion_treemap_widget.hpp
+++ b/qpvt/include/qpvt/widgets/squarified_cushion_treemap_widget.hpp
@@ -43,7 +43,7 @@ namespace pvt {
 class perf_data;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 typedef pvt::treemap<pvt::cnode,
                      pvt::treemap_tessellation_policy_squarified,
@@ -88,6 +88,6 @@ private:
   pvt::metric* mp_cached_metric     = nullptr;
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_SQUARIFIED_CUSHION_TREEMAP_WIDGET_HPP_
diff --git a/qpvt/include/qpvt/widgets/viewer_widget.hpp b/qpvt/include/qpvt/widgets/viewer_widget.hpp
index 64f3cc991e4c529c2fb290c87f7696ba6c0a9df5..ce7a5682fdf61f162a063c33f1676ad458bf2ad3 100644
--- a/qpvt/include/qpvt/widgets/viewer_widget.hpp
+++ b/qpvt/include/qpvt/widgets/viewer_widget.hpp
@@ -36,7 +36,7 @@ class scene;
 class camera;
 }
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 class QPVT_API viewer_widget : public QOpenGLWidget
@@ -89,6 +89,6 @@ private:
   float        m_clear_color[4];
 };
 
-} // namespace pv_app
+} // namespace qpvt
 
 #endif // #ifndef QPVT_VIEWER_WIDGET_HPP_
diff --git a/qpvt/src/delegates/directed_variation_glyph_delegate.cpp b/qpvt/src/delegates/directed_variation_glyph_delegate.cpp
index 85d040a65ad5a104518a1e3b081c41fd8006b618..d64e6abe5efb2819bea69dde2e48a462c9c3ca4d 100644
--- a/qpvt/src/delegates/directed_variation_glyph_delegate.cpp
+++ b/qpvt/src/delegates/directed_variation_glyph_delegate.cpp
@@ -30,7 +30,7 @@
 #include <qpvt/delegates/directed_variation_glyph_delegate.hpp>
 #include <qpvt/models/cnode_tree_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 directed_variation_glyph_delegate::directed_variation_glyph_delegate
@@ -130,4 +130,4 @@ const
   return QSize(4,4);
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/delegates/severity_glyph_delegate.cpp b/qpvt/src/delegates/severity_glyph_delegate.cpp
index cd3d31a346e9dcde85952a6461f79e2091a880b8..94fc1f42b59536ce503794aef3b505fe9dbeffd8 100644
--- a/qpvt/src/delegates/severity_glyph_delegate.cpp
+++ b/qpvt/src/delegates/severity_glyph_delegate.cpp
@@ -29,7 +29,7 @@
 #include <qpvt/delegates/severity_glyph_delegate.hpp>
 #include <qpvt/models/cnode_tree_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 severity_glyph_delegate::severity_glyph_delegate
@@ -96,4 +96,4 @@ const
   return QSize(4,4);
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/models/cnode_impact_list_model.cpp b/qpvt/src/models/cnode_impact_list_model.cpp
index 19f8327487bb9e15beb8bfdf900ffac214c3f845..8f93dd3efda416b8655e34665e9ba1ab102919bd 100644
--- a/qpvt/src/models/cnode_impact_list_model.cpp
+++ b/qpvt/src/models/cnode_impact_list_model.cpp
@@ -36,7 +36,7 @@
 
 #include <qpvt/models/cnode_impact_list_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 cnode_impact_list_model::cnode_impact_list_model
@@ -433,4 +433,4 @@ const
   return sqrt(variance);
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/models/cnode_tree_model.cpp b/qpvt/src/models/cnode_tree_model.cpp
index fe74404a1f26106fd27fccb9f00996a66f9eaae1..d3ed660d7f674eed74dcdfd51e4ce7c4a3286925 100644
--- a/qpvt/src/models/cnode_tree_model.cpp
+++ b/qpvt/src/models/cnode_tree_model.cpp
@@ -27,7 +27,7 @@
 
 #include <qpvt/models/cnode_tree_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 cnode_tree_model::cnode_tree_model
@@ -142,4 +142,4 @@ const
   return directed_variances;
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/models/correlated_views_model.cpp b/qpvt/src/models/correlated_views_model.cpp
index d123afe49fb361d9d7222533d0af13694bcb2c30..ecad387ec86cce9c65fdf788b8f11b1d89eb7c6d 100644
--- a/qpvt/src/models/correlated_views_model.cpp
+++ b/qpvt/src/models/correlated_views_model.cpp
@@ -29,7 +29,7 @@
 
 #include <qpvt/models/correlated_views_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 // \todo Find a way to handle multiple selected Metrics, Cnodes
@@ -122,4 +122,4 @@ const
     severity_view.get_metric()->get_unit_of_measurement().c_str();
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/models/metric_tree_model.cpp b/qpvt/src/models/metric_tree_model.cpp
index e2e35cc955c0d306dfee4414cca0a124d21132a1..672c7c742e13ba62b5bc4a35054779b738c395ef 100644
--- a/qpvt/src/models/metric_tree_model.cpp
+++ b/qpvt/src/models/metric_tree_model.cpp
@@ -27,7 +27,7 @@
 
 #include <qpvt/models/metric_tree_model.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 metric_tree_model::metric_tree_model
@@ -108,4 +108,4 @@ const
   return QVariant();
 };
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/utility/camera_tools.cpp b/qpvt/src/utility/camera_tools.cpp
index 408098cdd05a0f7b184120001fb8cbb5a27b7abb..1580e4167180444ad2ee601434025d8943435885 100644
--- a/qpvt/src/utility/camera_tools.cpp
+++ b/qpvt/src/utility/camera_tools.cpp
@@ -29,7 +29,7 @@
 
 #include <qpvt/utility/camera_tools.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 camera_tools::camera_tools
@@ -167,4 +167,4 @@ camera_tools::handle_mouse_release
   return false;
 }
 
-} // namespace pv_app
\ No newline at end of file
+} // namespace qpvt
diff --git a/qpvt/src/widgets/cartesian_topology_viewer_widget.cpp b/qpvt/src/widgets/cartesian_topology_viewer_widget.cpp
index 8969b9a8ede982d69c231b09e625d9dcf133563f..6790521d2976932a62949508e026eb7572a15bba 100644
--- a/qpvt/src/widgets/cartesian_topology_viewer_widget.cpp
+++ b/qpvt/src/widgets/cartesian_topology_viewer_widget.cpp
@@ -47,7 +47,7 @@
 #include <qpvt/widgets/data_range_v_slider.hpp>
 #include <qpvt/widgets/slice_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 cartesian_topology_viewer_widget::cartesian_topology_viewer_widget
@@ -1068,4 +1068,4 @@ cartesian_topology_viewer_widget::dropEvent
   update_axis_scales ();
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/cnode_impact_selector_widget.cpp b/qpvt/src/widgets/cnode_impact_selector_widget.cpp
index 6ab8e2d3922b5ac2edfe3eecc312bd76637b22d5..bca6bfbc08afb00b157a69eff44535c74515b701 100644
--- a/qpvt/src/widgets/cnode_impact_selector_widget.cpp
+++ b/qpvt/src/widgets/cnode_impact_selector_widget.cpp
@@ -45,7 +45,7 @@
 #include <qpvt/models/cnode_tree_model.hpp>
 #include <qpvt/widgets/cnode_impact_selector_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 cnode_impact_selector_widget::cnode_impact_selector_widget
@@ -396,5 +396,5 @@ cnode_impact_selector_widget::setup_layout
   mp_layout->addWidget(mp_filter_rows_group_box   );
 }
 
-} // namespace pv_app
+} // namespace qpvt
 
diff --git a/qpvt/src/widgets/data_range_h_slider.cpp b/qpvt/src/widgets/data_range_h_slider.cpp
index 7daf2030ae50f481eb8cc49e2b54d3d09bd14db0..1ce0f7a07f39ead313a69399974f93173c85f6a5 100644
--- a/qpvt/src/widgets/data_range_h_slider.cpp
+++ b/qpvt/src/widgets/data_range_h_slider.cpp
@@ -30,7 +30,7 @@
 
 #include <qpvt/widgets/data_range_h_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 data_range_h_slider::data_range_h_slider
@@ -246,4 +246,4 @@ data_range_h_slider::paintGL
   draw_covers_handles();
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/data_range_v_slider.cpp b/qpvt/src/widgets/data_range_v_slider.cpp
index cce3f40c8a18893cf1409706767de3ea0d7fc2df..6d20c5eb959123439286baaa5c34942ecd2edb7e 100644
--- a/qpvt/src/widgets/data_range_v_slider.cpp
+++ b/qpvt/src/widgets/data_range_v_slider.cpp
@@ -30,7 +30,7 @@
 
 #include <qpvt/widgets/data_range_v_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 data_range_v_slider::data_range_v_slider
@@ -158,4 +158,4 @@ data_range_v_slider::paintGL
   draw_covers_handles();
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/geometry_viewer_widget.cpp b/qpvt/src/widgets/geometry_viewer_widget.cpp
index 46fec8253dc43c7676d013c93fef80e4bbbd5b68..1ce99ea8806cb91b0e49e493ba68f0984ba8ef71 100644
--- a/qpvt/src/widgets/geometry_viewer_widget.cpp
+++ b/qpvt/src/widgets/geometry_viewer_widget.cpp
@@ -32,7 +32,7 @@
 #include <qpvt/widgets/geometry_viewer_widget.hpp>
 #include <qpvt/widgets/parallel_coordinates_plot_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 geometry_viewer_widget::geometry_viewer_widget
@@ -376,4 +376,4 @@ geometry_viewer_widget::handle_geometry_selection
   mp_table_widget          ->setFocus();
 
 }
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/parallel_coordinates_plot_widget.cpp b/qpvt/src/widgets/parallel_coordinates_plot_widget.cpp
index 982549963d69bde9a47883e0f584f9b00ada00e4..f3c91b694118f351ad8205064506f300f99de530 100644
--- a/qpvt/src/widgets/parallel_coordinates_plot_widget.cpp
+++ b/qpvt/src/widgets/parallel_coordinates_plot_widget.cpp
@@ -34,7 +34,7 @@
 #include <qpvt/widgets/parallel_coordinates_plot_widget.hpp>
 #include <qpvt/widgets/viewer_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 parallel_coordinates_plot_widget::parallel_coordinates_plot_widget(QWidget* parent)
@@ -208,4 +208,4 @@ parallel_coordinates_plot_widget::on_lower_button_clicked
   toggle_axis(index, true);
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/perf_data_viewer_widget.cpp b/qpvt/src/widgets/perf_data_viewer_widget.cpp
index b043075b69da3d1aa45a8ec16d510b1010f7b696..44b9c9d7d7f79d72b733dc343c368da49c1f1811 100644
--- a/qpvt/src/widgets/perf_data_viewer_widget.cpp
+++ b/qpvt/src/widgets/perf_data_viewer_widget.cpp
@@ -45,7 +45,7 @@
 #include <qpvt/widgets/cnode_impact_selector_widget.hpp>
 #include <qpvt/widgets/perf_data_viewer_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 perf_data_viewer_widget::perf_data_viewer_widget
@@ -875,4 +875,4 @@ perf_data_viewer_widget::select_and_focus_on_metric
                             QAbstractItemView::PositionAtCenter);
 }
 
-} // namespace pv_app
\ No newline at end of file
+} // namespace qpvt
diff --git a/qpvt/src/widgets/range_h_slider.cpp b/qpvt/src/widgets/range_h_slider.cpp
index 3f026d4d6fa21bae8c34ca524c58d29c3ca4d87f..69258780f92f0dd84eb4fecb6910881fef57647e 100644
--- a/qpvt/src/widgets/range_h_slider.cpp
+++ b/qpvt/src/widgets/range_h_slider.cpp
@@ -25,7 +25,7 @@
 
 #include <qpvt/widgets/range_h_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 range_h_slider::range_h_slider
@@ -128,4 +128,4 @@ const
   return no_handle;
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/range_slider.cpp b/qpvt/src/widgets/range_slider.cpp
index 50fdb6735d2da438fde18d61bfa2c0296736eb3f..880f52d3bff9675fcd4af9acd01ce376bc832cde 100644
--- a/qpvt/src/widgets/range_slider.cpp
+++ b/qpvt/src/widgets/range_slider.cpp
@@ -30,7 +30,7 @@
 
 #include <qpvt/widgets/range_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 range_slider::range_slider
@@ -206,4 +206,4 @@ range_slider::mouseMoveEvent
   handle_cursor_change(p_event->localPos());
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/range_v_slider.cpp b/qpvt/src/widgets/range_v_slider.cpp
index 5db80c5034c4b255cb865d9bc78589a18dd0e4dc..88145af0d1011d84b285b81700edecec48a06f2b 100644
--- a/qpvt/src/widgets/range_v_slider.cpp
+++ b/qpvt/src/widgets/range_v_slider.cpp
@@ -29,7 +29,7 @@
 
 #include <qpvt/widgets/range_v_slider.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 range_v_slider::range_v_slider
@@ -135,4 +135,4 @@ const
   return no_handle;
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/slice_slider.cpp b/qpvt/src/widgets/slice_slider.cpp
index 4ca515b6d3df7b66ebfc23f925d045d7ef0b21b7..79d45482fcb31db9ebfbd7aea36a75c1f3b70810 100644
--- a/qpvt/src/widgets/slice_slider.cpp
+++ b/qpvt/src/widgets/slice_slider.cpp
@@ -34,7 +34,7 @@
 #include <qpvt/widgets/slice_slider.hpp>
 #include <qpvt/widgets/viewer_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 slice_slider::slice_slider
@@ -167,4 +167,4 @@ slice_slider::manual_update
   }
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/squarified_cushion_treemap_widget.cpp b/qpvt/src/widgets/squarified_cushion_treemap_widget.cpp
index b6cea802a67bf585dca589311445ec761c76187f..33d409ba0213adc3abb31e42247469e0974ec4a6 100644
--- a/qpvt/src/widgets/squarified_cushion_treemap_widget.cpp
+++ b/qpvt/src/widgets/squarified_cushion_treemap_widget.cpp
@@ -33,7 +33,7 @@
 
 #include <qpvt/widgets/squarified_cushion_treemap_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 squarified_cushion_treemap_widget::squarified_cushion_treemap_widget(
@@ -280,4 +280,4 @@ squarified_cushion_treemap_widget::wheelEvent
   p_wheel_event->accept();
 }
 
-} // namespace pv_app
+} // namespace qpvt
diff --git a/qpvt/src/widgets/viewer_widget.cpp b/qpvt/src/widgets/viewer_widget.cpp
index eb2f128052519e13cf571d838d03ab0b0e6a2d33..19c83eb534ecf84fa5db86b5300404a004e71968 100644
--- a/qpvt/src/widgets/viewer_widget.cpp
+++ b/qpvt/src/widgets/viewer_widget.cpp
@@ -31,7 +31,7 @@
 
 #include <qpvt/widgets/viewer_widget.hpp>
 
-namespace pv_app {
+namespace qpvt {
 
 //------------------------------------------------------------------------------
 viewer_widget::viewer_widget
@@ -139,4 +139,4 @@ viewer_widget::mouseReleaseEvent
   }
 }
 
-} // namespace pv_app
+} // namespace qpvt