rename common_criteria modules to cc

22 files changed, 83 insertions, 80 deletions

diff --git a/README.md b/README.md
index c0a7ab48..cbca110a 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Most probably, you don't want to process fresh snapshot of Common Criteria certi
 In Python, run
 
 ```python
-from sec_certs.dataset.common_criteria import CCDataset
+from sec_certs.dataset import CCDataset
 import pandas as pd
 
 dset = CCDataset.from_web_latest()  # now you can inspect the object, certificates are held in dset.certs
diff --git a/docs/index.md b/docs/index.md
index f9d58fb6..94694910 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -7,7 +7,7 @@ This documentation was anonymized but may still contain occasional links back to
 
 Welcome to the technical documentation of *sec-certs* tool for the data analysis of products certified with Common Criteria or FIPS 140 frameworks. If you're looking for general description of the tool, its use cases and capabilites, we refer you to [sec-certs homepage](https://seccerts.org/). If you are looking for more advanced knowledge, e.g. how to mine your own data, how to extend the tool, and so forth, this is the right place.
 
-There are three main parts of this documentation. *User's guide* describes high-level use of our tool. Driven by this knowledge, you can progress to *Notebook examples* that showcase some of the API that we use in the form of Jupyter notebooks. The documentation also contains some of the modules documented with `autodoc`, see *API reference*. Still, some dark corners of our codebase are not documented. To inspect the code directly, see the [sec_certs](https://github.com/crocs-muni/sec-certs/tree/main/sec_certs) module. If you want, you can run the notebooks as they are stored in the [project repository](https://github.com/crocs-muni/sec-certs/tree/main/notebooks). If you are interested in contributing to our project or in other aspects of our development, you can consult the relevant *GitHub artifacts*
+There are three main parts of this documentation. *User's guide* describes high-level use of our tool. Driven by this knowledge, you can progress to *Notebook examples* that showcase some of the API that we use in the form of Jupyter notebooks. The documentation also contains some of the modules documented with `autodoc`, see *API reference*. Still, some dark corners of our codebase are not documented. To inspect the code directly, see the [sec_certs](https://github.com/crocs-muni/sec-certs/tree/main/src/sec_certs) module. If you want, you can run the notebooks as they are stored in the [project repository](https://github.com/crocs-muni/sec-certs/tree/main/notebooks). If you are interested in contributing to our project or in other aspects of our development, you can consult the relevant *GitHub artifacts*
 
 ```{button-ref} quickstart
 :align: center
diff --git a/notebooks/cc/references.ipynb b/notebooks/cc/references.ipynb
index 81a3f664..ae191431 100644
--- a/notebooks/cc/references.ipynb
+++ b/notebooks/cc/references.ipynb
@@ -32,7 +32,7 @@
     "import matplotlib\n",
     "import matplotlib.pyplot as plt\n",
     "import matplotlib.ticker as mtick\n",
-    "from sec_certs.dataset.common_criteria import CCDataset\n",
+    "from sec_certs.dataset.cc import CCDataset\n",
     "import pandas as pd\n",
     "import seaborn as sns\n",
     "import numpy as np\n",
diff --git a/notebooks/examples/common_criteria.ipynb b/notebooks/examples/common_criteria.ipynb
index 87502302..8adb1656 100644
--- a/notebooks/examples/common_criteria.ipynb
+++ b/notebooks/examples/common_criteria.ipynb
@@ -17,8 +17,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sec_certs.dataset.common_criteria import CCDataset\n",
-    "from sec_certs.dataset.common_criteria import CommonCriteriaCert\n",
+    "from sec_certs.dataset.cc import CCDataset\n",
+    "from sec_certs.sample.cc import CommonCriteriaCert\n",
     "import pandas as pd"
    ]
   },
diff --git a/notebooks/examples/model.ipynb b/notebooks/examples/model.ipynb
index 370b13cd..1714364e 100644
--- a/notebooks/examples/model.ipynb
+++ b/notebooks/examples/model.ipynb
@@ -17,7 +17,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sec_certs.dataset.common_criteria import CCDataset\n",
+    "from sec_certs.dataset import CCDataset\n",
     "from sec_certs.model import SARTransformer"
    ]
   },
