diff --git a/compendium_v2/db/model_enums.py b/compendium_v2/db/presentation_model_enums.py
similarity index 100%
rename from compendium_v2/db/model_enums.py
rename to compendium_v2/db/presentation_model_enums.py
diff --git a/compendium_v2/db/presentation_models.py b/compendium_v2/db/presentation_models.py
index 5464188bf31d8afa88984b12620c880edf3d0678..de57349364b55690b7a03322816f814f9f1a700d 100644
--- a/compendium_v2/db/presentation_models.py
+++ b/compendium_v2/db/presentation_models.py
@@ -11,8 +11,9 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.schema import ForeignKey
 
 from compendium_v2.db import db
-from compendium_v2.db.model_enums import CarryMechanism, CommarcialChargingLevel, UserCategory, ServiceCategory, \
-    ConnectivityCoverage, ConnectionMethod, YesNoPlanned, MonitoringMethod, CommercialConnectivityCoverage, FeeType
+from compendium_v2.db.presentation_model_enums import CarryMechanism, CommarcialChargingLevel, UserCategory, \
+    ConnectivityCoverage, ConnectionMethod, YesNoPlanned, MonitoringMethod, CommercialConnectivityCoverage, \
+    FeeType, ServiceCategory
 
 
 logger = logging.getLogger(__name__)
diff --git a/compendium_v2/publishers/excel_parser.py b/compendium_v2/publishers/excel_parser.py
index 1e964be8985a48695d7acf8729f94ca33581205f..41f7c0149b3f4cb9a89c30e42dbf9304a336cb25 100644
--- a/compendium_v2/publishers/excel_parser.py
+++ b/compendium_v2/publishers/excel_parser.py
@@ -2,7 +2,7 @@ import logging
 import openpyxl
 import os
 
-from compendium_v2.db.model_enums import FeeType
+from compendium_v2.db.presentation_model_enums import FeeType
 from compendium_v2.environment import setup_logging
 
 setup_logging()
diff --git a/compendium_v2/publishers/survey_publisher.py b/compendium_v2/publishers/survey_publisher.py
index 604d27235679ea8b4103e37ec1243a8e168b4bd5..6946aa10847f85e81394666dce49219fa91dc0c4 100644
--- a/compendium_v2/publishers/survey_publisher.py
+++ b/compendium_v2/publishers/survey_publisher.py
@@ -18,7 +18,7 @@ from compendium_v2.db import db
 from compendium_v2.db.presentation_models import BudgetEntry, ChargingStructure, ECProject, ExternalConnections, \
     InstitutionURLs, NrenStaff, ParentOrganization, Policy, SubOrganization, TrafficVolume, ExternalConnection, \
     FundingSource
-from compendium_v2.db.model_enums import FeeType
+from compendium_v2.db.presentation_model_enums import FeeType
 from compendium_v2.db.survey_models import ResponseStatus, SurveyResponse
 
 
diff --git a/compendium_v2/publishers/survey_publisher_old_db_2022.py b/compendium_v2/publishers/survey_publisher_old_db_2022.py
index 322e06e1357b581717538a5821fbf4d02d9304c7..c4c1bb86fc8f47c839dd83821ec8ce9e4f670431 100644
--- a/compendium_v2/publishers/survey_publisher_old_db_2022.py
+++ b/compendium_v2/publishers/survey_publisher_old_db_2022.py
@@ -17,7 +17,7 @@ from sqlalchemy import delete, text
 from collections import defaultdict
 
 import compendium_v2
-from compendium_v2.db.model_enums import FeeType
+from compendium_v2.db.presentation_model_enums import FeeType
 from compendium_v2.environment import setup_logging
 from compendium_v2.config import load
 from compendium_v2.publishers.helpers import extract_urls
diff --git a/test/test_db_survey_publisher_2022.py b/test/test_db_survey_publisher_2022.py
index bcec6c9804a749219bb9abd36ec023c6e252ce93..1d0fbcd1ded07fd52578fc4fc4806293a9b6ee3a 100644
--- a/test/test_db_survey_publisher_2022.py
+++ b/test/test_db_survey_publisher_2022.py
@@ -1,6 +1,6 @@
 from sqlalchemy import select
 
-from compendium_v2.db import db, presentation_models, model_enums
+from compendium_v2.db import db, presentation_model_enums, presentation_models
 from compendium_v2.publishers.survey_publisher_old_db_2022 import _cli, FundingSource, \
     StaffQuestion, OrgQuestion, ChargingStructure, ECQuestion
 
@@ -282,11 +282,11 @@ def test_publisher(app_with_survey_db, mocker, dummy_config):
         ).all()
         assert len(charging_structures) == 3
         assert charging_structures[0].nren.name.lower() == 'nren1'
-        assert charging_structures[0].fee_type == model_enums.FeeType.no_charge
+        assert charging_structures[0].fee_type == presentation_model_enums.FeeType.no_charge
         assert charging_structures[1].nren.name.lower() == 'nren2'
-        assert charging_structures[1].fee_type == model_enums.FeeType.usage_based_fee
+        assert charging_structures[1].fee_type == presentation_model_enums.FeeType.usage_based_fee
         assert charging_structures[2].nren.name.lower() == 'nren3'
-        assert charging_structures[2].fee_type == model_enums.FeeType.other
+        assert charging_structures[2].fee_type == presentation_model_enums.FeeType.other
 
         _ec_data = db.session.scalars(
             select(presentation_models.ECProject).order_by(presentation_models.ECProject.nren_id.asc())
diff --git a/test/test_survey_publisher.py b/test/test_survey_publisher.py
index b1ca453411e781526f98dfef4270f459015bd463..e6cc54f68f434b937fb9158b4046cfac5ef2f671 100644
--- a/test/test_survey_publisher.py
+++ b/test/test_survey_publisher.py
@@ -5,7 +5,7 @@ import os
 from sqlalchemy import func, select
 
 from compendium_v2 import db
-from compendium_v2.db import presentation_models, model_enums
+from compendium_v2.db import presentation_model_enums, presentation_models
 from compendium_v2.publishers.survey_publisher import _map_2023
 
 
@@ -53,7 +53,7 @@ def test_v2_publisher_full(app):
         assert funding_source.other == Decimal("10")
 
         charging_structure = db.session.scalar(select(presentation_models.ChargingStructure.fee_type))
-        assert charging_structure == model_enums.FeeType.usage_based_fee
+        assert charging_structure == presentation_model_enums.FeeType.usage_based_fee
 
         staff = db.session.scalar(select(presentation_models.NrenStaff))
         assert staff.permanent_fte == Decimal("5.6")