diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 38b4d6a7..5d3ef2d2 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -2,19 +2,20 @@
 <!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD Suppressions 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-  <!-- global suppressions -->
-  <suppress checks="AvoidStarImport" files="\.java" />
+    <!-- global suppressions -->
+    <suppress checks="AvoidStarImport" files="\.java" />
 
-  <!-- core suppressions -->
-  <suppress checks="AbbreviationAsWordInName" files="UID\.java" />
+    <!-- core suppressions -->
+    <suppress checks="AbbreviationAsWordInName" files="UID\.java" />
 
-  <!-- examples suppressions -->
-  <suppress checks="LineLength" files="ExampleDataObjects.java|ExampleRdl.java|ExampleAssociations.java|MagmaCoreService.java" />
-  <suppress checks="MethodLength" files="ExampleDataObjects.java" />
+    <!-- examples suppressions -->
+    <suppress checks="LineLength"
+        files="ClassServices.java|ExampleDataObjects.java|ExampleRdl.java|ExampleAssociations.java|MagmaCoreService.java" />
+    <suppress checks="MethodLength" files="ExampleDataObjects.java" />
 
-  <!-- hqdm-core suppressions -->
-  <suppress checks="MethodName" files="impl/*" />
-  <suppress checks="TypeName" files="Function_.java" />
-  <suppress checks="ConstantName" files="HQDM.java" />
-  <suppress checks="AbbreviationAsWordInName" files="IRI.java|HQDM.java|RDFS.java|UID.java" />
-</suppressions>
+    <!-- hqdm-core suppressions -->
+    <suppress checks="MethodName" files="impl/*" />
+    <suppress checks="TypeName" files="Function_.java" />
+    <suppress checks="ConstantName" files="HQDM.java" />
+    <suppress checks="AbbreviationAsWordInName" files="IRI.java|HQDM.java|RDFS.java|UID.java" />
+</suppressions>
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index c9a47391..69bee63f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>uk.gov.gchq.magma-core</groupId>
@@ -21,16 +23,16 @@
   <dependencies>
     <dependency>
       <groupId>uk.gov.gchq.magma-core</groupId>
-      <artifactId>hqdm-canonical</artifactId>
+      <artifactId>core</artifactId>
     </dependency>
     <dependency>
       <groupId>uk.gov.gchq.magma-core</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>hqdm-canonical</artifactId>
     </dependency>
     <dependency>
       <groupId>uk.gov.gchq.magma-core</groupId>
       <artifactId>model-extension-example</artifactId>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -40,4 +42,4 @@
       <artifactId>slf4j-jdk14</artifactId>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/examples/src/test/java/uk/gov/gchq/magmacore/examples/kinds/CreateOrganizationSubTypeUsingKinds.java b/examples/src/test/java/uk/gov/gchq/magmacore/examples/kinds/CreateOrganizationSubTypeUsingKinds.java
index cc9923f3..dd8907ee 100644
--- a/examples/src/test/java/uk/gov/gchq/magmacore/examples/kinds/CreateOrganizationSubTypeUsingKinds.java
+++ b/examples/src/test/java/uk/gov/gchq/magmacore/examples/kinds/CreateOrganizationSubTypeUsingKinds.java
@@ -22,8 +22,8 @@
 import uk.gov.gchq.magmacore.service.MagmaCoreServiceFactory;
 
 /**
- * Create a KindOfOrganization and make a Thing a member_of_kind of it,
- * then persist the Thing and make sure it is read back as an Organization.
+ * Create a KindOfOrganization and make a Thing a member_of_kind of it, then persist the Thing and
+ * make sure it is read back as an Organization.
  *
  * <p>
  * This demonstrates the implementation of instances of 'kinds' as new entity types.
@@ -34,7 +34,7 @@ public class CreateOrganizationSubTypeUsingKinds {
      * A Base URL for the tests.
      */
     private static IriBase TEST_BASE = new IriBase("test", "http://example.com/test#");
-    
+
     /**
      * Unit test.
      */
@@ -45,20 +45,20 @@ public void test() {
 
         // We need a kind of organization component for the kind of organization.
         final KindOfOrganizationComponent componentKind = new KindOfOrganizationComponentBuilder(randomIri())
-            .build();
+                .build();
 
         // Create a new kind of organization to represent companies.
         // This will also make the new kind into a sub-type of organization.
         final KindOfOrganization companies = new KindOfOrganizationBuilder(randomIri())
-            .has_Component_By_Class_M(componentKind)
-            .build(); 
+                .has_Component_By_Class_M(componentKind)
+                .build();
 
         // Create an Individual and make it a member_of_kind of the companies kind.
-        // This will also mean that the individual is  of type organization, via its kind.
+        // This will also mean that the individual is of type organization, via its kind.
         final Individual acmeLtd = new IndividualBuilder(randomIri())
-            .member_Of_Kind(companies)
-            .part_Of_Possible_World_M(possibleWorld)
-            .build();
+                .member_Of_Kind(companies)
+                .part_Of_Possible_World_M(possibleWorld)
+                .build();
 
         // Persist everything.
         final MagmaCoreService service = MagmaCoreServiceFactory.createWithJenaDatabase();
@@ -81,7 +81,7 @@ public void test() {
      *
      * @return IRI
      */
-    private static  IRI randomIri() {
+    private static IRI randomIri() {
         return new IRI(TEST_BASE, UUID.randomUUID().toString());
     }
 }
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java
index 21e55c07..2eadb79b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferBuilder.java
@@ -247,8 +247,7 @@ public final AcceptanceOfOfferBuilder part_Of_M(final AgreeContract agreeContrac
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -260,13 +259,12 @@ public final AcceptanceOfOfferBuilder part_Of_(final AgreementExecution agreemen
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -279,8 +277,8 @@ public final AcceptanceOfOfferBuilder part_Of_Possible_World_M(final PossibleWor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#REFERENCES} relationship type where an
-     * {@link AcceptanceOfOffer} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#REFERENCES} exactly
-     * one {@link Offer} that is accepted.
+     * {@link AcceptanceOfOffer} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#REFERENCES} exactly one
+     * {@link Offer} that is accepted.
      *
      * @param offer The Offer.
      * @return Builder
@@ -306,16 +304,15 @@ public final AcceptanceOfOfferBuilder temporal__Part_Of(final SpatioTemporalExte
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java
index 060e07d4..fa410357 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AcceptanceOfOfferForGoodsBuilder.java
@@ -229,9 +229,8 @@ public final AcceptanceOfOfferForGoodsBuilder part__Of(final SpatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where an
-     * {@link AcceptanceOfOfferForGoods} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly one
-     * {@link OfferAndAcceptanceForGoods}.
+     * {@link AcceptanceOfOfferForGoods} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
+     * exactly one {@link OfferAndAcceptanceForGoods}.
      *
      * @param offerAndAcceptanceForGoods The OfferAndAcceptanceForGoods.
      * @return This builder.
@@ -245,8 +244,7 @@ public final AcceptanceOfOfferForGoodsBuilder part_Of_M(
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -258,13 +256,12 @@ public final AcceptanceOfOfferForGoodsBuilder part_Of_(final AgreementExecution
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -303,16 +300,15 @@ public final AcceptanceOfOfferForGoodsBuilder temporal__Part_Of(final SpatioTemp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java
index be0dbf34..e139913c 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ActivityBuilder.java
@@ -180,8 +180,8 @@ public final ActivityBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link Activity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link ClassOfActivity}.
+     * {@link Activity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link ClassOfActivity}.
      *
      * @param classOfActivity The ClassOfActivity.
      * @return This builder.
@@ -233,13 +233,12 @@ public final ActivityBuilder part_Of(final Activity activity) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -277,16 +276,15 @@ public final ActivityBuilder temporal__Part_Of(final SpatioTemporalExtent spatio
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java
index 442a9b37..697e0028 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreeContractBuilder.java
@@ -200,8 +200,8 @@ public final AgreeContractBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link AgreeContract} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfAgreeContract}.
+     * {@link AgreeContract} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfAgreeContract}.
      *
      * @param classOfAgreeContract The ClassOfAgreeContract.
      * @return Builder
@@ -254,8 +254,7 @@ public final AgreeContractBuilder part_Of_M(final ContractProcess contractProces
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -267,13 +266,12 @@ public final AgreeContractBuilder part_Of_(final AgreementExecution agreementExe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -312,16 +310,15 @@ public final AgreeContractBuilder temporal__Part_Of(final SpatioTemporalExtent s
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java
index 74d984e0..d413f08d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementExecutionBuilder.java
@@ -184,8 +184,8 @@ public final AgreementExecutionBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link AgreementExecution} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfAgreementExecution}.
+     * {@link AgreementExecution} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
@@ -224,8 +224,8 @@ public final AgreementExecutionBuilder part__Of(final SpatioTemporalExtent spati
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where an
-     * {@link AgreementExecution} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly
-     * one {@link AgreementProcess}.
+     * {@link AgreementExecution} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly one
+     * {@link AgreementProcess}.
      *
      * @param agreementProcess The AgreementProcess.
      * @return This builder.
@@ -238,8 +238,7 @@ public final AgreementExecutionBuilder part_Of_M(final AgreementProcess agreemen
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -251,13 +250,12 @@ public final AgreementExecutionBuilder part_Of_(final AgreementExecution agreeme
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -295,16 +293,15 @@ public final AgreementExecutionBuilder temporal__Part_Of(final SpatioTemporalExt
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java
index 66c78f88..a4606f54 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AgreementProcessBuilder.java
@@ -197,8 +197,8 @@ public final AgreementProcessBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link AgreementProcess} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfAgreementProcess}.
+     * {@link AgreementProcess} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfAgreementProcess}.
      *
      * @param classOfAgreementProcess The ClassOfAgreementProcess.
      * @return Builder
@@ -238,8 +238,7 @@ public final AgreementProcessBuilder part__Of(final SpatioTemporalExtent spatioT
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedActivity} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link ReachingAgreement}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link ReachingAgreement}.
      *
      * @param reachingAgreement The ReachingAgreement.
      * @return This builder.
@@ -252,8 +251,7 @@ public final AgreementProcessBuilder part_Of(final ReachingAgreement reachingAgr
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -265,13 +263,12 @@ public final AgreementProcessBuilder part_Of_(final AgreementExecution agreement
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -310,16 +307,15 @@ public final AgreementProcessBuilder temporal__Part_Of(final SpatioTemporalExten
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java
index ad124f07..58c21e84 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AmountOfMoneyBuilder.java
@@ -125,8 +125,8 @@ public final AmountOfMoneyBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link AmountOfMoney} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfAmountOfMoney}.
+     * {@link AmountOfMoney} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfAmountOfMoney}.
      *
      * @param classOfAmountOfMoney The ClassOfAmountOfMoney.
      * @return This builder.
@@ -138,8 +138,8 @@ public final AmountOfMoneyBuilder member_Of(final ClassOfAmountOfMoney classOfAm
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link AmountOfMoney} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * exactly one {@link Currency}.
+     * {@link AmountOfMoney} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} exactly
+     * one {@link Currency}.
      *
      * @param currency The Currency.
      * @return This builder.
@@ -180,13 +180,12 @@ public final AmountOfMoneyBuilder part__Of(final SpatioTemporalExtent spatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java
index 6c451378..36f6be0b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssetBuilder.java
@@ -127,8 +127,7 @@ public final AssetBuilder member__Of(final Class clazz) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Participant} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfParticipant}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link ClassOfParticipant}.
      *
      * @param classOfParticipant The ClassOfParticipant.
      * @return This builder.
@@ -167,13 +166,12 @@ public final AssetBuilder part__Of(final SpatioTemporalExtent spatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -185,8 +183,8 @@ public final AssetBuilder part_Of_Possible_World_M(final PossibleWorld possibleW
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an
-     * asset is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an asset
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
      * {@link Ownership}.
      *
      * @param ownership The Ownership.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java
index 54c9b9cd..80fcbb9a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/AssociationBuilder.java
@@ -151,8 +151,8 @@ public final AssociationBuilder member_Of(final ClassOfAssociation classOfAssoci
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where each
-     * {@link Association} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link KindOfAssociation}.
+     * {@link Association} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link KindOfAssociation}.
      *
      * @param kindOfAssociation The KindOfAssociation.
      * @return This builder.
@@ -178,13 +178,12 @@ public final AssociationBuilder part__Of(final SpatioTemporalExtent spatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -211,16 +210,15 @@ public final AssociationBuilder temporal__Part_Of(final SpatioTemporalExtent spa
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java
index 19f5fb78..88cdd492 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BeginningOfOwnershipBuilder.java
@@ -145,13 +145,12 @@ public final BeginningOfOwnershipBuilder part__Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java
index e1e95fa7..140e9d0a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalObjectBuilder.java
@@ -123,8 +123,8 @@ public final BiologicalObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfBiologicalObject}.
+     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfBiologicalObject}.
      *
      * @param classOfBiologicalObject The ClassOfBiologicalObject.
      * @return This builder.
@@ -136,8 +136,8 @@ public final BiologicalObjectBuilder member_Of(final ClassOfBiologicalObject cla
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link KindOfBiologicalObject}.
+     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link KindOfBiologicalObject}.
      *
      * @param kindOfBiologicalObject The KindOfBiologicalObject.
      * @return This builder.
@@ -163,13 +163,12 @@ public final BiologicalObjectBuilder part__Of(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java
index 01396cba..8cf31c8f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemBuilder.java
@@ -126,8 +126,8 @@ public final BiologicalSystemBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link BiologicalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfBiologicalSystem}.
+     * {@link BiologicalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfBiologicalSystem}.
      *
      * @param classOfBiologicalSystem The ClassOfBiologicalSystem.
      * @return Builder
@@ -139,8 +139,8 @@ public final BiologicalSystemBuilder member_Of(final ClassOfBiologicalSystem cla
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where a
-     * {@link BiologicalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link KindOfBiologicalSystem}.
+     * {@link BiologicalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link KindOfBiologicalSystem}.
      *
      * @param kindOfBiologicalSystem The KindOfBiologicalSystem.
      * @return Builder
@@ -178,13 +178,12 @@ public final BiologicalSystemBuilder part__Of(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java
index 3749b43f..917b1a2b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/BiologicalSystemComponentBuilder.java
@@ -156,8 +156,8 @@ public final BiologicalSystemComponentBuilder member_Of(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link KindOfBiologicalObject}.
+     * {@link BiologicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link KindOfBiologicalObject}.
      *
      * @param kindOfBiologicalObject The KindOfBiologicalObject.
      * @return This builder.
@@ -183,13 +183,12 @@ public final BiologicalSystemComponentBuilder part__Of(final SpatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java
index 4ef09d8e..6477f25e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfActivityBuilder.java
@@ -47,11 +47,10 @@ public ClassOfActivityBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final ClassOfActivityBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java
index a06f40e9..05b3a9b5 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreeContractBuilder.java
@@ -51,11 +51,10 @@ public ClassOfAgreeContractBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfAgreeContractBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -139,8 +137,8 @@ public final ClassOfAgreeContractBuilder part__Of_By_Class(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF_BY_CLASS} relationship type where a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfAgreeContract}
-     * may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfAgreeContract} may be
+     * a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link ClassOfContractProcess}.
      *
@@ -158,8 +156,7 @@ public final ClassOfAgreeContractBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java
index cc34d5ff..b68c49dd 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementExecutionBuilder.java
@@ -50,11 +50,10 @@ public ClassOfAgreementExecutionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -121,8 +120,7 @@ public final ClassOfAgreementExecutionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -138,11 +136,9 @@ public final ClassOfAgreementExecutionBuilder part__Of_By_Class(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF_BY_CLASS} relationship type where a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link ClassOfAgreementExecution} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link ClassOfAgreementProcess}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfAgreementExecution}
+     * may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfAgreementProcess}.
      *
      * @param classOfAgreementProcess The ClassOfAgreementProcess.
      * @return This builder.
