diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 23fa997..4c8fe94 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -43,13 +43,13 @@ jobs:
             --skip test_quantity_dimension \
             --configfile=.github/utils/emmocheck_config.yml \
             electrochemicalquantities.ttl
-        elif [ -f "modules/electrochemistry-quantities.ttl" ]; then
+        elif [ -f "modules/quantities.ttl" ]; then
           emmocheck --verbose --url-from-catalog \
             --skip test_namespace \
             --skip test_quantity_dimension \
             --configfile=.github/utils/emmocheck_config.yml \
-            modules/electrochemistry-quantities.ttl
+            modules/quantities.ttl
         else
-          echo "electrochemicalquantities.ttl or modules/electrochemistry-quantities.ttl not found!"
+          echo "electrochemicalquantities.ttl or modules/quantities.ttl not found!"
           exit 1
         fi
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 95c54b0..1f11e99 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -95,10 +95,10 @@ jobs:
             # For older versions
             python docs/scripts/apply_foops_recommendations.py electrochemicalquantities.ttl electrochemicalquantities-foops.ttl
             sudo cp "electrochemicalquantities-foops.ttl" "docs/_build/html/versions/$TAG/electrochemicalquantities.ttl"
-          elif [ -f "modules/electrochemistry-quantities.ttl" ]; then
+          elif [ -f "modules/quantities.ttl" ]; then
             # For newer versions
-            python docs/scripts/apply_foops_recommendations.py modules/electrochemistry-quantities.ttl electrochemistry-quantities-foops.ttl
-            sudo cp "electrochemistry-quantities-foops.ttl" "docs/_build/html/versions/$TAG/electrochemistry-quantities.ttl"
+            python docs/scripts/apply_foops_recommendations.py modules/quantities.ttl quantities-foops.ttl
+            sudo cp "quantities-foops.ttl" "docs/_build/html/versions/$TAG/quantities.ttl"
           else
             echo "File not found!"
             exit 1
@@ -125,9 +125,9 @@ jobs:
         if [ -f "electrochemicalquantities.ttl" ]; then
           python docs/scripts/apply_foops_recommendations.py electrochemicalquantities.ttl electrochemicalquantities-foops.ttl
           sudo cp "electrochemicalquantities-foops.ttl" "docs/_build/html/electrochemicalquantities.ttl"
-        elif [ -f "modules/electrochemistry-quantities.ttl" ]; then
-          python docs/scripts/apply_foops_recommendations.py modules/electrochemistry-quantities.ttl electrochemistry-quantities-foops.ttl
-          sudo cp "electrochemistry-quantities-foops.ttl" "docs/_build/html/electrochemistry-quantities.ttl"
+        elif [ -f "modules/quantities.ttl" ]; then
+          python docs/scripts/apply_foops_recommendations.py modules/quantities.ttl quantities-foops.ttl
+          sudo cp "quantities-foops.ttl" "docs/_build/html/quantities.ttl"
         else
           echo "Electrochemical quantities file not found!"
           exit 1
diff --git a/docs/scripts/ttl_to_rst.py b/docs/scripts/ttl_to_rst.py
index c4b0aa8..17eca5a 100644
--- a/docs/scripts/ttl_to_rst.py
+++ b/docs/scripts/ttl_to_rst.py
@@ -1,4 +1,5 @@
 from rdflib import Graph
+import os
 
 
 
@@ -142,8 +143,8 @@ def rendering_workflow():
     # Check for old structure (root directory)
     if os.path.isfile("./electrochemicalquantities.ttl"):
         ttl_modules.append({"section title": "Quantities used in Electrochemistry", "path": "./electrochemicalquantities.ttl"})
-    elif os.path.isfile("./modules/electrochemistry-quantities.ttl"):
-        ttl_modules.append({"section title": "Quantities used in Electrochemistry", "path": "./modules/electrochemistry-quantities.ttl"})
+    elif os.path.isfile("./modules/quantities.ttl"):
+        ttl_modules.append({"section title": "Quantities used in Electrochemistry", "path": "./modules/quantities.ttl"})
     else:
         raise FileNotFoundError("No suitable TTL file found for electrochemical quantities.")