diff --git a/pglab/CustomDataRole.h b/pglab/CustomDataRole.h
index 04dc447..5279dce 100644
--- a/pglab/CustomDataRole.h
+++ b/pglab/CustomDataRole.h
@@ -14,9 +14,9 @@ enum class ReferencedType {
 };
 
 ///
-enum DataMeaning {
-    DataMeaningNormal,
-    DataMeaningBytes ///< the value represents bytes  pretty print in KiB, MiB, GiB, TiB, PiB, EiB
+enum class DataMeaning {
+    Normal,
+    Bytes ///< the value represents bytes  pretty print in KiB, MiB, GiB, TiB, PiB, EiB
 };
 
 enum CustomDataRole {
diff --git a/pglab/catalog/models/BaseTableModel.cpp b/pglab/catalog/models/BaseTableModel.cpp
index 8bdf333..6708a10 100644
--- a/pglab/catalog/models/BaseTableModel.cpp
+++ b/pglab/catalog/models/BaseTableModel.cpp
@@ -24,5 +24,5 @@ QVariant BaseTableModel::data(const QModelIndex &index, int role) const
 
 QVariant BaseTableModel::getDataMeaning(const QModelIndex &) const
 {
-    return static_cast<int>(DataMeaningNormal);
+    return static_cast<int>(DataMeaning::Normal);
 }
diff --git a/pglab/catalog/models/DatabasesTableModel.cpp b/pglab/catalog/models/DatabasesTableModel.cpp
index d53b9a8..3ab64af 100644
--- a/pglab/catalog/models/DatabasesTableModel.cpp
+++ b/pglab/catalog/models/DatabasesTableModel.cpp
@@ -183,7 +183,7 @@ QVariant DatabasesTableModel::getDataMeaning(const QModelIndex &index) const
 {
     if (index.column() == SizeCol)
     {
-        return static_cast<int>(DataMeaningBytes);
+        return static_cast<int>(DataMeaning::Bytes);
     }
     return BaseTableModel::getDataMeaning(index);
 }
diff --git a/pglab/catalog/models/IndexModel.cpp b/pglab/catalog/models/IndexModel.cpp
index 0180f71..7cee4e4 100644
--- a/pglab/catalog/models/IndexModel.cpp
+++ b/pglab/catalog/models/IndexModel.cpp
@@ -133,9 +133,9 @@ QVariant IndexModel::data(const QModelIndex &index, int role) const
     else if (role == CustomDataMeaningRole) {
         switch (index.column()) {
         case SizeCol:
-            return static_cast<int>(DataMeaningBytes);
+            return static_cast<int>(DataMeaning::Bytes);
         default:
-            return static_cast<int>(DataMeaningNormal);
+            return static_cast<int>(DataMeaning::Normal);
         }
     }
     return v;
diff --git a/pglab/catalog/tables/TablesTableModel.cpp b/pglab/catalog/tables/TablesTableModel.cpp
index 2d49c75..244762b 100644
--- a/pglab/catalog/tables/TablesTableModel.cpp
+++ b/pglab/catalog/tables/TablesTableModel.cpp
@@ -200,9 +200,9 @@ QVariant TablesTableModel::data(const QModelIndex &index, int role) const
         case TableSizeCol:
         case IndexSizeCol:
         case ToastSizeCol:
-            return static_cast<int>(DataMeaningBytes);
+            return static_cast<int>(DataMeaning::Bytes);
         default:
-            return static_cast<int>(DataMeaningNormal);
+            return static_cast<int>(DataMeaning::Normal);
         }
     }
 
diff --git a/pglab/util/PgLabItemDelegate.cpp b/pglab/util/PgLabItemDelegate.cpp
index db958c5..b49e079 100644
--- a/pglab/util/PgLabItemDelegate.cpp
+++ b/pglab/util/PgLabItemDelegate.cpp
@@ -90,7 +90,7 @@ void PgLabItemDelegate::initStyleOption(QStyleOptionViewItem *option,
     value = index.data(CustomDataMeaningRole);
     DataMeaning meaning = value.isValid()
             ? static_cast<DataMeaning>(value.toInt())
-            : DataMeaningNormal;
+            : DataMeaning::Normal;
 
 	value = index.data(Qt::DisplayRole);
 
@@ -110,7 +110,7 @@ void PgLabItemDelegate::initStyleOption(QStyleOptionViewItem *option,
         }
 		else {
             forground_color = GetDefaultColorForType(oid);
-            if (meaning == DataMeaningBytes) {
+            if (meaning == DataMeaning::Bytes) {
                 QString suffix;
                 auto s = value.toLongLong();
                 double val;