diff --git a/structured/entity/id.qmd b/structured/entity/id.qmd
index 46c8043..9bcd903 100644
--- a/structured/entity/id.qmd
+++ b/structured/entity/id.qmd
@@ -1,14 +1,11 @@
 ---
 title: "Entity ID"
 code-tools: true
-old-name: "pk_record"
+old-name: "sto_fk_target_other_entity"
 name: "entity_id"
 entity:
   name: id
   old-name: pk_record
-innovation_entity:
-  name: entity_id
-  old-name: sto_fk_target_other_entity
 sort-order: 1
 description: "Unique, stable identifier for the entity."
 ---
diff --git a/structured/innovation/Developed_in_collaboration_with_other_actors.qmd b/structured/innovation/in_collaboration.qmd
similarity index 92%
rename from structured/innovation/Developed_in_collaboration_with_other_actors.qmd
rename to structured/innovation/in_collaboration.qmd
index 7802e9b..49bc28b 100644
--- a/structured/innovation/Developed_in_collaboration_with_other_actors.qmd
+++ b/structured/innovation/in_collaboration.qmd
@@ -2,7 +2,7 @@
 title: "Developed_in_collaboration_with_other_actors"
 code-tools: true
 old-name: development_involved_collaboration_with_others
-name: collaboratoin
+name: collaboration
 sort-order: 41
 description: "Has the development of the innovation included collaboration with others"
 ---
diff --git a/structured/innovation/patent_assigned_to_person.qmd b/structured/innovation/patent_assigned_to_person.qmd
deleted file mode 100644
index 720a03e..0000000
--- a/structured/innovation/patent_assigned_to_person.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_assigned_to_person"
-code-tools: true
-old-name: "patent_assigned_to_person"
-name: "pat_assig_pers"
-sort-order: 24
-description: "The name of the person that the patent is assigned to."
----
diff --git a/structured/innovation/patent_granted_by_EPO.qmd b/structured/innovation/patent_granted_by_EPO.qmd
deleted file mode 100644
index bd11bcd..0000000
--- a/structured/innovation/patent_granted_by_EPO.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_granted_by_EPO"
-code-tools: true
-old-name: "patent_granted_by_EPO"
-name: "pat_epo"
-sort-order: 27
-description: "At least one patent has been granted by EPO."
----
diff --git a/structured/innovation/patent_granted_by_JPO.qmd b/structured/innovation/patent_granted_by_JPO.qmd
deleted file mode 100644
index 8b0b123..0000000
--- a/structured/innovation/patent_granted_by_JPO.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_granted_by_JPO"
-code-tools: true
-old-name: "patent_granted_by_JPO"
-name: "pat_jpo"
-sort-order: 29
-description: "At least one patent has been granted by JPO."
----
diff --git a/structured/innovation/patent_granted_by_USPTO.qmd b/structured/innovation/patent_granted_by_USPTO.qmd
deleted file mode 100644
index fe825e9..0000000
--- a/structured/innovation/patent_granted_by_USPTO.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_granted_by_USPTO"
-code-tools: true
-old-name: "patent_granted_by_USPTO"
-name: "pat_uspto"
-sort-order: 28
-description: "At least one patent has been granted by USPTO."
----
diff --git a/structured/innovation/patent_granted_by_other_office.qmd b/structured/innovation/patent_granted_by_other_office.qmd
deleted file mode 100644
index 80253ec..0000000
--- a/structured/innovation/patent_granted_by_other_office.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_granted_by_other_office"
-code-tools: true
-old-name: "patent_granted_by_other_office"
-name: "pat_other"
-sort-order: 30
-description: "At least one patent has been granted by another patent office."
----
diff --git a/structured/innovation/patent_granted_in_sweden.qmd b/structured/innovation/patent_granted_in_sweden.qmd
deleted file mode 100644
index 1c20bf8..0000000
--- a/structured/innovation/patent_granted_in_sweden.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "patent_granted_in_sweden"
-code-tools: true
-old-name: "patent_granted_in_sweden"
-name: "pat_swe"
-sort-order: 26
-description: "At least one patent has been granted by the Swedish patent office."
----
diff --git a/structured/innovation/patented.qmd b/structured/innovation/patented.qmd
new file mode 100644
index 0000000..446eaab
--- /dev/null
+++ b/structured/innovation/patented.qmd
@@ -0,0 +1,8 @@
+---
+title: "Patented"
+code-tools: true
+old-name: None
+name: "patented"
+sort-order: 25
+description: "The number of identified patents of the innovation."
+---
diff --git a/structured/innovation/person_applying_for_patent.qmd b/structured/innovation/person_applying_for_patent.qmd
deleted file mode 100644
index ae5eb3f..0000000
--- a/structured/innovation/person_applying_for_patent.qmd
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "person_applying_for_patent"
-code-tools: true
-old-name: "person_applying_for_patent"
-name: "pat_pers_applying"
-sort-order: 23
-description: "The name of the person applying for the patent."
----
diff --git a/structured/use_sector/sector.qmd b/structured/use_sector/sector.qmd
index 0d1c170..6ec498d 100644
--- a/structured/use_sector/sector.qmd
+++ b/structured/use_sector/sector.qmd
@@ -1,7 +1,7 @@
 ---
 title: "Use_sectors"
 code-tools: true
-old-name: Null
+old-name: "use_sector_*"
 name: use_sector
 sort-order: 0
 description: "User sector of the innovation according to  Svensk Näringslivsindelning SNI 2002, with a few custom codes."