diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index efccf7a62c867142b99019af10d1110438e6c633..5404c4971efbb33ba593b6e1f9404e03b19882fb 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/GUI/Model/Data/Data2DItem.cpp
@@ -328,7 +328,7 @@ void Data2DItem::readFrom(QXmlStreamReader* r)
 
             // masks
         } else if (tag == Tag::MaskContainer) {
-            getOrCreateMaskModel()->masksSet()->readFrom(r);
+            getOrCreateFlagl()->masksSet()->readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
             // projections
@@ -351,7 +351,7 @@ const MasksSet* Data2DItem::masksSet() const
     return m_mask_model ? m_mask_model->masksSet() : nullptr;
 }
 
-MasksQModel* Data2DItem::getOrCreateMaskModel()
+MasksQModel* Data2DItem::getOrCreateFlagl()
 {
     if (!m_mask_model)
         m_mask_model = std::make_unique<MasksQModel>(new MasksSet);
diff --git a/GUI/Model/Data/Data2DItem.h b/GUI/Model/Data/Data2DItem.h
index 6866823bd638c5f7d40e54b80e630e5f09ce0975..9c3fae8e1bed48044029aa4b5dcd0094b8675b09 100644
--- a/GUI/Model/Data/Data2DItem.h
+++ b/GUI/Model/Data/Data2DItem.h
@@ -79,7 +79,7 @@ public:
 
     MasksSet* masksSet();
     const MasksSet* masksSet() const;
-    MasksQModel* getOrCreateMaskModel();
+    MasksQModel* getOrCreateFlagl();
     Datafield* createMaskedField() const;
 
     ProjectionsSet* projectionsSet();
diff --git a/GUI/View/Canvas/MaskEditorCanvas.cpp b/GUI/View/Canvas/MaskEditorCanvas.cpp
index 92fda89bdfb02e1ea96b3eacdc769e2afb35d82c..c10c51b3353728846912934c0c9515b90c2a95cd 100644
--- a/GUI/View/Canvas/MaskEditorCanvas.cpp
+++ b/GUI/View/Canvas/MaskEditorCanvas.cpp
@@ -67,7 +67,7 @@ void MaskEditorCanvas::updateCanvas(Data2DItem* data_item)
     ASSERT(data_item);
     m_data_item = data_item;
 
-    m_scene->associateItems(data_item, data_item->getOrCreateMaskModel());
+    m_scene->associateItems(data_item, data_item->getOrCreateFlagl());
 
     m_scene->updateSize(m_view->size());
 
@@ -190,7 +190,7 @@ void MaskEditorCanvas::onLeavingColorMap()
     }
 }
 
-void MaskEditorCanvas::setProjectionsCanvasMode(Canvas2DMode::MaskMode mask_mode)
+void MaskEditorCanvas::setProjectionsCanvasMode(Canvas2DMode::Flag mask_mode)
 {
     m_current_activity = mask_mode;
     m_scene->onActivityChanged(mask_mode);
diff --git a/GUI/View/Canvas/MaskEditorCanvas.h b/GUI/View/Canvas/MaskEditorCanvas.h
index 16f187a7cdc26bcb10dfe8565b9f17692bcbb263..bd7afb1e16fe484c3c95ea72be248c97684ba40b 100644
--- a/GUI/View/Canvas/MaskEditorCanvas.h
+++ b/GUI/View/Canvas/MaskEditorCanvas.h
@@ -39,16 +39,16 @@ public:
     MaskGraphicsScene* getScene() { return m_scene; }
 
 signals:
-    void changeActivityRequest(Canvas2DMode::MaskMode);
+    void changeActivityRequest(Canvas2DMode::Flag);
     void deleteSelectedRequest();
-    void changeProjectionsTabRequest(Canvas2DMode::MaskMode);
+    void changeProjectionsTabRequest(Canvas2DMode::Flag);
     void marginsChanged(double left, double right);
 
 public slots:
     void onResetViewRequest();
     void onSavePlotRequest();
     void onPresentationChange(bool pixelized);
-    void setProjectionsCanvasMode(Canvas2DMode::MaskMode mask_mode);
+    void setProjectionsCanvasMode(Canvas2DMode::Flag mask_mode);
 
 private slots:
     void onEnteringColorMap();
@@ -65,7 +65,7 @@ private:
     std::unique_ptr<Datafield> m_backup_data;
     bool m_backup_interpolated = false;
     std::unique_ptr<LineItem> m_live_projection; //!< temporary, matching mouse move
-    Canvas2DMode::MaskMode m_current_activity;
+    Canvas2DMode::Flag m_current_activity;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_CANVAS_MASKEDITORCANVAS_H
diff --git a/GUI/View/Canvas/ProjectedGraphsCanvas.cpp b/GUI/View/Canvas/ProjectedGraphsCanvas.cpp
index 7c1e046072aa75a0e0a6d9b93e58e59f5c3d5014..dde1852a4a599f1808019c3b553caf1119af47ff 100644
--- a/GUI/View/Canvas/ProjectedGraphsCanvas.cpp
+++ b/GUI/View/Canvas/ProjectedGraphsCanvas.cpp
@@ -58,7 +58,7 @@ void ProjectedGraphsCanvas::disconnectItem()
     m_y_projection->disconnectItems();
 }
 