@@ -49,11 +49,8 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "6386d1612879d92d026c363e7667e428bc38d86c5a080d58c3d70e7cd43df67d"
-  },
   "kernelspec": {
-   "display_name": "Python 3.8.1 ('certsvenv': venv)",
+   "display_name": "Python 3.8.13 ('venv': venv)",
    "language": "python",
    "name": "python3"
   },
@@ -67,9 +64,14 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.8.13"
   },
-  "orig_nbformat": 4
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "a5b8c5b127d2cfe5bc3a1c933e197485eb9eba25154c3661362401503b4ef9d4"
+   }
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2
diff --git a/src/sec_certs/dataset/__init__.py b/src/sec_certs/dataset/__init__.py
index bace4ddd..d5f93c78 100644
--- a/src/sec_certs/dataset/__init__.py
+++ b/src/sec_certs/dataset/__init__.py
@@ -1,6 +1,6 @@
 """This package exposes Datasets of various Samples, both primary (Common Criteria, FIPS) and auxillary (CVEs, CPEs, ...)"""
 
-from sec_certs.dataset.common_criteria import CCDataset, CCDatasetMaintenanceUpdates
+from sec_certs.dataset.cc import CCDataset, CCDatasetMaintenanceUpdates, CCSchemeDataset
 from sec_certs.dataset.cpe import CPEDataset
 from sec_certs.dataset.cve import CVEDataset
 from sec_certs.dataset.fips import FIPSDataset
