diff --git a/build.py b/build.py
index d75a8bc8..713cd59a 100644
--- a/build.py
+++ b/build.py
@@ -39,7 +39,7 @@
         SchemaDocBuilder(schema, schema_loader.schemas_sources, relative_path_by_schema).build()
 
     # Step 5 - building toctrees (please note that the implementation requires the schemas to be built already)
-    create_toc_tree_page(schema_version, ["schema_specifications"])
+    create_toc_tree_page(schema_version, ["specifications"])
 
     # Step 6 - checkout version branch in relative "upload" directory (provided by GitHub pipeline), copy files and push
     if schema_version not in versions:
@@ -68,7 +68,7 @@
     InstancesDocBuilder(instance_version, instances_libraries.instances_libraries).build()
 
     # Step 5 - building toctrees (please note that the implementation requires the schemas to be built already)
-    create_toc_tree_page(instance_version, ["instances_libraries"])
+    create_toc_tree_page(instance_version, ["libraries"])
 
     # Step 6 - checkout version branch in relative "upload" directory (provided by GitHub pipeline), copy files and push
     if instance_version not in versions:
diff --git a/pipeline/instance.py b/pipeline/instance.py
index 8a19c2dc..332f275f 100644
--- a/pipeline/instance.py
+++ b/pipeline/instance.py
@@ -109,7 +109,7 @@ def __init__(self, instances_version:str, instances_libraries:Dict):
         self.instances_libraries = instances_libraries
 
     def _target_file_without_extension(self, target_basename:str) -> str:
-        return os.path.join("target", self.version, "docs", "instances_libraries", f"{target_basename}")
+        return os.path.join("target", self.version, "docs", "libraries", f"{target_basename}")
 
     def _build_terminology(self, target_file:str, name:str, data_to_display:Dict):
         with open(f"{target_file}.rst", "w") as output_file:
diff --git a/pipeline/schema.py b/pipeline/schema.py
index ce2b9ff6..a10e901a 100644
--- a/pipeline/schema.py
+++ b/pipeline/schema.py
@@ -17,7 +17,7 @@ def __init__(self, schema_file_path:str, root_path:str, relative_path_by_schema:
             self._schema_payload = json.load(schema_f)
 
     def _target_file_without_extension(self) -> str:
-        return os.path.join(self.version, "docs", "schema_specifications", "/".join(self.relative_path_without_extension))
+        return os.path.join(self.version, "docs", "specifications", "/".join(self.relative_path_without_extension))
 
     def build(self):
         target_file = os.path.join("target", f"{self._target_file_without_extension()}.rst")
@@ -132,7 +132,7 @@ def _define_target_objects(self, object_list) -> str:
             for object in object_list:
                 object_name = object.split('/')[-1]
                 if object_name in self.relative_path_by_schema:
-                    object_html_path = f"{self.readthedocs_url}{self.version}/schema_specifications/{self.relative_path_by_schema[object_name]}.html"
+                    object_html_path = f"{self.readthedocs_url}{self.version}/specifications/{self.relative_path_by_schema[object_name]}.html"
                     object_name_list.append(f"`{object_name} <{object_html_path}>`_")
                 else:
                     object_name_list.append(f"{object_name} \[TYPE_ERROR\]")