diff --git a/examples/CC_ISO15408/PikeOS_study/PikeOS_ST.thy b/examples/CC_ISO15408/PikeOS_study/PikeOS_ST.thy
index 25e6926..faff989 100644
--- a/examples/CC_ISO15408/PikeOS_study/PikeOS_ST.thy
+++ b/examples/CC_ISO15408/PikeOS_study/PikeOS_ST.thy
@@ -1,7 +1,7 @@
 theory PikeOS_ST (*Security Target *)
 
-imports "../../../src/ontologies/CC_ISO15408/CommonCriteria_15408"
-(*  Isabelle_DOF.CommonCriteria_15408  *)
+imports "../../../src/ontologies/CC_v3.1_R5/CC_v3_1_R5"
+        (*  Isabelle_DOF.CommonCriteria_15408  *)
 
 begin 
 
@@ -29,7 +29,7 @@ text*[pkostoeref::toe_ref_cls, dev_name="''''", toe_name="''PikeOS''",
    Certification Kit build S4250 and PikeOS 3.4 Common Criteria Kit build S4388.\<close>
 
 subsection*[pkossttoeovrvwsubsec::st_ref_cls]\<open> TOE Overview \<close>
-text*[pkosovrw1::toe_ovrw_cls]\<open>he TOE is a special kind of operating system, 
+text*[pkosovrw1::toe_ovrw_cls]\<open>The @{definition TOE} is a special kind of operating system, 
 that allows to effectively separate
 different applications running on the same platform from each other. The TOE can host
 user applications that can also be operating systems. User applications can also be
@@ -48,10 +48,9 @@ The major security services provided by the TOE are:
 Separation in space of applications hosted in different partitions from each other
 and from the PikeOS operating system according to the configuration data by
 Page 3 of 44using the underlying hardware,
-2086
- Separation in time of applications hosted in different partitions from each other
+2086 Separation in time of applications hosted in different partitions from each other
 and from the PikeOS operating system according to the configuration data,
- Provision and management of communication objects,
+   Provision and management of communication objects,
  Management of and access to the TOE and TOE data,
  PikeOS operating system self-protection and accuracy of security functionality,
  Generation and treatment of audit data according to the configuration data.\<close>
diff --git a/src/ontologies/CC_ISO15408/CC_terminology.thy b/src/ontologies/CC_v3.1_R5/CC_terminology.thy
similarity index 100%
rename from src/ontologies/CC_ISO15408/CC_terminology.thy
rename to src/ontologies/CC_v3.1_R5/CC_terminology.thy
diff --git a/src/ontologies/CC_ISO15408/CommonCriteria_15408.thy b/src/ontologies/CC_v3.1_R5/CC_v3_1_R5.thy
similarity index 99%
rename from src/ontologies/CC_ISO15408/CommonCriteria_15408.thy
rename to src/ontologies/CC_v3.1_R5/CC_v3_1_R5.thy
index 53e0e34..55e5a8c 100644
--- a/src/ontologies/CC_ISO15408/CommonCriteria_15408.thy
+++ b/src/ontologies/CC_v3.1_R5/CC_v3_1_R5.thy
@@ -13,7 +13,7 @@
  *   SPDX-License-Identifier: BSD-2-Clause
  *************************************************************************)
 
-theory  CommonCriteria_15408
+theory  "CC_v3_1_R5"
   imports  "../technical_report/technical_report" 
            "CC_terminology"
 
diff --git a/src/ontologies/CC_ISO15408/README b/src/ontologies/CC_v3.1_R5/README
similarity index 100%
rename from src/ontologies/CC_ISO15408/README
rename to src/ontologies/CC_v3.1_R5/README