-void ProjectedGraphsCanvas::onActivityChanged(Canvas2DMode::MaskMode mask_mode)
+void ProjectedGraphsCanvas::onActivityChanged(Canvas2DMode::Flag mask_mode)
 {
     setConnected(false);
 
diff --git a/GUI/View/Canvas/ProjectedGraphsCanvas.h b/GUI/View/Canvas/ProjectedGraphsCanvas.h
index 711e607449a41867cd16204f6a8204955325e5f6..d61218201b0b120f7c0c436393d21f706a7a708f 100644
--- a/GUI/View/Canvas/ProjectedGraphsCanvas.h
+++ b/GUI/View/Canvas/ProjectedGraphsCanvas.h
@@ -32,10 +32,10 @@ public:
     void disconnectItem();
 
 signals:
-    void changeActivityRequest(Canvas2DMode::MaskMode mask_mode);
+    void changeActivityRequest(Canvas2DMode::Flag mask_mode);
 
 public slots:
-    void onActivityChanged(Canvas2DMode::MaskMode mask_mode);
+    void onActivityChanged(Canvas2DMode::Flag mask_mode);
     void onMarginsChanged(double left, double right);
 
 private slots:
diff --git a/GUI/View/Frame/Plot2DFrame.cpp b/GUI/View/Frame/Plot2DFrame.cpp
index ee6994f6631b2ad24a0b0af641922152e781b61a..9dfdd5b6fb2b6de2621ef0bcd209dffc52b0bf6a 100644
--- a/GUI/View/Frame/Plot2DFrame.cpp
+++ b/GUI/View/Frame/Plot2DFrame.cpp
@@ -101,7 +101,7 @@ Plot2DFrame::Plot2DFrame(Data2DItem* item)
 void Plot2DFrame::updateFrame()
 {
     ASSERT(m_data_item);
-    MasksQModel* masks_qmodel = m_data_item->getOrCreateMaskModel();
+    MasksQModel* masks_qmodel = m_data_item->getOrCreateFlagl();
     ASSERT(masks_qmodel);
     m_masks_panel->updateMasksPanel(masks_qmodel);
 
diff --git a/GUI/View/Scene/MaskGraphicsScene.cpp b/GUI/View/Scene/MaskGraphicsScene.cpp
index da6f470750283119f08776d6658e7d59e1676d27..a97b10baab61df0c79b5852c7f99dec1f0bc41a0 100644
--- a/GUI/View/Scene/MaskGraphicsScene.cpp
+++ b/GUI/View/Scene/MaskGraphicsScene.cpp
@@ -96,7 +96,7 @@ void MaskGraphicsScene::updateSize(const QSize& newSize)
 //  public slots
 //  ************************************************************************************************
 
-void MaskGraphicsScene::onActivityChanged(Canvas2DMode::MaskMode mask_mode)
+void MaskGraphicsScene::onActivityChanged(Canvas2DMode::Flag mask_mode)
 {
     if (!m_proxy)
         return;
diff --git a/GUI/View/Scene/MaskGraphicsScene.h b/GUI/View/Scene/MaskGraphicsScene.h
index 7a407624858ab88797646d3d32cddb62230f57f8..0d0b57e05a4c9ee72f4d8a3ebfad7c948c6adad6 100644
--- a/GUI/View/Scene/MaskGraphicsScene.h
+++ b/GUI/View/Scene/MaskGraphicsScene.h
@@ -53,7 +53,7 @@ signals:
     void lineItemDeleted(const LineItem* sender);
 
 public slots:
-    void onActivityChanged(Canvas2DMode::MaskMode mask_mode);
+    void onActivityChanged(Canvas2DMode::Flag mask_mode);
     void onRowsAboutToBeRemoved(const QModelIndex&, int first, int last);
 
 private slots:
@@ -106,7 +106,7 @@ private:
     QPointF m_mouse_position;
     bool m_drawing_in_progress;
     bool m_mask_value;
-    Canvas2DMode::MaskMode m_mask_mode;
+    Canvas2DMode::Flag m_mask_mode;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SCENE_MASKGRAPHICSSCENE_H
diff --git a/GUI/View/Scene/MaskGraphicsView.h b/GUI/View/Scene/MaskGraphicsView.h
index b68cfdf639d89fbd3fbf3e843cc551bcdfef6957..5d0cd1881e5e3699ae7ad955ecea61a04e756f65 100644
--- a/GUI/View/Scene/MaskGraphicsView.h
+++ b/GUI/View/Scene/MaskGraphicsView.h
@@ -31,7 +31,7 @@ public:
     QSize minimumSizeHint() const override { return {128, 128}; }
 
 signals:
-    void changeActivityRequest(Canvas2DMode::MaskMode);
+    void changeActivityRequest(Canvas2DMode::Flag);
     void deleteSelectedRequest();
 
 public slots:
diff --git a/GUI/View/Setup/DataToolbar.cpp b/GUI/View/Setup/DataToolbar.cpp
index 0e671ddff73c33c64f3c6e87d181c6bbca402ca4..dc625254126758322b32d39a97509573cc0e7149 100644
--- a/GUI/View/Setup/DataToolbar.cpp
+++ b/GUI/View/Setup/DataToolbar.cpp
@@ -167,7 +167,7 @@ DataToolbar::DataToolbar()
     addWidget(saveButton);
 }
 
-void DataToolbar::onChangeActivityRequest(Canvas2DMode::MaskMode mask_mode)
+void DataToolbar::onChangeActivityRequest(Canvas2DMode::Flag mask_mode)
 {
     setCurrentActivity(mask_mode);
     emit activityChanged(currentActivity());
@@ -175,19 +175,19 @@ void DataToolbar::onChangeActivityRequest(Canvas2DMode::MaskMode mask_mode)
 
 //! Change activity only if current activity is one of drawing mode (horizontal, vertical
 //! projections drawing).
-void DataToolbar::onProjectionTabChange(Canvas2DMode::MaskMode mask_mode)
+void DataToolbar::onProjectionTabChange(Canvas2DMode::Flag mask_mode)
 {
     if (currentActivity() == Canvas2DMode::HORIZONTAL_PRJN
         || currentActivity() == Canvas2DMode::VERTICAL_PRJN)
         onChangeActivityRequest(mask_mode);
 }
 
-Canvas2DMode::MaskMode DataToolbar::currentActivity() const
+Canvas2DMode::Flag DataToolbar::currentActivity() const
 {
-    return Canvas2DMode::MaskMode(m_activity_button_group->checkedId());
+    return Canvas2DMode::Flag(m_activity_button_group->checkedId());
 }
 
-void DataToolbar::setCurrentActivity(Canvas2DMode::MaskMode mask_mode)
+void DataToolbar::setCurrentActivity(Canvas2DMode::Flag mask_mode)
 {
     m_activity_button_group->button(mask_mode)->setChecked(true);
 }
diff --git a/GUI/View/Setup/DataToolbar.h b/GUI/View/Setup/DataToolbar.h
index d09d78ba13c7dfbda625b1b3eb4c6e2d83d1728b..dd0021947dcb45ca91ef18353973c739ae2ea072 100644
--- a/GUI/View/Setup/DataToolbar.h
+++ b/GUI/View/Setup/DataToolbar.h
@@ -29,16 +29,16 @@ public:
     DataToolbar();
 
 public slots:
-    void onChangeActivityRequest(Canvas2DMode::MaskMode mask_mode);
-    void onProjectionTabChange(Canvas2DMode::MaskMode mask_mode);
+    void onChangeActivityRequest(Canvas2DMode::Flag mask_mode);
+    void onProjectionTabChange(Canvas2DMode::Flag mask_mode);
 
 signals:
-    void activityChanged(Canvas2DMode::MaskMode);
+    void activityChanged(Canvas2DMode::Flag);
     void presentationChange(bool);
 
 private:
-    Canvas2DMode::MaskMode currentActivity() const;
-    void setCurrentActivity(Canvas2DMode::MaskMode mask_mode);
+    Canvas2DMode::Flag currentActivity() const;
+    void setCurrentActivity(Canvas2DMode::Flag mask_mode);
 
     QButtonGroup* m_activity_button_group;
 };
diff --git a/GUI/View/Tool/Canvas2DMode.h b/GUI/View/Tool/Canvas2DMode.h
index 3425ee666ba8aa7de432d52670ba75b445e2a10b..9b25fdd64f7072f91ad2776af88f2f0d237cbbf2 100644
--- a/GUI/View/Tool/Canvas2DMode.h
+++ b/GUI/View/Tool/Canvas2DMode.h
@@ -19,7 +19,7 @@
 
 namespace Canvas2DMode {
 
-enum MaskMode {
+enum Flag {
     SELECTION,
     PAN_ZOOM,
     RECTANGLE,
@@ -33,32 +33,32 @@ enum MaskMode {
     MASKALL,
 };
 
-inline bool isRectangleShapeMode(MaskMode m)
+inline bool isRectangleShapeMode(Flag m)
 {
     return m == RECTANGLE || m == ELLIPSE || m == ROI;
 }
 
-inline bool isLineMask(MaskMode m)
+inline bool isLineMask(Flag m)
 {
     return m == VERTICAL_MASK || m == HORIZONTAL_MASK;
 }
 
-inline bool isPrjn(MaskMode m)
+inline bool isPrjn(Flag m)
 {
     return m == VERTICAL_PRJN || m == HORIZONTAL_PRJN;
 }
 
-inline bool isHorizontalLine(MaskMode m)
+inline bool isHorizontalLine(Flag m)
 {
     return m == HORIZONTAL_PRJN || m == HORIZONTAL_MASK;
 }
 
-inline bool isVerticalLine(MaskMode m)
+inline bool isVerticalLine(Flag m)
 {
     return m == VERTICAL_PRJN || m == VERTICAL_MASK;
 }
 
-inline bool isLineMode(MaskMode m)
+inline bool isLineMode(Flag m)
 {
     return isHorizontalLine(m) || isVerticalLine(m);
 }
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index 29161cc74fe98dc4acfed1eac8e31755df57170b..9e34cf16c41819097bdb94bd595a2d9ca35364bc 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -147,7 +147,7 @@ TEST(TestJobsSet, masksToDetector)
     mask.setYUp(4.0);
 
     // add mask to DatafileItem
-    MasksSet* container = dfile_item.data2DItem()->getOrCreateMaskModel()->masksSet();
+    MasksSet* container = dfile_item.data2DItem()->getOrCreateFlagl()->masksSet();
     container->addMaskItem(&mask);
 
     // add DatafileItem to job