@@ -159,8 +155,7 @@ public final ClassOfAgreementExecutionBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java
index fb4a5a68..06ad58dd 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAgreementProcessBuilder.java
@@ -51,11 +51,10 @@ public ClassOfAgreementProcessBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfAgreementProcessBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -159,8 +157,7 @@ public final ClassOfAgreementProcessBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java
index 09009d94..539bf5c9 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAmountOfMoneyBuilder.java
@@ -47,11 +47,10 @@ public ClassOfAmountOfMoneyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfAmountOfMoneyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java
index 1ee6f407..bba8edbc 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfAssociationBuilder.java
@@ -47,11 +47,10 @@ public ClassOfAssociationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfAssociationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java
index f1966a83..38d1982e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java
index 0255ecc8..bfdfe7e0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemBuilder.java
@@ -47,11 +47,10 @@ public ClassOfBiologicalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfBiologicalSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java
index 9ed681c2..1f351b18 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfBiologicalSystemComponentBuilder.java
@@ -47,11 +47,10 @@ public ClassOfBiologicalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfBiologicalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java
index e72cea55..ebb9de1d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfClassOfSpatioTemporalExtentBuilder.java
@@ -38,8 +38,7 @@ public class ClassOfClassOfSpatioTemporalExtentBuilder {
      * @param iri IRI of the ClassOfClassOfSpatioTemporalExtent.
      */
     public ClassOfClassOfSpatioTemporalExtentBuilder(final IRI iri) {
-        this.classOfClassOfSpatioTemporalExtent = 
-            ClassServices.createClassOfClassOfSpatioTemporalExtent(iri);
+        this.classOfClassOfSpatioTemporalExtent = ClassServices.createClassOfClassOfSpatioTemporalExtent(iri);
     }
 
     /**
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java
index 2512ac3d..a8d58318 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractExecutionBuilder.java
@@ -51,11 +51,10 @@ public ClassOfContractExecutionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfContractExecutionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -139,9 +137,8 @@ public final ClassOfContractExecutionBuilder part__Of_By_Class(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF_BY_CLASS} relationship type where a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link ClassOfContractExecution} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfContractExecution}
+     * may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link ClassOfContractProcess}.
      *
      * @param classOfContractProcess The ClassOfContractProcess.
@@ -159,8 +156,7 @@ public final ClassOfContractExecutionBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java
index 843fac2b..4bca7dca 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfContractProcessBuilder.java
@@ -51,11 +51,10 @@ public ClassOfContractProcessBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfContractProcessBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -159,8 +157,7 @@ public final ClassOfContractProcessBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java
index 1f830b03..35c5de6a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfEventBuilder.java
@@ -47,11 +47,10 @@ public ClassOfEventBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final ClassOfEventBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java
index 2318e4b6..ca562097 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java
index 8f83eb5f..ea930e31 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemBuilder.java
@@ -47,11 +47,10 @@ public ClassOfFunctionalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfFunctionalSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java
index 79347e83..58e608d3 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfFunctionalSystemComponentBuilder.java
@@ -48,11 +48,10 @@ public ClassOfFunctionalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfFunctionalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java
index 41982e16..760f748f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInPlaceBiologicalComponentBuilder.java
@@ -48,11 +48,10 @@ public ClassOfInPlaceBiologicalComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfInPlaceBiologicalComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java
index bf3826a1..e0d23715 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIndividualBuilder.java
@@ -47,11 +47,10 @@ public ClassOfIndividualBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final ClassOfIndividualBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java
index b8155aa2..0cf72639 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledFunctionalSystemComponentBuilder.java
@@ -49,11 +49,10 @@ public ClassOfInstalledFunctionalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -121,8 +120,7 @@ public final ClassOfInstalledFunctionalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java
index 3e8684be..e220b2b0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfInstalledObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfInstalledObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfInstalledObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java
index bcaba1d2..4d6b9cb1 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfIntentionallyConstructedObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfIntentionallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfIntentionallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java
index 3f566cc7..192aa45c 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOfferBuilder.java
@@ -51,11 +51,10 @@ public ClassOfOfferBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfOfferBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -155,8 +153,7 @@ public final ClassOfOfferBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java
index 7073f015..68cde5a7 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryBiologicalObjectBuilder.java
@@ -48,11 +48,10 @@ public ClassOfOrdinaryBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfOrdinaryBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java
index f1d2608b..f5080a62 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryFunctionalObjectBuilder.java
@@ -48,11 +48,10 @@ public ClassOfOrdinaryFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfOrdinaryFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java
index 9ce8fc85..eff631f4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrdinaryPhysicalObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfOrdinaryPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfOrdinaryPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java
index 6a745ee9..073434f4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationBuilder.java
@@ -47,11 +47,10 @@ public ClassOfOrganizationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfOrganizationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java
index ca1d4d4f..7744951d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfOrganizationComponentBuilder.java
@@ -47,11 +47,10 @@ public ClassOfOrganizationComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfOrganizationComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java
index f2b7d76a..8fb5923c 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfParticipantBuilder.java
@@ -47,11 +47,10 @@ public ClassOfParticipantBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfParticipantBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java
index 1b76637e..3b2cef1e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPartyBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPartyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ClassOfPartyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java
index 58c2b047..603b8e50 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPeriodOfTimeBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPeriodOfTimeBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfPeriodOfTimeBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java
index 978a9133..b1f5073c 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPersonBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ClassOfPersonBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java
index 2f557054..c39dff04 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPersonInPositionBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPersonInPositionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfPersonInPositionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java
index c13fb38c..4f629777 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPhysicalObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java
index a43e903c..0d11f3eb 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPointInTimeBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPointInTimeBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfPointInTimeBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java
index 903f8af6..92bc56b0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPositionBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPositionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final ClassOfPositionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java
index a9019ade..79fb1dc0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfPossibleWorldBuilder.java
@@ -47,11 +47,10 @@ public ClassOfPossibleWorldBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfPossibleWorldBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java
index f5ac6729..30adcded 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfReachingAgreementBuilder.java
@@ -51,11 +51,10 @@ public ClassOfReachingAgreementBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfReachingAgreementBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -139,8 +137,8 @@ public final ClassOfReachingAgreementBuilder part__Of_By_Class(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF_BY_CLASS} relationship type where a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfReachingAgreement}
-     * may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfReachingAgreement} may
+     * be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementProcess}.
      *
      * @param classOfAgreementProcess The ClassOfAgreementProcess.
@@ -158,8 +156,7 @@ public final ClassOfReachingAgreementBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java
index 3175c3d9..deaeeaaf 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSalesProductInstanceBuilder.java
@@ -47,11 +47,10 @@ public ClassOfSalesProductInstanceBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfSalesProductInstanceBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java
index 70c7d9d1..fb24a190 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSignBuilder.java
@@ -47,11 +47,10 @@ public ClassOfSignBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ClassOfSignBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java
index 417ba0fb..083315ac 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedActivityBuilder.java
@@ -52,11 +52,10 @@ public ClassOfSociallyConstructedActivityBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -123,8 +122,7 @@ public final ClassOfSociallyConstructedActivityBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -160,8 +158,7 @@ public final ClassOfSociallyConstructedActivityBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java
index 7677f7d3..b2dce287 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSociallyConstructedObjectBuilder.java
@@ -48,11 +48,10 @@ public ClassOfSociallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfSociallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java
index 598d6ea4..207d5dfc 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSpatioTemporalExtentBuilder.java
@@ -46,11 +46,10 @@ public ClassOfSpatioTemporalExtentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final ClassOfSpatioTemporalExtentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java
index 1f8b76a4..d38680ba 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ClassOfStateBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java
index 48866410..018ac18e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfActivityBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfActivityBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfActivityBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java
index b6fcbff5..1b0ad672 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAmountOfMoneyBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfAmountOfMoneyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfAmountOfMoneyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java
index eb08f449..81b152a2 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfAssociationBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfAssociationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfAssociationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java
index 15f00853..6b22bde0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalObjectBuilder.java
@@ -48,11 +48,10 @@ public ClassOfStateOfBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfStateOfBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java
index 3f5484f1..b9e88769 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemBuilder.java
@@ -48,11 +48,10 @@ public ClassOfStateOfBiologicalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfStateOfBiologicalSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java
index 0baa0fb7..e9371eab 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfBiologicalSystemComponentBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfBiologicalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfBiologicalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java
index 7b0dfb7c..cec30b06 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalObjectBuilder.java
@@ -48,11 +48,10 @@ public ClassOfStateOfFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfStateOfFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java
index 9c026d14..745b71ef 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemBuilder.java
@@ -48,11 +48,10 @@ public ClassOfStateOfFunctionalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfStateOfFunctionalSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java
index c985eb2f..2f8afa4b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfFunctionalSystemComponentBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfFunctionalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfFunctionalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java
index 63b9a9a9..d70ba083 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfIntentionallyConstructedObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfIntentionallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -122,8 +121,7 @@ public final ClassOfStateOfIntentionallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java
index 146ef17c..dfe31085 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryBiologicalObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfOrdinaryBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfOrdinaryBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java
index a3bbd1b0..8c95df02 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryFunctionalObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfOrdinaryFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfOrdinaryFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java
index cbfdaa89..a20f18ba 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrdinaryPhysicalObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfOrdinaryPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfOrdinaryPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java
index 5316e8f2..de122f4f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfOrganizationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfOrganizationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java
index 23629050..cf4bb442 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfOrganizationComponentBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfOrganizationComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfOrganizationComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java
index 868ed003..a1c1a025 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPartyBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfPartyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfPartyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java
index b9688784..dffb7ba8 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPersonBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfPersonBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfPersonBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java
index d6bf50ab..26560607 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPhysicalObjectBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java
index f532538a..957713ac 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfPositionBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfPositionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfPositionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java
index 43cf750d..a85caf48 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSalesProductInstanceBuilder.java
@@ -48,11 +48,10 @@ public ClassOfStateOfSalesProductInstanceBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final ClassOfStateOfSalesProductInstanceBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java
index dff69e28..23da5c41 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSignBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfSignBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfSignBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java
index b4aaa3a5..f89e3dd6 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedActivityBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfSociallyConstructedActivityBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -121,8 +120,7 @@ public final ClassOfStateOfSociallyConstructedActivityBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java
index af7d32a9..76967877 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSociallyConstructedObjectBuilder.java
@@ -49,11 +49,10 @@ public ClassOfStateOfSociallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final ClassOfStateOfSociallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java
index c8055724..b60b3369 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java
index bbd5345a..c644be73 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfStateOfSystemComponentBuilder.java
@@ -47,11 +47,10 @@ public ClassOfStateOfSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfStateOfSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java
index d89a8f65..f35c1031 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemBuilder.java
@@ -47,11 +47,10 @@ public ClassOfSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ClassOfSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java
index 362c2df8..3ca28dce 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassOfSystemComponentBuilder.java
@@ -47,11 +47,10 @@ public ClassOfSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final ClassOfSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java
index cc2fcd2f..ce13b457 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ClassificationBuilder.java
@@ -82,8 +82,9 @@ public final ClassificationBuilder member__Of(final Class clazz) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a relationship is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfRelationship}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
+     * relationship is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * {@link ClassOfRelationship}.
      *
      * @param classOfRelationship The ClassOfRelationship.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java
index 6dcc0a48..0f373b91 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractExecutionBuilder.java
@@ -184,8 +184,8 @@ public final ContractExecutionBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link ContractExecution} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfContractExecution}.
+     * {@link ContractExecution} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfContractExecution}.
      *
      * @param classOfContractExecution The ClassOfContractExecution.
      * @return This builder.
@@ -224,8 +224,8 @@ public final ContractExecutionBuilder part__Of(final SpatioTemporalExtent spatio
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link ContractExecution} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly
-     * one {@link ContractProcess}.
+     * {@link ContractExecution} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly one
+     * {@link ContractProcess}.
      *
      * @param contractProcess The ContractProcess.
      * @return This builder.
@@ -238,8 +238,7 @@ public final ContractExecutionBuilder part_Of_M(final ContractProcess contractPr
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -251,13 +250,12 @@ public final ContractExecutionBuilder part_Of_(final AgreementExecution agreemen
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -295,16 +293,15 @@ public final ContractExecutionBuilder temporal__Part_Of(final SpatioTemporalExte
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java
index 4ce83262..4e564b2b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ContractProcessBuilder.java
@@ -126,8 +126,8 @@ public final ContractProcessBuilder consists__Of(final SpatioTemporalExtent spat
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} relationship type where a
-     * {@link ContractProcess} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} exactly
-     * one {@link AgreeContract}.
+     * {@link ContractProcess} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} exactly one
+     * {@link AgreeContract}.
      *
      * @param agreeContract The AgreeContract.
      * @return This builder.
@@ -139,8 +139,8 @@ public final ContractProcessBuilder consists_Of(final AgreeContract agreeContrac
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_} relationship type where a
-     * {@link ContractProcess} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} exactly
-     * one {@link ContractExecution}.
+     * {@link ContractProcess} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} exactly one
+     * {@link ContractExecution}.
      *
      * @param contractExecution The ContractExecution.
      * @return This builder.
@@ -199,9 +199,9 @@ public final ContractProcessBuilder member__Of(final Class clazz) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * contract process may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link ClassOfContractProcess}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a contract
+     * process may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link ClassOfContractProcess}.
      *
      * @param classOfContractProcess The ClassOfContractProcess.
      * @return This builder.
@@ -241,8 +241,7 @@ public final ContractProcessBuilder part__Of(final SpatioTemporalExtent spatioTe
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedActivity} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link ReachingAgreement}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link ReachingAgreement}.
      *
      * @param reachingAgreement The ReachingAgreement.
      * @return This builder.
@@ -255,8 +254,7 @@ public final ContractProcessBuilder part_Of(final ReachingAgreement reachingAgre
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -268,13 +266,12 @@ public final ContractProcessBuilder part_Of_(final AgreementExecution agreementE
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -313,16 +310,15 @@ public final ContractProcessBuilder temporal__Part_Of(final SpatioTemporalExtent
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java
index c9628983..c9ed6899 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/CurrencyBuilder.java
@@ -47,11 +47,10 @@ public CurrencyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final CurrencyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinitionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinitionBuilder.java
index 6d313372..8b5bd6b8 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinitionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DefinitionBuilder.java
@@ -43,8 +43,8 @@ public DefinitionBuilder(final IRI iri) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
      * {@link uk.gov.gchq.magmacore.hqdm.model.RepresentationByPattern} has a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Sign} that is a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link Pattern}.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DescriptionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DescriptionBuilder.java
index 38a1e208..12ec1d6f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DescriptionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/DescriptionBuilder.java
@@ -43,8 +43,8 @@ public DescriptionBuilder(final IRI iri) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
      * {@link uk.gov.gchq.magmacore.hqdm.model.RepresentationByPattern} has a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Sign} that is a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link Pattern}.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java
index 461cbb26..db4e297b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployeeBuilder.java
@@ -167,13 +167,12 @@ public final EmployeeBuilder part__Of(final SpatioTemporalExtent spatioTemporalE
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -186,8 +185,8 @@ public final EmployeeBuilder part_Of_Possible_World_M(final PossibleWorld possib
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an
-     * {@link Employee} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly
-     * one {@link Employment}.
+     * {@link Employee} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
+     * {@link Employment}.
      *
      * @param employment The Employment.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java
index 7b73d241..87396359 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmployerBuilder.java
@@ -167,13 +167,12 @@ public final EmployerBuilder part__Of(final SpatioTemporalExtent spatioTemporalE
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -186,8 +185,8 @@ public final EmployerBuilder part_Of_Possible_World_M(final PossibleWorld possib
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an
-     * {@link Employer} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly
-     * one {@link Employment}.
+     * {@link Employer} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
+     * {@link Employment}.
      *
      * @param employment The Employment.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java
index 98130dd5..37e16e5d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EmploymentBuilder.java
@@ -103,8 +103,8 @@ public final EmploymentBuilder consists__Of(final SpatioTemporalExtent spatioTem
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where an {@link Employment} consists of exactly one {@link Employer}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * an {@link Employment} consists of exactly one {@link Employer}.
      *
      * @param employer The Employer.
      * @return This builder.
@@ -115,8 +115,8 @@ public final EmploymentBuilder consists_Of_Participant(final Employer employer)
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where an {@link Employment} consists of exactly one {@link Employee}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * an {@link Employment} consists of exactly one {@link Employee}.
      *
      * @param employee The Employee.
      * @return This builder.
@@ -153,8 +153,7 @@ public final EmploymentBuilder member__Of(final Class clazz) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
      * {@link uk.gov.gchq.magmacore.hqdm.model.Association} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfAssociation}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link ClassOfAssociation}.
      *
      * @param classOfAssociation The ClassOfAssociation.
      * @return This builder.
@@ -167,8 +166,7 @@ public final EmploymentBuilder member_Of(final ClassOfAssociation classOfAssocia
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where each
      * {@link uk.gov.gchq.magmacore.hqdm.model.Association} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfAssociation}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link KindOfAssociation}.
      *
      * @param kindOfAssociation The KindOfAssociation.
      * @return This builder.
@@ -194,13 +192,12 @@ public final EmploymentBuilder part__Of(final SpatioTemporalExtent spatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -227,16 +224,15 @@ public final EmploymentBuilder temporal__Part_Of(final SpatioTemporalExtent spat
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java
index 11db2cd3..7464cfc3 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EndingOfOwnershipBuilder.java
@@ -145,13 +145,12 @@ public final EndingOfOwnershipBuilder part__Of(final SpatioTemporalExtent spatio
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java
index 64fb1399..56af43de 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/EventBuilder.java
@@ -144,13 +144,12 @@ public final EventBuilder part__Of(final SpatioTemporalExtent spatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java
index 3515b8fc..8da69ba5 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ExchangeOfGoodsAndMoneyBuilder.java
@@ -254,8 +254,7 @@ public final ExchangeOfGoodsAndMoneyBuilder part_Of_M(final SaleOfGoods saleOfGo
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -267,13 +266,12 @@ public final ExchangeOfGoodsAndMoneyBuilder part_Of_(final AgreementExecution ag
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -312,16 +310,15 @@ public final ExchangeOfGoodsAndMoneyBuilder temporal__Part_Of(final SpatioTempor
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java
index 09982e7c..aea038a7 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalObjectBuilder.java
@@ -137,8 +137,8 @@ public final FunctionalObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link FunctionalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfFunctionalObject}.
+     * {@link FunctionalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfFunctionalObject}.
      *
      * @param classOfFunctionalObject The ClassOfFunctionalObject.
      * @return This builder.
@@ -150,8 +150,8 @@ public final FunctionalObjectBuilder member_Of(final ClassOfFunctionalObject cla
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where a
-     * {@link FunctionalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link KindOfFunctionalObject}.
+     * {@link FunctionalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link KindOfFunctionalObject}.
      *
      * @param kindOfFunctionalObject The KindOfFunctionalObject.
      * @return This builder.
@@ -177,13 +177,12 @@ public final FunctionalObjectBuilder part__Of(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -210,16 +209,15 @@ public final FunctionalObjectBuilder temporal__Part_Of(final SpatioTemporalExten
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java
index b83aae27..284f0c9f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemBuilder.java
@@ -138,8 +138,8 @@ public final FunctionalSystemBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link FunctionalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfFunctionalSystem}.
+     * {@link FunctionalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfFunctionalSystem}.
      *
      * @param classOfFunctionalSystem The ClassOfFunctionalSystem.
      * @return This builder.
@@ -151,8 +151,8 @@ public final FunctionalSystemBuilder member_Of(final ClassOfFunctionalSystem cla
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where a
-     * {@link FunctionalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link KindOfFunctionalSystem}.
+     * {@link FunctionalSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link KindOfFunctionalSystem}.
      *
      * @param kindOfFunctionalSystem The KindOfFunctionalSystem.
      * @return This builder.
@@ -178,13 +178,12 @@ public final FunctionalSystemBuilder part__Of(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java
index 14ab42c0..49d64397 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/FunctionalSystemComponentBuilder.java
@@ -168,9 +168,8 @@ public final FunctionalSystemComponentBuilder member_Of(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where a
-     * {@link FunctionalSystemComponent} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} at least one
-     * {@link KindOfFunctionalSystemComponent}.
+     * {@link FunctionalSystemComponent} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * at least one {@link KindOfFunctionalSystemComponent}.
      *
      * @param kindOfFunctionalSystemComponent The KindOfFunctionalSystemComponent.
      * @return This builder.
@@ -197,13 +196,12 @@ public final FunctionalSystemComponentBuilder part__Of(final SpatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -231,16 +229,15 @@ public final FunctionalSystemComponentBuilder temporal__Part_Of(final SpatioTemp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IdentificationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IdentificationBuilder.java
index eacfb2bb..ce2392d1 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IdentificationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IdentificationBuilder.java
@@ -43,8 +43,8 @@ public IdentificationBuilder(final IRI iri) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
      * {@link uk.gov.gchq.magmacore.hqdm.model.RepresentationByPattern} has a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Sign} that is a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link Pattern}.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java
index 3be4e5a4..b7382aca 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InPlaceBiologicalComponentBuilder.java
@@ -150,13 +150,12 @@ public final InPlaceBiologicalComponentBuilder part__Of(final SpatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java
index 81983c7c..56fe62d0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IndividualBuilder.java
@@ -123,8 +123,8 @@ public final IndividualBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link ClassOfIndividual}.
+     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link ClassOfIndividual}.
      *
      * @param classOfIndividual The ClassOfIndividual.
      * @return This builder.
@@ -136,8 +136,8 @@ public final IndividualBuilder member_Of(final ClassOfIndividual classOfIndividu
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link KindOfIndividual}.
+     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link KindOfIndividual}.
      *
      * @param kindOfIndividual The KindOfIndividual.
      * @return This builder.
@@ -163,13 +163,12 @@ public final IndividualBuilder part__Of(final SpatioTemporalExtent spatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -196,16 +195,15 @@ public final IndividualBuilder temporal__Part_Of(final SpatioTemporalExtent spat
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java
index 9c057d7e..be54f18d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledFunctionalSystemComponentBuilder.java
@@ -157,13 +157,12 @@ public final InstalledFunctionalSystemComponentBuilder part__Of(final SpatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java
index 11482f6e..30c8eb1b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/InstalledObjectBuilder.java
@@ -121,8 +121,8 @@ public final InstalledObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link InstalledObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfInstalledObject}.
+     * {@link InstalledObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfInstalledObject}.
      *
      * @param classOfInstalledObject The ClassOfInstalledObject.
      * @return This builder.
@@ -147,13 +147,12 @@ public final InstalledObjectBuilder part__Of(final SpatioTemporalExtent spatioTe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java
index 8b8132b9..dee613d5 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/IntentionallyConstructedObjectBuilder.java
@@ -173,13 +173,12 @@ public final IntentionallyConstructedObjectBuilder part__Of(final SpatioTemporal
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -209,16 +208,15 @@ public final IntentionallyConstructedObjectBuilder temporal__Part_Of(
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java
index 3bfef431..23d18988 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfActivityBuilder.java
@@ -66,11 +66,10 @@ public final KindOfActivityBuilder causes_By_Class(final ClassOfEvent classOfEve
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -84,9 +83,9 @@ public final KindOfActivityBuilder consists__Of_By_Class(
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfActivity}
-     * has a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link Role} as a
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfActivity} has a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link Role} as a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Participant}.
      *
      * @param role The Role.
@@ -99,8 +98,8 @@ public final KindOfActivityBuilder consists_Of_By_Class(final Role role) {
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link KindOfActivity} determines a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * the {@link Class}.
+     * {@link KindOfActivity} determines a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * {@link Class}.
      *
      * @param clazz The Class.
      * @return This builder.
@@ -163,8 +162,7 @@ public final KindOfActivityBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -179,8 +177,8 @@ public final KindOfActivityBuilder part__Of_By_Class(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link KindOfActivity} references a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * the {@link Class}.
+     * {@link KindOfActivity} references a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * {@link Class}.
      *
      * @param clazz The Class.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java
index 4745dade..a0d28888 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfAssociationBuilder.java
@@ -49,11 +49,10 @@ public KindOfAssociationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -67,10 +66,9 @@ public final KindOfAssociationBuilder consists__Of_By_Class(
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link KindOfAssociation} has a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link Role} as a part.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link KindOfAssociation} has a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link Role} as a part.
      *
      * @param role The Role.
      * @return This builder.
@@ -133,8 +131,7 @@ public final KindOfAssociationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java
index 8ca885bb..e1ca9638 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalObjectBuilder.java
@@ -47,11 +47,10 @@ public KindOfBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java
index da03ed4a..89855328 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemBuilder.java
@@ -51,11 +51,10 @@ public KindOfBiologicalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -70,8 +69,8 @@ public final KindOfBiologicalSystemBuilder consists__Of_By_Class(
 
     /**
      * A has_component_by_class relationship type where each
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfBiologicalSystem}
-     * has a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfBiologicalSystem} has a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link KindOfBiologicalSystemComponent} as a component.
      *
      * @param kindOfBiologicalSystemComponent The KindOfBiologicalSystemComponent.
@@ -150,8 +149,7 @@ public final KindOfBiologicalSystemBuilder natural_Role_By_Class_M(final Role ro
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java
index 432c601d..59d698f9 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfBiologicalSystemComponentBuilder.java
@@ -48,11 +48,10 @@ public KindOfBiologicalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final KindOfBiologicalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java
index 2e33fe93..bcd56393 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalObjectBuilder.java
@@ -49,11 +49,10 @@ public KindOfFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -132,8 +131,7 @@ public final KindOfFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java
index b68db045..97abc2f3 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemBuilder.java
@@ -49,11 +49,10 @@ public KindOfFunctionalSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -68,8 +67,8 @@ public final KindOfFunctionalSystemBuilder consists__Of_By_Class(
 
     /**
      * A has_component_by_class relationship type where each
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link KindOfFunctionalSystem}
-     * has a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link KindOfFunctionalSystem} has
+     * a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link KindOfFunctionalSystemComponent} as a component.
      *
      * @param kindOfFunctionalSystemComponent The KindOfFunctionalSystemComponent.
@@ -136,8 +135,7 @@ public final KindOfFunctionalSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java
index 3645fede..26880737 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfFunctionalSystemComponentBuilder.java
@@ -48,11 +48,10 @@ public KindOfFunctionalSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final KindOfFunctionalSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java
index 2157103e..962c0e43 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIndividualBuilder.java
@@ -47,11 +47,10 @@ public KindOfIndividualBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final KindOfIndividualBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java
index 6b32c2c3..dbb126cf 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfIntentionallyConstructedObjectBuilder.java
@@ -49,11 +49,10 @@ public KindOfIntentionallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final KindOfIntentionallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java
index ceb41d58..4de71e2a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryBiologicalObjectBuilder.java
@@ -48,11 +48,10 @@ public KindOfOrdinaryBiologicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -119,8 +118,7 @@ public final KindOfOrdinaryBiologicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java
index d97cfd54..3c497528 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryFunctionalObjectBuilder.java
@@ -50,11 +50,10 @@ public KindOfOrdinaryFunctionalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -134,8 +133,7 @@ public final KindOfOrdinaryFunctionalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java
index bc7c2b90..040d4dfe 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrdinaryPhysicalObjectBuilder.java
@@ -47,11 +47,10 @@ public KindOfOrdinaryPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfOrdinaryPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java
index f6a80451..ebfe430b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfOrganizationComponentBuilder.java
@@ -47,11 +47,10 @@ public KindOfOrganizationComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfOrganizationComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java
index 9d88ea07..c019b5e4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPartyBuilder.java
@@ -49,11 +49,10 @@ public KindOfPartyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -66,8 +65,8 @@ public final KindOfPartyBuilder consists__Of_By_Class(
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where
+     * each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.KindOfSystem} has a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link KindOfSystemComponent} as a component.
@@ -134,8 +133,7 @@ public final KindOfPartyBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java
index eba93a31..b81fd828 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPersonBuilder.java
@@ -49,11 +49,10 @@ public KindOfPersonBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -66,8 +65,8 @@ public final KindOfPersonBuilder consists__Of_By_Class(
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where
+     * each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.KindOfSystem} has a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link KindOfSystemComponent} as a component.
@@ -134,8 +133,7 @@ public final KindOfPersonBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java
index db354ca3..8b822359 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPhysicalObjectBuilder.java
@@ -47,11 +47,10 @@ public KindOfPhysicalObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfPhysicalObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java
index 49eff319..94136994 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfPositionBuilder.java
@@ -47,11 +47,10 @@ public KindOfPositionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -117,8 +116,7 @@ public final KindOfPositionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java
index 53b4358a..b06d08f3 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSociallyConstructedObjectBuilder.java
@@ -47,11 +47,10 @@ public KindOfSociallyConstructedObjectBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfSociallyConstructedObjectBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java
index 56d9d0e8..aa66428a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemBuilder.java
@@ -49,11 +49,10 @@ public KindOfSystemBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -66,9 +65,9 @@ public final KindOfSystemBuilder consists__Of_By_Class(
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfSystem}
-     * has a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where
+     * each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link KindOfSystem} has a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
      * {@link KindOfSystemComponent} as a component.
      *
      * @param kindOfSystemComponent The KindOfSystemComponent.
@@ -133,8 +132,7 @@ public final KindOfSystemBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java
index cc5304c3..69f6d488 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/KindOfSystemComponentBuilder.java
@@ -47,11 +47,10 @@ public KindOfSystemComponentBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -118,8 +117,7 @@ public final KindOfSystemComponentBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java
index 6b1c4dd9..4bf7ad2d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/LanguageCommunityBuilder.java
@@ -139,8 +139,7 @@ public final LanguageCommunityBuilder member_Of(
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where
      * {@link uk.gov.gchq.magmacore.hqdm.model.Organization} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfOrganization}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link KindOfOrganization}.
      *
      * @param kindOfOrganization The KindOfOrganization.
      * @return This builder.
@@ -166,13 +165,12 @@ public final LanguageCommunityBuilder part__Of(final SpatioTemporalExtent spatio
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java
index b10956bd..2f8e231a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/MoneyAssetBuilder.java
@@ -127,8 +127,7 @@ public final MoneyAssetBuilder member__Of(final Class clazz) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.Participant} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfParticipant}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link ClassOfParticipant}.
      *
      * @param classOfParticipant The ClassOfParticipant.
      * @return This builder.
@@ -167,13 +166,12 @@ public final MoneyAssetBuilder part__Of(final SpatioTemporalExtent spatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -185,8 +183,8 @@ public final MoneyAssetBuilder part_Of_Possible_World_M(final PossibleWorld poss
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an
-     * asset is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an asset
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
      * {@link Ownership}.
      *
      * @param ownership The Ownership.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java
index ef966294..94a51692 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferAndAcceptanceForGoodsBuilder.java
@@ -241,8 +241,8 @@ public final OfferAndAcceptanceForGoodsBuilder part__Of(final SpatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where an
-     * {@link OfferAndAcceptanceForGoods} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly one {@link SaleOfGoods}.
+     * {@link OfferAndAcceptanceForGoods} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
+     * exactly one {@link SaleOfGoods}.
      *
      * @param saleOfGoods The SaleOfGoods.
      * @return Builder
@@ -255,8 +255,7 @@ public final OfferAndAcceptanceForGoodsBuilder part_Of_M(final SaleOfGoods saleO
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -268,13 +267,12 @@ public final OfferAndAcceptanceForGoodsBuilder part_Of_(final AgreementExecution
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -314,16 +312,15 @@ public final OfferAndAcceptanceForGoodsBuilder temporal__Part_Of(final SpatioTem
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java
index 9650d940..39fa72c1 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferBuilder.java
@@ -238,8 +238,7 @@ public final OfferBuilder part_Of(final AgreeContract agreeContract) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -251,13 +250,12 @@ public final OfferBuilder part_Of_(final AgreementExecution agreementExecution)
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -295,16 +293,15 @@ public final OfferBuilder temporal__Part_Of(final SpatioTemporalExtent spatioTem
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java
index f60e524e..08b86d54 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferForGoodsBuilder.java
@@ -225,8 +225,8 @@ public final OfferForGoodsBuilder part__Of(final SpatioTemporalExtent spatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where an
-     * {@link OfferForGoods} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} no more
-     * than one {@link OfferAndAcceptanceForGoods}.
+     * {@link OfferForGoods} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} no more than
+     * one {@link OfferAndAcceptanceForGoods}.
      *
      * @param offerAndAcceptanceForGoods The OfferAndAcceptanceForGoods.
      * @return This builder.
@@ -239,8 +239,7 @@ public final OfferForGoodsBuilder part_Of(final OfferAndAcceptanceForGoods offer
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -252,13 +251,12 @@ public final OfferForGoodsBuilder part_Of_(final AgreementExecution agreementExe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -296,16 +294,15 @@ public final OfferForGoodsBuilder temporal__Part_Of(final SpatioTemporalExtent s
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java
index cdb414ea..66c394fc 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OfferingBuilder.java
@@ -83,11 +83,10 @@ public final OfferingBuilder consideration_By_Class_M(final Price price) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -164,8 +163,7 @@ public final OfferingBuilder offeror_M(final Party party) {
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -199,8 +197,7 @@ public final OfferingBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java
index b9278f03..536dcf9e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryBiologicalObjectBuilder.java
@@ -168,13 +168,12 @@ public final OrdinaryBiologicalObjectBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java
index 6bec09a3..a956d432 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryFunctionalObjectBuilder.java
@@ -183,13 +183,12 @@ public final OrdinaryFunctionalObjectBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -216,16 +215,15 @@ public final OrdinaryFunctionalObjectBuilder temporal__Part_Of(final SpatioTempo
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java
index fd1fedf1..5b486f19 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrdinaryPhysicalObjectBuilder.java
@@ -124,9 +124,8 @@ public final OrdinaryPhysicalObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link OrdinaryPhysicalObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfOrdinaryPhysicalObject}.
+     * {@link OrdinaryPhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfOrdinaryPhysicalObject}.
      *
      * @param classOfOrdinaryPhysicalObject The ClassOfOrdinaryPhysicalObject.
      * @return This builder.
@@ -139,9 +138,8 @@ public final OrdinaryPhysicalObjectBuilder member_Of(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where an
-     * {@link OrdinaryPhysicalObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfOrdinaryPhysicalObject}.
+     * {@link OrdinaryPhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link KindOfOrdinaryPhysicalObject}.
      *
      * @param kindOfOrdinaryPhysicalObject The KindOfOrdinaryPhysicalObject.
      * @return This builder.
@@ -168,13 +166,12 @@ public final OrdinaryPhysicalObjectBuilder part__Of(final SpatioTemporalExtent s
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -201,16 +198,15 @@ public final OrdinaryPhysicalObjectBuilder temporal__Part_Of(final SpatioTempora
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java
index 5731cc96..3109507e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationBuilder.java
@@ -123,8 +123,8 @@ public final OrganizationBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where
-     * {@link Organization} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfOrganization}.
+     * {@link Organization} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfOrganization}.
      *
      * @param classOfOrganization The ClassOfOrganization.
      * @return This builder.
@@ -136,8 +136,8 @@ public final OrganizationBuilder member_Of(final ClassOfOrganization classOfOrga
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where
-     * {@link Organization} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link KindOfOrganization}.
+     * {@link Organization} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link KindOfOrganization}.
      *
      * @param kindOfOrganization The KindOfOrganization.
      * @return This builder.
@@ -163,13 +163,12 @@ public final OrganizationBuilder part__Of(final SpatioTemporalExtent spatioTempo
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java
index 4db4eedf..1d91b103 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OrganizationComponentBuilder.java
@@ -137,9 +137,8 @@ public final OrganizationComponentBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link OrganizationComponent} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfOrganizationComponent}.
+     * {@link OrganizationComponent} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfOrganizationComponent}.
      *
      * @param classOfOrganizationComponent The ClassOfOrganizationComponent.
      * @return This builder.
@@ -152,9 +151,8 @@ public final OrganizationComponentBuilder member_Of(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where an
-     * {@link OrganizationComponent} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfOrganizationComponent}.
+     * {@link OrganizationComponent} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link KindOfOrganizationComponent}.
      *
      * @param kindOfOrganizationComponent The KindOfOrganizationComponent.
      * @return This builder.
@@ -181,13 +179,12 @@ public final OrganizationComponentBuilder part__Of(final SpatioTemporalExtent sp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java
index e8923c76..1b1eda89 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnerBuilder.java
@@ -167,13 +167,12 @@ public final OwnerBuilder part__Of(final SpatioTemporalExtent spatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -185,8 +184,8 @@ public final OwnerBuilder part_Of_Possible_World_M(final PossibleWorld possibleW
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an
-     * owner is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where an owner
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} exactly one
      * {@link Ownership}.
      *
      * @param ownership The Ownership.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java
index 6ebf7f58..47e59bed 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/OwnershipBuilder.java
@@ -78,8 +78,8 @@ public final OwnershipBuilder aggregated_Into(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#BEGINNING} relationship type where an
-     * {@link Ownership} has as {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#BEGINNING} exactly
-     * one {@link BeginningOfOwnership}.
+     * {@link Ownership} has as {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#BEGINNING} exactly one
+     * {@link BeginningOfOwnership}.
      *
      * @param beginningOfOwnership The BeginningOfOwnership.
      * @return This builder.
@@ -105,10 +105,9 @@ public final OwnershipBuilder consists__Of(final SpatioTemporalExtent spatioTemp
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where an {@link Ownership}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
-     * {@link Owner}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * an {@link Ownership} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT}
+     * exactly one {@link Owner}.
      *
      * @param owner The Owner.
      * @return This builder.
@@ -119,10 +118,9 @@ public final OwnershipBuilder consists_Of_Participant(final Owner owner) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where an {@link Ownership}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
-     * {@link Asset}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * an {@link Ownership} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT}
+     * exactly one {@link Asset}.
      *
      * @param asset The Asset.
      * @return This builder.
@@ -134,8 +132,8 @@ public final OwnershipBuilder consists_Of_Participant_(final Asset asset) {
 
     /**
      * An {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#ENDING} relationship type where an
-     * {@link Ownership} has as {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#ENDING} not more than
-     * one {@link EndingOfOwnership}.
+     * {@link Ownership} has as {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#ENDING} not more than one
+     * {@link EndingOfOwnership}.
      *
      * @param endingOfOwnership The EndingOfOwnership.
      * @return This builder.
@@ -160,8 +158,7 @@ public final OwnershipBuilder member__Of(final Class clazz) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
      * {@link uk.gov.gchq.magmacore.hqdm.model.Association} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfAssociation}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link ClassOfAssociation}.
      *
      * @param classOfAssociation The ClassOfAssociation.
      * @return This builder.
@@ -174,8 +171,7 @@ public final OwnershipBuilder member_Of(final ClassOfAssociation classOfAssociat
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where each
      * {@link uk.gov.gchq.magmacore.hqdm.model.Association} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfAssociation}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link KindOfAssociation}.
      *
      * @param kindOfAssociation The KindOfAssociation.
      * @return This builder.
@@ -201,13 +197,12 @@ public final OwnershipBuilder part__Of(final SpatioTemporalExtent spatioTemporal
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -234,16 +229,15 @@ public final OwnershipBuilder temporal__Part_Of(final SpatioTemporalExtent spati
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java
index 273caec4..978203ee 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ParticipantBuilder.java
@@ -139,8 +139,8 @@ public final ParticipantBuilder member_Of(final ClassOfParticipant classOfPartic
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where each
-     * {@link Participant} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link Role}.
+     * {@link Participant} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link Role}.
      *
      * @param role The Role.
      * @return This builder.
@@ -166,13 +166,12 @@ public final ParticipantBuilder part__Of(final SpatioTemporalExtent spatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java
index 1e3b96aa..ee5257df 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PartyBuilder.java
@@ -163,13 +163,12 @@ public final PartyBuilder part__Of(final SpatioTemporalExtent spatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java
index 1e5fc293..199cd292 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PatternBuilder.java
@@ -47,11 +47,10 @@ public PatternBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final PatternBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java
index af0a7bba..5d07308a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PeriodOfTimeBuilder.java
@@ -122,8 +122,8 @@ public final PeriodOfTimeBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PeriodOfTime} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfPeriodOfTime}.
+     * {@link PeriodOfTime} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfPeriodOfTime}.
      *
      * @param classOfPeriodOfTime The ClassOfPeriodOfTime.
      * @return This builder.
@@ -148,13 +148,12 @@ public final PeriodOfTimeBuilder part__Of(final SpatioTemporalExtent spatioTempo
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -181,16 +180,15 @@ public final PeriodOfTimeBuilder temporal__Part_Of(final SpatioTemporalExtent sp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
@@ -203,9 +201,8 @@ public final PeriodOfTimeBuilder temporal_Part_Of(final Individual individual) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link PeriodOfTime} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link PossibleWorld}.
+     * {@link PeriodOfTime} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link PossibleWorld}.
      *
      * @param possibleWorld The PossibleWorld.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java
index cef41741..97bbdebe 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonBuilder.java
@@ -185,13 +185,12 @@ public final PersonBuilder part__Of(final SpatioTemporalExtent spatioTemporalExt
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java
index 43ec07ac..9b21882f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PersonInPositionBuilder.java
@@ -121,8 +121,8 @@ public final PersonInPositionBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PersonInPosition} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfPersonInPosition}.
+     * {@link PersonInPosition} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfPersonInPosition}.
      *
      * @param classOfPersonInPosition The ClassOfPersonInPosition.
      * @return This builder.
@@ -147,13 +147,12 @@ public final PersonInPositionBuilder part__Of(final SpatioTemporalExtent spatioT
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -180,8 +179,7 @@ public final PersonInPositionBuilder temporal__Part_Of(final SpatioTemporalExten
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.StateOfPosition} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Position}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Position}.
      *
      * @param position The Position.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java
index 1cf3b286..21c2c046 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalObjectBuilder.java
@@ -124,8 +124,8 @@ public final PhysicalObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfPhysicalObject}.
+     * {@link PhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfPhysicalObject}.
      *
      * @param classOfPhysicalObject The ClassOfPhysicalObject.
      * @return This builder.
@@ -137,8 +137,8 @@ public final PhysicalObjectBuilder member_Of(final ClassOfPhysicalObject classOf
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link KindOfPhysicalObject}.
+     * {@link PhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link KindOfPhysicalObject}.
      *
      * @param kindOfPhysicalObject The KindOfPhysicalObject.
      * @return This builder.
@@ -164,13 +164,12 @@ public final PhysicalObjectBuilder part__Of(final SpatioTemporalExtent spatioTem
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -197,16 +196,15 @@ public final PhysicalObjectBuilder temporal__Part_Of(final SpatioTemporalExtent
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java
index aadf17e7..d30a2d44 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyBuilder.java
@@ -50,11 +50,10 @@ public PhysicalPropertyBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -93,8 +92,8 @@ public final PhysicalPropertyBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalProperty} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfPhysicalProperty}.
+     * {@link PhysicalProperty} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfPhysicalProperty}.
      *
      * @param classOfPhysicalProperty The ClassOfPhysicalProperty.
      * @return This builder.
@@ -120,8 +119,8 @@ public final PhysicalPropertyBuilder member_Of_(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalProperty} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * exactly one {@link KindOfPhysicalProperty}.
+     * {@link PhysicalProperty} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} exactly
+     * one {@link KindOfPhysicalProperty}.
      *
      * @param kindOfPhysicalProperty The KindOfPhysicalProperty.
      * @return This builder.
@@ -134,8 +133,7 @@ public final PhysicalPropertyBuilder member_Of_Kind_M(final KindOfPhysicalProper
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java
index a4a45ec5..52c628a9 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalPropertyRangeBuilder.java
@@ -49,11 +49,10 @@ public PhysicalPropertyRangeBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final PhysicalPropertyRangeBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java
index c2f69221..9124218c 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityBuilder.java
@@ -50,11 +50,10 @@ public PhysicalQuantityBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -93,8 +92,8 @@ public final PhysicalQuantityBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalQuantity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfPhysicalQuantity}.
+     * {@link PhysicalQuantity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfPhysicalQuantity}.
      *
      * @param classOfPhysicalQuantity The ClassOfPhysicalQuantity.
      * @return This builder.
@@ -120,8 +119,8 @@ public final PhysicalQuantityBuilder member_Of_(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PhysicalQuantity} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * exactly one {@link KindOfPhysicalQuantity}.
+     * {@link PhysicalQuantity} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} exactly
+     * one {@link KindOfPhysicalQuantity}.
      *
      * @param kindOfPhysicalQuantity The KindOfPhysicalQuantity.
      * @return This builder.
@@ -134,8 +133,7 @@ public final PhysicalQuantityBuilder member_Of_Kind_M(final KindOfPhysicalQuanti
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java
index 2ce903ff..bfa03590 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PhysicalQuantityRangeBuilder.java
@@ -52,11 +52,10 @@ public PhysicalQuantityRangeBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -83,8 +82,7 @@ public final PhysicalQuantityRangeBuilder has_Superclass(final Class clazz) {
 
     /**
      * A supertype_of relationship type where each {@link PhysicalQuantityRange} must have as
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#LOWER_BOUND} exactly one
-     * {@link PhysicalQuantity}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#LOWER_BOUND} exactly one {@link PhysicalQuantity}.
      *
      * @param physicalQuantity The PhysicalQuantity.
      * @return This builder.
@@ -136,8 +134,7 @@ public final PhysicalQuantityRangeBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -166,8 +163,7 @@ public final PhysicalQuantityRangeBuilder ranges_Over_M(final PhysicalProperty p
 
     /**
      * A supertype_of relationship type where each {@link PhysicalQuantityRange} must have as
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#UPPER_BOUND} exactly one
-     * {@link PhysicalQuantity}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#UPPER_BOUND} exactly one {@link PhysicalQuantity}.
      *
      * @param physicalQuantity The PhysicalQuantity.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java
index b934df81..a80b3b85 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PlanBuilder.java
@@ -125,8 +125,8 @@ public final PlanBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PossibleWorld} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfPossibleWorld}.
+     * {@link PossibleWorld} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfPossibleWorld}.
      *
      * @param classOfPossibleWorld The ClassOfPossibleWorld.
      * @return This builder.
@@ -138,8 +138,8 @@ public final PlanBuilder member_Of(final ClassOfPossibleWorld classOfPossibleWor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link KindOfIndividual}.
+     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link KindOfIndividual}.
      *
      * @param kindOfIndividual The KindOfIndividual.
      * @return This builder.
@@ -165,13 +165,12 @@ public final PlanBuilder part__Of(final SpatioTemporalExtent spatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -198,16 +197,15 @@ public final PlanBuilder temporal__Part_Of(final SpatioTemporalExtent spatioTemp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java
index 264e6fca..f44494dc 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PointInTimeBuilder.java
@@ -145,13 +145,12 @@ public final PointInTimeBuilder part__Of(final SpatioTemporalExtent spatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java
index 5f4bc048..e2f0f000 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PositionBuilder.java
@@ -138,8 +138,8 @@ public final PositionBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link Position} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link ClassOfPosition}.
+     * {@link Position} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link ClassOfPosition}.
      *
      * @param classOfPosition The ClassOfPosition.
      * @return This builder.
@@ -151,8 +151,8 @@ public final PositionBuilder member_Of(final ClassOfPosition classOfPosition) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where a
-     * {@link Position} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link KindOfPosition}.
+     * {@link Position} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link KindOfPosition}.
      *
      * @param kindOfPosition The KindOfPosition.
      * @return This builder.
@@ -178,13 +178,12 @@ public final PositionBuilder part__Of(final SpatioTemporalExtent spatioTemporalE
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java
index 19d52e42..8b9d7402 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PossibleWorldBuilder.java
@@ -124,8 +124,8 @@ public final PossibleWorldBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link PossibleWorld} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfPossibleWorld}.
+     * {@link PossibleWorld} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfPossibleWorld}.
      *
      * @param classOfPossibleWorld The ClassOfPossibleWorld.
      * @return This builder.
@@ -137,8 +137,8 @@ public final PossibleWorldBuilder member_Of(final ClassOfPossibleWorld classOfPo
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where an
-     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link KindOfIndividual}.
+     * {@link Individual} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link KindOfIndividual}.
      *
      * @param kindOfIndividual The KindOfIndividual.
      * @return This builder.
@@ -164,13 +164,12 @@ public final PossibleWorldBuilder part__Of(final SpatioTemporalExtent spatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -197,16 +196,15 @@ public final PossibleWorldBuilder temporal__Part_Of(final SpatioTemporalExtent s
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java
index 13bbfbd3..05850801 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/PriceBuilder.java
@@ -47,11 +47,10 @@ public PriceBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final PriceBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java
index bddeb1ff..4161ed4e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductBrandBuilder.java
@@ -47,11 +47,10 @@ public ProductBrandBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -116,8 +115,7 @@ public final ProductBrandBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java
index 24e8c69d..626450e9 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ProductOfferingBuilder.java
@@ -83,11 +83,10 @@ public final ProductOfferingBuilder consideration_By_Class_M(final Price price)
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -165,8 +164,7 @@ public final ProductOfferingBuilder offeror_M(final Party party) {
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
@@ -200,8 +198,7 @@ public final ProductOfferingBuilder part_Of_By_Class(
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.model.ClassOfSociallyConstructedActivity} may be a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfAgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link ClassOfAgreementExecution}.
      *
      * @param classOfAgreementExecution The ClassOfAgreementExecution.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java
index f801b47a..6b8b5a2b 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/ReachingAgreementBuilder.java
@@ -184,8 +184,8 @@ public final ReachingAgreementBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link ReachingAgreement} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfReachingAgreement}.
+     * {@link ReachingAgreement} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfReachingAgreement}.
      *
      * @param classOfReachingAgreement The ClassOfReachingAgreement.
      * @return This builder.
@@ -224,8 +224,8 @@ public final ReachingAgreementBuilder part__Of(final SpatioTemporalExtent spatio
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link ReachingAgreement} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * exactly one {@link AgreementProcess}.
+     * {@link ReachingAgreement} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly
+     * one {@link AgreementProcess}.
      *
      * @param agreementProcess The AgreementProcess.
      * @return This builder.
@@ -238,8 +238,7 @@ public final ReachingAgreementBuilder part_Of_M(final AgreementProcess agreement
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -251,13 +250,12 @@ public final ReachingAgreementBuilder part_Of_(final AgreementExecution agreemen
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -295,16 +293,15 @@ public final ReachingAgreementBuilder temporal__Part_Of(final SpatioTemporalExte
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java
index c94c0817..3b0a9009 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RecognizingLanguageCommunityBuilder.java
@@ -170,13 +170,12 @@ public final RecognizingLanguageCommunityBuilder part__Of(final SpatioTemporalEx
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationByPatternBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationByPatternBuilder.java
index 62798b3f..d3155d95 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationByPatternBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationByPatternBuilder.java
@@ -43,9 +43,9 @@ public RepresentationByPatternBuilder(final IRI iri) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link RepresentationByPattern} has a {@link uk.gov.gchq.magmacore.hqdm.model.Sign} that is a
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_BY_CLASS} relationship type where a
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link RepresentationByPattern} has
+     * a {@link uk.gov.gchq.magmacore.hqdm.model.Sign} that is a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link Pattern}.
      *
      * @param pattern The Pattern.
@@ -74,8 +74,7 @@ public final RepresentationByPatternBuilder consists_Of_In_Members_M(
 
     /**
      * A relationship type where the {@link Thing} is represented by each
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
-     * {@link RepresentationByPattern}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the {@link RepresentationByPattern}.
      *
      * @param thing The Thing.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java
index 9fb3d7ce..c6a9c904 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RepresentationBySignBuilder.java
@@ -109,8 +109,8 @@ public final RepresentationBySignBuilder consists__Of(final SpatioTemporalExtent
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} relationship type where one or
-     * more {@link Sign} is used in the {@link RepresentationBySign}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} relationship type where one or more
+     * {@link Sign} is used in the {@link RepresentationBySign}.
      *
      * @param sign The Sign.
      * @return This builder.
@@ -175,9 +175,8 @@ public final RepresentationBySignBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where the
-     * {@link RepresentationBySign} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfRepresentation}.
+     * {@link RepresentationBySign} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfRepresentation}.
      *
      * @param classOfRepresentation The ClassOfRepresentation.
      * @return This builder.
@@ -189,9 +188,8 @@ public final RepresentationBySignBuilder member_Of(final ClassOfRepresentation c
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where the
-     * {@link RepresentationBySign} must be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} exactly one
-     * {@link RepresentationByPattern}.
+     * {@link RepresentationBySign} must be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * exactly one {@link RepresentationByPattern}.
      *
      * @param representationByPattern The RepresentationByPattern.
      * @return This builder.
@@ -204,8 +202,7 @@ public final RepresentationBySignBuilder member_Of__M(final RepresentationByPatt
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF_KIND} relationship type where each
      * {@link uk.gov.gchq.magmacore.hqdm.model.Association} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link KindOfAssociation}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more {@link KindOfAssociation}.
      *
      * @param kindOfAssociation The KindOfAssociation.
      * @return This builder.
@@ -231,13 +228,12 @@ public final RepresentationBySignBuilder part__Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -275,16 +271,15 @@ public final RepresentationBySignBuilder temporal__Part_Of(final SpatioTemporalE
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java
index f19db0db..14f67cb5 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementBuilder.java
@@ -163,8 +163,8 @@ public final RequirementBuilder part__Of(final SpatioTemporalExtent spatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link Requirement} must be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or
-     * more {@link Plan}.
+     * {@link Requirement} must be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
+     * {@link Plan}.
      *
      * @param plan The Plan.
      * @return This builder.
@@ -176,13 +176,12 @@ public final RequirementBuilder part_Of_Plan_M(final Plan plan) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java
index fe2ab0d5..55f00ba2 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RequirementSpecificationBuilder.java
@@ -49,11 +49,10 @@ public RequirementSpecificationBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -80,8 +79,7 @@ public final RequirementSpecificationBuilder has_Superclass(final Class clazz) {
 
     /**
      * A subtype_of relationship type where each {@link RequirementSpecification} is the
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#INTERSECTION_OF} one or more
-     * {@link ClassOfState}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#INTERSECTION_OF} one or more {@link ClassOfState}.
      *
      * @param classOfState The ClassOfState.
      * @return This builder.
@@ -133,8 +131,7 @@ public final RequirementSpecificationBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java
index f7414ee3..0216e4a3 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/RoleBuilder.java
@@ -51,11 +51,10 @@ public RoleBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -120,8 +119,7 @@ public final RoleBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java
index 68dda81f..3fd7aa83 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SaleOfGoodsBuilder.java
@@ -200,9 +200,9 @@ public final SaleOfGoodsBuilder member__Of(final Class clazz) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * contract process may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
-     * more {@link ClassOfContractProcess}.
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a contract
+     * process may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
+     * {@link ClassOfContractProcess}.
      *
      * @param classOfContractProcess The ClassOfContractProcess.
      * @return This builder.
@@ -242,8 +242,7 @@ public final SaleOfGoodsBuilder part__Of(final SpatioTemporalExtent spatioTempor
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedActivity} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link ReachingAgreement}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link ReachingAgreement}.
      *
      * @param reachingAgreement The ReachingAgreement.
      * @return This builder.
@@ -256,8 +255,7 @@ public final SaleOfGoodsBuilder part_Of(final ReachingAgreement reachingAgreemen
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -269,13 +267,12 @@ public final SaleOfGoodsBuilder part_Of_(final AgreementExecution agreementExecu
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -314,16 +311,15 @@ public final SaleOfGoodsBuilder temporal__Part_Of(final SpatioTemporalExtent spa
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java
index 001db230..f29fa3e6 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductBuilder.java
@@ -51,11 +51,10 @@ public SalesProductBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -82,9 +81,8 @@ public final SalesProductBuilder has_Superclass(final Class clazz) {
     /**
      * A subclass_of relationship type where when a {@link SalesProduct}
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEETS_SPECIFICATION} of a
-     * {@link RequirementSpecification}, each
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a {@link SalesProduct} is a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
+     * {@link RequirementSpecification}, each {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * a {@link SalesProduct} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} the
      * {@link RequirementSpecification}.
      *
      * @param requirementSpecification The RequirementSpecification.
@@ -137,8 +135,7 @@ public final SalesProductBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java
index 7609fe4c..07e7609e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductInstanceBuilder.java
@@ -137,9 +137,8 @@ public final SalesProductInstanceBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link SalesProductInstance} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfSalesProductInstance}.
+     * {@link SalesProductInstance} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfSalesProductInstance}.
      *
      * @param classOfSalesProductInstance The ClassOfSalesProductInstance.
      * @return This builder.
@@ -181,13 +180,12 @@ public final SalesProductInstanceBuilder part__Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java
index cb5ed468..4774b868 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SalesProductVersionBuilder.java
@@ -50,11 +50,10 @@ public SalesProductVersionBuilder(final IRI iri) {
     }
 
     /**
-     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship
-     * type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * {@link ClassOfSpatioTemporalExtent}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF} another
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
+     * An inverse {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART__OF_BY_CLASS} relationship type
+     * where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * {@link ClassOfSpatioTemporalExtent} {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF}
+     * another {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
      * {@link ClassOfSpatioTemporalExtent}.
      *
      * @param classOfSpatioTemporalExtent The ClassOfSpatioTemporalExtent.
@@ -121,8 +120,7 @@ public final SalesProductVersionBuilder member_Of_(
 
     /**
      * A relationship type where a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} a
-     * {@link ClassOfSpatioTemporalExtent} is
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
+     * {@link ClassOfSpatioTemporalExtent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} a
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} some
      * {@link ClassOfSpatioTemporalExtent}.
      *
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java
index 57106df2..d7e98606 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SignBuilder.java
@@ -183,13 +183,12 @@ public final SignBuilder part__Of(final SpatioTemporalExtent spatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -229,16 +228,15 @@ public final SignBuilder temporal__Part_Of(final SpatioTemporalExtent spatioTemp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java
index f3b3d610..52cff20a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedActivityBuilder.java
@@ -229,8 +229,7 @@ public final SociallyConstructedActivityBuilder part__Of(final SpatioTemporalExt
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link SociallyConstructedActivity} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link ReachingAgreement}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link ReachingAgreement}.
      *
      * @param reachingAgreement The ReachingAgreement.
      * @return This builder.
@@ -243,8 +242,7 @@ public final SociallyConstructedActivityBuilder part_Of(final ReachingAgreement
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -256,13 +254,12 @@ public final SociallyConstructedActivityBuilder part_Of_(final AgreementExecutio
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -302,16 +299,15 @@ public final SociallyConstructedActivityBuilder temporal__Part_Of(final SpatioTe
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java
index dd969e95..b9aba10f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SociallyConstructedObjectBuilder.java
@@ -169,13 +169,12 @@ public final SociallyConstructedObjectBuilder part__Of(final SpatioTemporalExten
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -203,16 +202,15 @@ public final SociallyConstructedObjectBuilder temporal__Part_Of(final SpatioTemp
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java
index 85dfe5c7..01ef4ce4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SpatioTemporalExtentBuilder.java
@@ -137,8 +137,8 @@ public final SpatioTemporalExtentBuilder part__Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * @param possibleWorld The PossibleWorld.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java
index de22c8c6..4a630e69 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateBuilder.java
@@ -147,13 +147,12 @@ public final StateBuilder part__Of(final SpatioTemporalExtent spatioTemporalExte
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,13 +178,13 @@ public final StateBuilder temporal__Part_Of(final SpatioTemporalExtent spatioTem
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link State} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one
-     * or more {@link Individual}.
+     * {@link State} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or
+     * more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} {@link State} as well as
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} {@link State} as well as
      * {@link Individual}. This applies to all subtypes of
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
      * {@code state_of_X} and {@code X}.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java
index 11ac849f..da70d820 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfActivityBuilder.java
@@ -121,8 +121,8 @@ public final StateOfActivityBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfActivity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfStateOfActivity}.
+     * {@link StateOfActivity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfStateOfActivity}.
      *
      * @param classOfStateOfActivity The ClassOfStateOfActivity.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfActivityBuilder part__Of(final SpatioTemporalExtent spatioTe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,9 +178,8 @@ public final StateOfActivityBuilder temporal__Part_Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfActivity} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Activity}.
+     * {@link StateOfActivity} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link Activity}.
      *
      * @param activity The Activity.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java
index 49de801e..5e4d2a94 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAmountOfMoneyBuilder.java
@@ -121,9 +121,8 @@ public final StateOfAmountOfMoneyBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfAmountOfMoney} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfStateOfAmountOfMoney}.
+     * {@link StateOfAmountOfMoney} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfStateOfAmountOfMoney}.
      *
      * @param classOfStateOfAmountOfMoney The ClassOfStateOfAmountOfMoney.
      * @return This builder.
@@ -149,13 +148,12 @@ public final StateOfAmountOfMoneyBuilder part__Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java
index f6646d79..e1d83e63 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfAssociationBuilder.java
@@ -121,8 +121,8 @@ public final StateOfAssociationBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfAssociation} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfStateOfAssociation}.
+     * {@link StateOfAssociation} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
+     * or more {@link ClassOfStateOfAssociation}.
      *
      * @param classOfStateOfAssociation The ClassOfStateOfAssociation.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfAssociationBuilder part__Of(final SpatioTemporalExtent spati
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -180,8 +179,7 @@ public final StateOfAssociationBuilder temporal__Part_Of(final SpatioTemporalExt
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link StateOfAssociation} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Association}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Association}.
      *
      * @param association The Association.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java
index 7dc1b7dd..933a63b0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalObjectBuilder.java
@@ -150,13 +150,12 @@ public final StateOfBiologicalObjectBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java
index 60e966e7..a87feeeb 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemBuilder.java
@@ -150,13 +150,12 @@ public final StateOfBiologicalSystemBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java
index 00f9ef1f..2954e3fe 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfBiologicalSystemComponentBuilder.java
@@ -155,13 +155,12 @@ public final StateOfBiologicalSystemComponentBuilder part__Of(final SpatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java
index d290a853..3e963013 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalObjectBuilder.java
@@ -150,13 +150,12 @@ public final StateOfFunctionalObjectBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java
index fd4f7c8a..d79a0811 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemBuilder.java
@@ -150,13 +150,12 @@ public final StateOfFunctionalSystemBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java
index 28654ef5..df35f6b8 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfFunctionalSystemComponentBuilder.java
@@ -155,13 +155,12 @@ public final StateOfFunctionalSystemComponentBuilder part__Of(final SpatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java
index c9442a1d..26b2650e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfIntentionallyConstructedObjectBuilder.java
@@ -159,13 +159,12 @@ public final StateOfIntentionallyConstructedObjectBuilder part__Of(
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java
index 84850664..3c635b30 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfLanguageCommunityBuilder.java
@@ -149,13 +149,12 @@ public final StateOfLanguageCommunityBuilder part__Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java
index c5cb9c1f..a1deb686 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryBiologicalObjectBuilder.java
@@ -155,13 +155,12 @@ public final StateOfOrdinaryBiologicalObjectBuilder part__Of(final SpatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java
index 9cb502b4..0b5beab4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryFunctionalObjectBuilder.java
@@ -155,13 +155,12 @@ public final StateOfOrdinaryFunctionalObjectBuilder part__Of(final SpatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java
index 04b0afa1..a420405a 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrdinaryPhysicalObjectBuilder.java
@@ -152,13 +152,12 @@ public final StateOfOrdinaryPhysicalObjectBuilder part__Of(final SpatioTemporalE
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java
index c252d6cc..755e03b9 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationBuilder.java
@@ -121,9 +121,8 @@ public final StateOfOrganizationBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfOrganization} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfStateOfOrganization}.
+     * {@link StateOfOrganization} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfStateOfOrganization}.
      *
      * @param classOfStateOfOrganization The ClassOfStateOfOrganization.
      * @return This builder.
@@ -149,13 +148,12 @@ public final StateOfOrganizationBuilder part__Of(final SpatioTemporalExtent spat
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java
index b337ffa5..f2ee3b90 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfOrganizationComponentBuilder.java
@@ -151,13 +151,12 @@ public final StateOfOrganizationComponentBuilder part__Of(final SpatioTemporalEx
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java
index 9d3ad38f..440087d5 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPartyBuilder.java
@@ -121,8 +121,8 @@ public final StateOfPartyBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfParty} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfStateOfParty}.
+     * {@link StateOfParty} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfStateOfParty}.
      *
      * @param classOfStateOfParty The ClassOfStateOfParty.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfPartyBuilder part__Of(final SpatioTemporalExtent spatioTempo
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,8 +178,8 @@ public final StateOfPartyBuilder temporal__Part_Of(final SpatioTemporalExtent sp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfParty} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Party}.
+     * {@link StateOfParty} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link Party}.
      *
      * @param party The Party.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java
index fc472629..9af81077 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPersonBuilder.java
@@ -121,8 +121,8 @@ public final StateOfPersonBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfPerson} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfStateOfPerson}.
+     * {@link StateOfPerson} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfStateOfPerson}.
      *
      * @param classOfStateOfPerson The ClassOfStateOfPerson.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfPersonBuilder part__Of(final SpatioTemporalExtent spatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,8 +178,8 @@ public final StateOfPersonBuilder temporal__Part_Of(final SpatioTemporalExtent s
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfPerson} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Person}.
+     * {@link StateOfPerson} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link Person}.
      *
      * @param person The Person.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java
index 7764c06e..f731d96d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPhysicalObjectBuilder.java
@@ -121,9 +121,8 @@ public final StateOfPhysicalObjectBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfPhysicalObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfStateOfPhysicalObject}.
+     * {@link StateOfPhysicalObject} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfStateOfPhysicalObject}.
      *
      * @param classOfStateOfPhysicalObject The ClassOfStateOfPhysicalObject.
      * @return This builder.
@@ -149,13 +148,12 @@ public final StateOfPhysicalObjectBuilder part__Of(final SpatioTemporalExtent sp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java
index a534e662..d4e6e220 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfPositionBuilder.java
@@ -121,8 +121,8 @@ public final StateOfPositionBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfPosition} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfStateOfPosition}.
+     * {@link StateOfPosition} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfStateOfPosition}.
      *
      * @param classOfStateOfPosition The ClassOfStateOfPosition.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfPositionBuilder part__Of(final SpatioTemporalExtent spatioTe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,9 +178,8 @@ public final StateOfPositionBuilder temporal__Part_Of(final SpatioTemporalExtent
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfPosition} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Position}.
+     * {@link StateOfPosition} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link Position}.
      *
      * @param position The Position.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java
index 2efa7c37..9b1af216 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSalesProductInstanceBuilder.java
@@ -151,13 +151,12 @@ public final StateOfSalesProductInstanceBuilder part__Of(final SpatioTemporalExt
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java
index d124029c..4a867db0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSignBuilder.java
@@ -147,13 +147,12 @@ public final StateOfSignBuilder part__Of(final SpatioTemporalExtent spatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,8 +178,8 @@ public final StateOfSignBuilder temporal__Part_Of(final SpatioTemporalExtent spa
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfSign} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
-     * one or more {@link Sign}.
+     * {@link StateOfSign} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one
+     * or more {@link Sign}.
      *
      * @param sign The Sign.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java
index 8beb9615..111f09bb 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedActivityBuilder.java
@@ -157,13 +157,12 @@ public final StateOfSociallyConstructedActivityBuilder part__Of(final SpatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java
index 27d5a47d..bc320121 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSociallyConstructedObjectBuilder.java
@@ -155,13 +155,12 @@ public final StateOfSociallyConstructedObjectBuilder part__Of(final SpatioTempor
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java
index 3428acef..e39859d2 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemBuilder.java
@@ -121,8 +121,8 @@ public final StateOfSystemBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one
-     * or more {@link ClassOfStateOfSystem}.
+     * {@link StateOfSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfStateOfSystem}.
      *
      * @param classOfStateOfSystem The ClassOfStateOfSystem.
      * @return This builder.
@@ -147,13 +147,12 @@ public final StateOfSystemBuilder part__Of(final SpatioTemporalExtent spatioTemp
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -179,8 +178,8 @@ public final StateOfSystemBuilder temporal__Part_Of(final SpatioTemporalExtent s
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link StateOfSystem} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link System}.
+     * {@link StateOfSystem} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
+     * one or more {@link System}.
      *
      * @param system The System.
      * @return This builder.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java
index 69eb6b17..f5b93d2d 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/StateOfSystemComponentBuilder.java
@@ -121,9 +121,8 @@ public final StateOfSystemComponentBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link StateOfSystemComponent} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or more
-     * {@link ClassOfStateOfSystemComponent}.
+     * {@link StateOfSystemComponent} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * one or more {@link ClassOfStateOfSystemComponent}.
      *
      * @param classOfStateOfSystemComponent The ClassOfStateOfSystemComponent.
      * @return This builder.
@@ -149,13 +148,12 @@ public final StateOfSystemComponentBuilder part__Of(final SpatioTemporalExtent s
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java
index f7ba218d..b7fd6fe0 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemBuilder.java
@@ -163,13 +163,12 @@ public final SystemBuilder part__Of(final SpatioTemporalExtent spatioTemporalExt
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java
index 22645264..fb1738ff 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/SystemComponentBuilder.java
@@ -87,8 +87,8 @@ public final SystemComponentBuilder beginning(final Event event) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where each
-     * {@link SystemComponent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly
-     * one {@link System}.
+     * {@link SystemComponent} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} exactly one
+     * {@link System}.
      *
      * @param system The System.
      * @return This builder.
@@ -139,8 +139,8 @@ public final SystemComponentBuilder member__Of(final Class clazz) {
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} relationship type where a
-     * {@link SystemComponent} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
-     * one or more {@link ClassOfSystemComponent}.
+     * {@link SystemComponent} may be a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF} one or
+     * more {@link ClassOfSystemComponent}.
      *
      * @param classOfSystemComponent The ClassOfSystemComponent.
      * @return This builder.
@@ -180,13 +180,12 @@ public final SystemComponentBuilder part__Of(final SpatioTemporalExtent spatioTe
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -213,16 +212,15 @@ public final SystemComponentBuilder temporal__Part_Of(final SpatioTemporalExtent
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java
index e609a097..faa50e85 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipBuilder.java
@@ -115,8 +115,7 @@ public final TransferOfOwnershipBuilder causes_M(final Event event) {
 
     /**
      * A causes relationship type where a {@link TransferOfOwnership}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CAUSES} exactly one
-     * {@link BeginningOfOwnership}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CAUSES} exactly one {@link BeginningOfOwnership}.
      *
      * @param beginningOfOwnership The BeginningOfOwnership.
      * @return This builder.
@@ -167,8 +166,8 @@ public final TransferOfOwnershipBuilder consists_Of(final Activity activity) {
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where a {@link TransferOfOwnership}
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * a {@link TransferOfOwnership}
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
      * {@link Transferor}.
      *
@@ -181,8 +180,8 @@ public final TransferOfOwnershipBuilder consists_Of_Participant(final Transferor
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where a {@link TransferOfOwnership}
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * a {@link TransferOfOwnership}
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
      * {@link Transferee}.
      *
@@ -274,8 +273,8 @@ public final TransferOfOwnershipBuilder part__Of(final SpatioTemporalExtent spat
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link TransferOfOwnership} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * not more than one {@link ExchangeOfGoodsAndMoney}.
+     * {@link TransferOfOwnership} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} not
+     * more than one {@link ExchangeOfGoodsAndMoney}.
      *
      * @param exchangeOfGoodsAndMoney The ExchangeOfGoodsAndMoney.
      * @return This builder.
@@ -288,8 +287,7 @@ public final TransferOfOwnershipBuilder part_Of(final ExchangeOfGoodsAndMoney ex
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -301,13 +299,12 @@ public final TransferOfOwnershipBuilder part_Of_(final AgreementExecution agreem
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -346,16 +343,15 @@ public final TransferOfOwnershipBuilder temporal__Part_Of(final SpatioTemporalEx
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java
index f2b563f5..bb46344e 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferOfOwnershipOfMoneyBuilder.java
@@ -116,8 +116,7 @@ public final TransferOfOwnershipOfMoneyBuilder causes_M(final Event event) {
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CAUSES} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.TransferOfOwnership}
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CAUSES} exactly one
-     * {@link BeginningOfOwnership}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CAUSES} exactly one {@link BeginningOfOwnership}.
      *
      * @param beginningOfOwnership The BeginningOfOwnership.
      * @return This builder.
@@ -170,8 +169,8 @@ public final TransferOfOwnershipOfMoneyBuilder consists_Of(final Activity activi
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.model.TransferOfOwnership}
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * a {@link uk.gov.gchq.magmacore.hqdm.model.TransferOfOwnership}
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
      * {@link Transferor}.
      *
@@ -184,8 +183,8 @@ public final TransferOfOwnershipOfMoneyBuilder consists_Of_Participant(final Tra
     }
 
     /**
-     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type
-     * where a {@link uk.gov.gchq.magmacore.hqdm.model.TransferOfOwnership}
+     * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} relationship type where
+     * a {@link uk.gov.gchq.magmacore.hqdm.model.TransferOfOwnership}
      * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#CONSISTS_OF_PARTICIPANT} exactly one
      * {@link Transferee}.
      *
@@ -292,8 +291,7 @@ public final TransferOfOwnershipOfMoneyBuilder part_Of(final ExchangeOfGoodsAndM
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.SociallyConstructedObject} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more
-     * {@link AgreementExecution}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one or more {@link AgreementExecution}.
      *
      * @param agreementExecution The AgreementExecution.
      * @return This builder.
@@ -305,13 +303,12 @@ public final TransferOfOwnershipOfMoneyBuilder part_Of_(final AgreementExecution
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -351,16 +348,15 @@ public final TransferOfOwnershipOfMoneyBuilder temporal__Part_Of(final SpatioTem
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} may be a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more
-     * {@link Individual}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} one or more {@link Individual}.
      *
      * <p>
      * Note: The relationship is optional because an {@link Individual} is not necessarily a
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual},
-     * yet is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} another {@link Individual}, yet
+     * is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#MEMBER_OF}
      * {@link uk.gov.gchq.magmacore.hqdm.model.State} as well as {@link Individual}. This applies to all
-     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between
-     * a {@code state_of_X} and {@code X}.
+     * subtypes of {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} that are between a
+     * {@code state_of_X} and {@code X}.
      * </p>
      *
      * @param individual The Individual.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java
index a9c24990..2864760f 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransfereeBuilder.java
@@ -167,13 +167,12 @@ public final TransfereeBuilder part__Of(final SpatioTemporalExtent spatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
diff --git a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java
index 6f1d742a..be4202a4 100644
--- a/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java
+++ b/hqdm-canonical/src/main/java/uk/gov/gchq/magmacore/hqdm/rdfbuilders/TransferorBuilder.java
@@ -167,13 +167,12 @@ public final TransferorBuilder part__Of(final SpatioTemporalExtent spatioTempora
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} relationship type where a
-     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF}
-     * one or more {@link PossibleWorld}.
+     * {@link SpatioTemporalExtent} may be {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} one
+     * or more {@link PossibleWorld}.
      *
      * <p>
      * Note: The relationship is optional because a {@link PossibleWorld} is not
-     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other
-     * {@link SpatioTemporalExtent}.
+     * {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PART_OF} any other {@link SpatioTemporalExtent}.
      * </p>
      *
      * @param possibleWorld The PossibleWorld.
@@ -186,8 +185,8 @@ public final TransferorBuilder part_Of_Possible_World_M(final PossibleWorld poss
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} relationship type where a
-     * {@link Transferor} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} one or
-     * more {@link TransferOfOwnership}.
+     * {@link Transferor} is {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#PARTICIPANT_IN} one or more
+     * {@link TransferOfOwnership}.
      *
      * @param transferOfOwnership The TransferOfOwnership.
      * @return This builder.
@@ -212,8 +211,8 @@ public final TransferorBuilder temporal__Part_Of(final SpatioTemporalExtent spat
 
     /**
      * A {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} relationship type where a
-     * {@link Transferor} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF}
-     * exactly one {@link Owner}.
+     * {@link Transferor} is a {@link uk.gov.gchq.magmacore.hqdm.rdf.iri.HQDM#TEMPORAL_PART_OF} exactly
+     * one {@link Owner}.
      *
      * @param owner The Owner.
      * @return This builder.
diff --git a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/services/ClassServices.java b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/services/ClassServices.java
index 13c91a5a..6d6d76c6 100644
--- a/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/services/ClassServices.java
+++ b/hqdm/src/main/java/uk/gov/gchq/magmacore/hqdm/services/ClassServices.java
@@ -731,8 +731,7 @@ public static ClassOfStateOfFunctionalSystem createClassOfStateOfFunctionalSyste
      */
     public static ClassOfStateOfFunctionalSystemComponent createClassOfStateOfFunctionalSystemComponent(
             final IRI id) {
-        final ClassOfStateOfFunctionalSystemComponent result = 
-            new ClassOfStateOfFunctionalSystemComponentImpl(id);
+        final ClassOfStateOfFunctionalSystemComponent result = new ClassOfStateOfFunctionalSystemComponentImpl(id);
         result.addValue(RDFS.RDF_TYPE, HQDM.CLASS_OF_STATE_OF_FUNCTIONAL_SYSTEM_COMPONENT);
         return result;
     }
@@ -745,8 +744,8 @@ public static ClassOfStateOfFunctionalSystemComponent createClassOfStateOfFuncti
      */
     public static ClassOfStateOfIntentionallyConstructedObject createClassOfStateOfIntentionallyConstructedObject(
             final IRI id) {
-        final ClassOfStateOfIntentionallyConstructedObject result = 
-            new ClassOfStateOfIntentionallyConstructedObjectImpl(id);
+        final ClassOfStateOfIntentionallyConstructedObject result = new ClassOfStateOfIntentionallyConstructedObjectImpl(
+                id);
         result.addValue(RDFS.RDF_TYPE, HQDM.CLASS_OF_STATE_OF_INTENTIONALLY_CONSTRUCTED_OBJECT);
         return result;
     }