@@ -12,6 +12,7 @@ from sec_certs.dataset.protection_profile import ProtectionProfileDataset
 __all__ = [
     "CCDataset",
     "CCDatasetMaintenanceUpdates",
+    "CCSchemeDataset",
     "CPEDataset",
     "CVEDataset",
     "FIPSDataset",
diff --git a/src/sec_certs/dataset/common_criteria.py b/src/sec_certs/dataset/cc.py
index 6b7b4279..148adbb5 100644
--- a/src/sec_certs/dataset/common_criteria.py
+++ b/src/sec_certs/dataset/cc.py
@@ -26,9 +26,9 @@ from sec_certs.dataset.protection_profile import ProtectionProfileDataset
 from sec_certs.model.reference_finder import ReferenceFinder
 from sec_certs.model.sar_transformer import SARTransformer
 from sec_certs.model.transitive_vulnerability_finder import TransitiveVulnerabilityFinder
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.sample.cc_certificate_id import CertificateId
 from sec_certs.sample.cc_maintenance_update import CommonCriteriaMaintenanceUpdate
-from sec_certs.sample.common_criteria import CommonCriteriaCert
 from sec_certs.sample.protection_profile import ProtectionProfile
 from sec_certs.serialization.json import ComplexSerializableType, CustomJSONDecoder, serialize
 from sec_certs.utils import helpers as helpers
diff --git a/src/sec_certs/model/evaluation.py b/src/sec_certs/model/evaluation.py
index dd5eaffd..d464c1b7 100644
--- a/src/sec_certs/model/evaluation.py
+++ b/src/sec_certs/model/evaluation.py
@@ -8,7 +8,7 @@ import numpy as np
 
 import sec_certs.utils.helpers as helpers
 from sec_certs.dataset.cpe import CPEDataset
-from sec_certs.sample.common_criteria import CommonCriteriaCert
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.sample.fips import FIPSCertificate
 from sec_certs.serialization.json import CustomJSONEncoder
 
diff --git a/src/sec_certs/model/sar_transformer.py b/src/sec_certs/model/sar_transformer.py
index a5bcff57..1e05358f 100644
--- a/src/sec_certs/model/sar_transformer.py
+++ b/src/sec_certs/model/sar_transformer.py
@@ -5,7 +5,7 @@ from typing import Dict, Iterable, cast
 
 from sklearn.base import BaseEstimator, TransformerMixin
 
-from sec_certs.sample.common_criteria import CommonCriteriaCert
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.sample.sar import SAR, SAR_DICT_KEY
 
 logger = logging.getLogger(__name__)
diff --git a/src/sec_certs/sample/__init__.py b/src/sec_certs/sample/__init__.py
index ecbbd541..e86c415e 100644
--- a/src/sec_certs/sample/__init__.py
+++ b/src/sec_certs/sample/__init__.py
@@ -2,9 +2,9 @@
 like CPE, CVE, etc. The objects mostly hold data and allow for serialization, but can also perform some basic transformations.
 """
 
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.sample.cc_certificate_id import CertificateId
 from sec_certs.sample.cc_maintenance_update import CommonCriteriaMaintenanceUpdate
-from sec_certs.sample.common_criteria import CommonCriteriaCert
 from sec_certs.sample.cpe import CPE, cached_cpe
 from sec_certs.sample.cve import CVE
 from sec_certs.sample.fips import FIPSCertificate
diff --git a/src/sec_certs/sample/common_criteria.py b/src/sec_certs/sample/cc.py
index acd54178..acd54178 100644
--- a/src/sec_certs/sample/common_criteria.py
+++ b/src/sec_certs/sample/cc.py
diff --git a/src/sec_certs/sample/cc_maintenance_update.py b/src/sec_certs/sample/cc_maintenance_update.py
index abe3b176..2cab2830 100644
--- a/src/sec_certs/sample/cc_maintenance_update.py
+++ b/src/sec_certs/sample/cc_maintenance_update.py
@@ -5,7 +5,7 @@ from datetime import date
 from typing import ClassVar
 
 import sec_certs.utils.helpers as helpers
-from sec_certs.sample.common_criteria import CommonCriteriaCert
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.serialization.json import ComplexSerializableType
 
 logger = logging.getLogger(__name__)
diff --git a/tests/cc/test_cc_analysis.py b/tests/cc/test_cc_analysis.py
index 98318789..08cd91e1 100644
--- a/tests/cc/test_cc_analysis.py
+++ b/tests/cc/test_cc_analysis.py
@@ -10,7 +10,7 @@ from sec_certs.cert_rules import SARS_IMPLIED_FROM_EAL
 from sec_certs.dataset import CCDataset
 from sec_certs.dataset.cpe import CPEDataset
 from sec_certs.dataset.cve import CVEDataset
-from sec_certs.sample.common_criteria import CommonCriteriaCert
+from sec_certs.sample.cc import CommonCriteriaCert
 from sec_certs.sample.cpe import CPE
 from sec_certs.sample.cve import CVE
 from sec_certs.sample.protection_profile import ProtectionProfile
diff --git a/tests/cc/test_cc_dataset.py b/tests/cc/test_cc_dataset.py
index 8247b4cb..0355143b 100644
--- a/tests/cc/test_cc_dataset.py
+++ b/tests/cc/test_cc_dataset.py
@@ -9,7 +9,7 @@ import pytest
 import tests.data.cc.dataset
 from sec_certs import constants
 from sec_certs.dataset import CCDataset
-from sec_certs.sample.common_criteria import CommonCriteriaCert
+from sec_certs.sample.cc import CommonCriteriaCert
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/cc/test_cc_schemes.py b/tests/cc/test_cc_schemes.py
index a65a0883..078a3190 100644
--- a/tests/cc/test_cc_schemes.py
+++ b/tests/cc/test_cc_schemes.py
@@ -1,6 +1,6 @@
 import pytest
 
-from sec_certs.dataset.common_criteria import CCSchemeDataset
+from sec_certs.dataset import CCSchemeDataset
 
 
 @pytest.mark.xfail(reason="May fail due to server errors.")
diff --git a/tests/data/cc/analysis/cc_full_dataset.json b/tests/data/cc/analysis/cc_full_dataset.json
index 6b03af43..a7b3c834 100644
--- a/tests/data/cc/analysis/cc_full_dataset.json
+++ b/tests/data/cc/analysis/cc_full_dataset.json
@@ -1,5 +1,5 @@
 {
-    "_type": "sec_certs.dataset.common_criteria.CCDataset",
+    "_type": "sec_certs.dataset.cc.CCDataset",
     "state": {
         "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
         "meta_sources_parsed": true,
@@ -15,7 +15,7 @@
     "n_certs": 1,
     "certs": [
         {
-            "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+            "_type": "sec_certs.sample.cc.CommonCriteriaCert",
             "dgst": "ebd276cca70fd723",
             "status": "active",
             "category": "Access Control Devices and Systems",
@@ -54,7 +54,7 @@
                 "elements": []
             },
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": true,
                 "report_download_ok": true,
                 "st_convert_garbage": false,
@@ -69,7 +69,7 @@
                 "report_txt_hash": "35627594d3806ac3926ec47f466503fe27781533da12beb6f8705882fccf125e"
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": {
                     "pdf_file_size_bytes": 1174271,
                     "pdf_is_encrypted": false,
@@ -512,7 +512,7 @@
                 "st_filename": "0683b_pdf.pdf"
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": {
                     "_type": "Set",
                     "elements": [
diff --git a/tests/data/cc/analysis/reference_dataset.json b/tests/data/cc/analysis/reference_dataset.json
index b5465d87..d05826a3 100644
--- a/tests/data/cc/analysis/reference_dataset.json
+++ b/tests/data/cc/analysis/reference_dataset.json
@@ -1,5 +1,5 @@
 {
-  "_type": "sec_certs.dataset.common_criteria.CCDataset",
+  "_type": "sec_certs.dataset.cc.CCDataset",
   "state": {
     "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
     "meta_sources_parsed": false,
@@ -14,7 +14,7 @@
   "n_certs": 3,
   "certs": [
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "c30de3192d2e8ec2",
       "status": "archived",
       "category": "Other Devices and Systems",
@@ -43,7 +43,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -56,7 +56,7 @@
         "report_txt_hash": "460e8010dbc8f5de5b87bf96fd45c71cfd9f3869f34ca6ac1ab02cbd70d2523f"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 393439,
           "pdf_is_encrypted": false,
@@ -468,7 +468,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
@@ -573,7 +573,7 @@
       }
     },
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "53fe111411edfa45",
       "status": "archived",
       "category": "Other Devices and Systems",
@@ -602,7 +602,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -615,7 +615,7 @@
         "report_txt_hash": "0535df1c56fb4f87153cbffee51ba4d77fac47a6f17f024aa7d9df461028bc65"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 296713,
           "pdf_is_encrypted": false,
@@ -1056,7 +1056,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
@@ -1210,7 +1210,7 @@
       }
     },
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "692e91451741ef49",
       "status": "archived",
       "category": "Other Devices and Systems",
@@ -1239,7 +1239,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -1252,7 +1252,7 @@
         "report_txt_hash": "11e1262fd8f5df1b140f5e8813883b71447503781399427b35adbbecd00b4d63"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 628533,
           "pdf_is_encrypted": false,
@@ -1687,7 +1687,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
diff --git a/tests/data/cc/analysis/transitive_vulnerability_dataset.json b/tests/data/cc/analysis/transitive_vulnerability_dataset.json
index a2f89a6c..bd20bf90 100644
--- a/tests/data/cc/analysis/transitive_vulnerability_dataset.json
+++ b/tests/data/cc/analysis/transitive_vulnerability_dataset.json
@@ -1,5 +1,5 @@
 {
-  "_type": "sec_certs.dataset.common_criteria.CCDataset",
+  "_type": "sec_certs.dataset.cc.CCDataset",
   "state": {
     "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
     "meta_sources_parsed": false,
@@ -14,7 +14,7 @@
   "n_certs": 3,
   "certs": [
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "d0705c9e6fbaeba3",
       "status": "active",
       "category": "Operating Systems",
@@ -53,7 +53,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -66,7 +66,7 @@
         "report_txt_hash": "9d360141a98e764b15855f519b456c4e4639f993c4f8b5ab67e9c8ae7fbfc9e4"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 1235750,
           "pdf_is_encrypted": false,
@@ -1061,7 +1061,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
@@ -1329,7 +1329,7 @@
       }
     },
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "011796336c7b94de",
       "status": "archived",
       "category": "Operating Systems",
@@ -1358,7 +1358,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -1371,7 +1371,7 @@
         "report_txt_hash": "dd120ba7667c2385839c96ee70c56f2a4d464fc95e3ea2818d31b3347d06fd4f"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 1178202,
           "pdf_is_encrypted": false,
@@ -2014,7 +2014,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
@@ -2269,7 +2269,7 @@
       }
     },
     {
-      "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+      "_type": "sec_certs.sample.cc.CommonCriteriaCert",
       "dgst": "ebc77980250ee68f",
       "status": "active",
       "category": "Operating Systems",
@@ -2308,7 +2308,7 @@
         "elements": []
       },
       "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": true,
         "report_download_ok": true,
         "st_convert_ok": true,
@@ -2321,7 +2321,7 @@
         "report_txt_hash": "0a7c65e3d11f082c8f75aba7de0079c0b1aa5e67bb28d4635cbcaa4cd200d1c2"
       },
       "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": {
           "pdf_file_size_bytes": 1932018,
           "pdf_is_encrypted": false,
@@ -3380,7 +3380,7 @@
         }
       },
       "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": {
           "_type": "Set",
           "elements": [
diff --git a/tests/data/cc/analysis/vulnerable_dataset.json b/tests/data/cc/analysis/vulnerable_dataset.json
index 71ce27e2..5fe3dee6 100644
--- a/tests/data/cc/analysis/vulnerable_dataset.json
+++ b/tests/data/cc/analysis/vulnerable_dataset.json
@@ -1,5 +1,5 @@
 {
-    "_type": "sec_certs.dataset.common_criteria.CCDataset",
+    "_type": "sec_certs.dataset.cc.CCDataset",
     "state": {
         "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
         "meta_sources_parsed": true,
@@ -15,7 +15,7 @@
     "n_certs": 1,
     "certs": [
         {
-            "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+            "_type": "sec_certs.sample.cc.CommonCriteriaCert",
             "dgst": "ebd276cca70fd723",
             "status": "active",
             "category": "Access Control Devices and Systems",
@@ -38,7 +38,7 @@
             "protection_profiles": [],
             "maintenance_updates": [],
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": true,
                 "report_download_ok": true,
                 "st_convert_ok": true,
@@ -47,7 +47,7 @@
                 "report_extract_ok": true
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": null,
                 "st_metadata": null,
                 "report_frontpage": null,
@@ -58,7 +58,7 @@
                 "st_filename": null
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": [
                     "8.2"
                 ],
diff --git a/tests/data/cc/certificate/fictional_cert.json b/tests/data/cc/certificate/fictional_cert.json
index da82d70c..32e78b32 100644
--- a/tests/data/cc/certificate/fictional_cert.json
+++ b/tests/data/cc/certificate/fictional_cert.json
@@ -1,5 +1,5 @@
 {
-    "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+    "_type": "sec_certs.sample.cc.CommonCriteriaCert",
     "dgst": "a9ccb81a92e547dc",
     "status": "archived",
     "category": "Sample category",
@@ -31,7 +31,7 @@
         "_type": "Set",
         "elements": [
             {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.MaintenanceReport",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.MaintenanceReport",
                 "maintenance_date": "1900-01-01",
                 "maintenance_title": "Sample maintenance",
                 "maintenance_report_link": "https://maintenance.up",
@@ -40,7 +40,7 @@
         ]
     },
     "state": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
         "st_download_ok": false,
         "report_download_ok": false,
         "st_convert_garbage": false,
@@ -55,7 +55,7 @@
         "report_txt_hash": null
     },
     "pdf_data": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
         "report_metadata": null,
         "st_metadata": null,
         "report_frontpage": null,
@@ -66,7 +66,7 @@
         "st_filename": null
     },
     "heuristics": {
-        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+        "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
         "extracted_versions": null,
         "cpe_matches": null,
         "verified_cpe_matches": null,
diff --git a/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json b/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
index a2e3f7df..ed72b631 100644
--- a/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
+++ b/tests/data/cc/dataset/auxillary_datasets/maintenances/maintenance_updates.json
@@ -1,5 +1,5 @@
 {
-    "_type": "sec_certs.dataset.common_criteria.CCDatasetMaintenanceUpdates",
+    "_type": "sec_certs.dataset.cc.CCDatasetMaintenanceUpdates",
     "state": {
         "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
         "meta_sources_parsed": true,
@@ -21,7 +21,7 @@
             "report_link": "https://www.commoncriteriaportal.org/files/epfiles/383-7-159%20MR%20v1.0e.pdf",
             "st_link": "https://www.commoncriteriaportal.org/files/epfiles/383-7-159%20ST%20v1.4%20CCRA.pdf",
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": true,
                 "report_download_ok": true,
                 "st_convert_garbage": false,
@@ -36,7 +36,7 @@
                 "report_txt_hash": null
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": null,
                 "st_metadata": null,
                 "report_frontpage": null,
@@ -47,7 +47,7 @@
                 "st_filename": "383-7-159 ST v1.4 CCRA.pdf"
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": null,
                 "cpe_matches": null,
                 "verified_cpe_matches": null,
diff --git a/tests/data/cc/dataset/toy_dataset.json b/tests/data/cc/dataset/toy_dataset.json
index 110d578a..42531e2c 100644
--- a/tests/data/cc/dataset/toy_dataset.json
+++ b/tests/data/cc/dataset/toy_dataset.json
@@ -1,5 +1,5 @@
 {
-    "_type": "sec_certs.dataset.common_criteria.CCDataset",
+    "_type": "sec_certs.dataset.cc.CCDataset",
     "state": {
         "_type": "sec_certs.dataset.dataset.Dataset.DatasetInternalState",
         "meta_sources_parsed": true,
@@ -15,7 +15,7 @@
     "n_certs": 3,
     "certs": [
         {
-            "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+            "_type": "sec_certs.sample.cc.CommonCriteriaCert",
             "dgst": "309ac2fd7f2dcf17",
             "status": "active",
             "category": "Access Control Devices and Systems",
@@ -44,7 +44,7 @@
                 "elements": []
             },
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": false,
                 "report_download_ok": false,
                 "st_convert_garbage": false,
@@ -59,7 +59,7 @@
                 "report_txt_hash": null
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": null,
                 "st_metadata": null,
                 "report_frontpage": null,
@@ -70,7 +70,7 @@
                 "st_filename": null
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": null,
                 "cpe_matches": null,
                 "verified_cpe_matches": null,
@@ -97,7 +97,7 @@
             }
         },
         {
-            "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+            "_type": "sec_certs.sample.cc.CommonCriteriaCert",
             "dgst": "8cf86948f02f047d",
             "status": "active",
             "category": "Access Control Devices and Systems",
@@ -131,7 +131,7 @@
                 "elements": []
             },
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": false,
                 "report_download_ok": false,
                 "st_convert_garbage": false,
@@ -146,7 +146,7 @@
                 "report_txt_hash": null
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": null,
                 "st_metadata": null,
                 "report_frontpage": null,
@@ -157,7 +157,7 @@
                 "st_filename": null
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": null,
                 "cpe_matches": null,
                 "verified_cpe_matches": null,
@@ -184,7 +184,7 @@
             }
         },
         {
-            "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert",
+            "_type": "sec_certs.sample.cc.CommonCriteriaCert",
             "dgst": "8a5e6bcda602920c",
             "status": "active",
             "category": "Boundary Protection Devices and Systems",
@@ -217,7 +217,7 @@
                 "_type": "Set",
                 "elements": [
                     {
-                        "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.MaintenanceReport",
+                        "_type": "sec_certs.sample.cc.CommonCriteriaCert.MaintenanceReport",
                         "maintenance_date": "2019-08-26",
                         "maintenance_title": "Fortinet FortiGate w/ FortiOS v5.6.7 Build 6022",
                         "maintenance_report_link": "https://www.commoncriteriaportal.org/files/epfiles/383-7-159%20MR%20v1.0e.pdf",
@@ -226,7 +226,7 @@
                 ]
             },
             "state": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.InternalState",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.InternalState",
                 "st_download_ok": false,
                 "report_download_ok": false,
                 "st_convert_garbage": false,
@@ -241,7 +241,7 @@
                 "report_txt_hash": null
             },
             "pdf_data": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.PdfData",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.PdfData",
                 "report_metadata": null,
                 "st_metadata": null,
                 "report_frontpage": null,
@@ -252,7 +252,7 @@
                 "st_filename": null
             },
             "heuristics": {
-                "_type": "sec_certs.sample.common_criteria.CommonCriteriaCert.Heuristics",
+                "_type": "sec_certs.sample.cc.CommonCriteriaCert.Heuristics",
                 "extracted_versions": null,
                 "cpe_matches": null,
                 "verified_cpe_matches": null,