diff --git a/packages/schema-converter-shex/src/context/JsonLdContextBuilder.ts b/packages/schema-converter-shex/src/context/JsonLdContextBuilder.ts
index e61ffdf..bd99c0d 100644
--- a/packages/schema-converter-shex/src/context/JsonLdContextBuilder.ts
+++ b/packages/schema-converter-shex/src/context/JsonLdContextBuilder.ts
@@ -9,12 +9,14 @@ import { hashValueSetValue } from "./util/hashValueSetValue.js";
 export function iriToName(iri: string): string {
   try {
     const url = new URL(iri);
+    let name: string
     if (url.hash) {
-      return url.hash.slice(1);
+      name = url.hash.slice(1);
     } else {
       const splitPathname = url.pathname.split("/");
-      return splitPathname[splitPathname.length - 1];
+      name = splitPathname[splitPathname.length - 1];
     }
+    return name.replace(/(?<!^)Shape$/, '')
   } catch (err) {
     return iri;
   }
diff --git a/packages/schema-converter-shex/test/testData/andSimple.ts b/packages/schema-converter-shex/test/testData/andSimple.ts
index 019321f..0840b73 100644
--- a/packages/schema-converter-shex/test/testData/andSimple.ts
+++ b/packages/schema-converter-shex/test/testData/andSimple.ts
@@ -65,5 +65,5 @@ export const andSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainerShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    videoImage: VideoShape & ImageShape;\n}\n\nexport interface VideoShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface ImageShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    videoImage: Video & Image;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/circular.ts b/packages/schema-converter-shex/test/testData/circular.ts
index 8612d57..886bea5 100644
--- a/packages/schema-converter-shex/test/testData/circular.ts
+++ b/packages/schema-converter-shex/test/testData/circular.ts
@@ -71,5 +71,5 @@ export const circular: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface ParentShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Parent";\n    }>;\n    hasChild: ChildShape;\n}\n\nexport interface ChildShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Child";\n    }>;\n    hasParent: ParentShape;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Parent {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Parent";\n    }>;\n    hasChild: Child;\n}\n\nexport interface Child {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type?: LdSet<{\n        "@id": "Child";\n    }>;\n    hasParent: Parent;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/eachOfAndSimple.ts b/packages/schema-converter-shex/test/testData/eachOfAndSimple.ts
index ed192df..d4983dc 100644
--- a/packages/schema-converter-shex/test/testData/eachOfAndSimple.ts
+++ b/packages/schema-converter-shex/test/testData/eachOfAndSimple.ts
@@ -56,5 +56,5 @@ export const eachOfAndSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainerShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n}\n\nexport interface VideoShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface ImageShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/extendsSimple.ts b/packages/schema-converter-shex/test/testData/extendsSimple.ts
index bc0ae4f..b391d00 100644
--- a/packages/schema-converter-shex/test/testData/extendsSimple.ts
+++ b/packages/schema-converter-shex/test/testData/extendsSimple.ts
@@ -79,5 +79,5 @@ export const extendsSimple: TestData = {
     employeeNumber: "https://example.com/employeeNumber",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface EntityShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface PersonShape {\n    "@id"?: LdSet<string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface EmployeeShape {\n    "@id"?: LdSet<string | string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: LdSet<string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: LdSet<string | string | string>;\n    "@context"?: LdSet<LdoJsonldContext | LdoJsonldContext | LdoJsonldContext>;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/multipleSharedPredicates.ts b/packages/schema-converter-shex/test/testData/multipleSharedPredicates.ts
index f9245fe..ebb1c5a 100644
--- a/packages/schema-converter-shex/test/testData/multipleSharedPredicates.ts
+++ b/packages/schema-converter-shex/test/testData/multipleSharedPredicates.ts
@@ -56,5 +56,5 @@ export const multipleSharedPredicates: TestData = {
     Thing3: "https://example.com/Thing3",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainerShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Media";\n    } | {\n        "@id": "Video";\n    }>;\n    something: LdSet<{\n        "@id": "OtherThing";\n    } | {\n        "@id": "Thing3";\n    }>;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Media";\n    } | {\n        "@id": "Video";\n    }>;\n    something: LdSet<{\n        "@id": "OtherThing";\n    } | {\n        "@id": "Thing3";\n    }>;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/oldExtends.ts b/packages/schema-converter-shex/test/testData/oldExtends.ts
index 5aeebff..08bd89b 100644
--- a/packages/schema-converter-shex/test/testData/oldExtends.ts
+++ b/packages/schema-converter-shex/test/testData/oldExtends.ts
@@ -84,5 +84,5 @@ export const oldExtends: TestData = {
     employeeNumber: "https://example.com/employeeNumber",
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface EntityShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface PersonShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface EmployeeShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Entity {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    }>;\n    entityId: any;\n}\n\nexport interface Person {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    }>;\n    entityId: any;\n    name: any;\n}\n\nexport interface Employee {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Entity";\n    } | {\n        "@id": "Person";\n    } | {\n        "@id": "Employee";\n    }>;\n    entityId: any;\n    name: any;\n    employeeNumber: any;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/orSimple.ts b/packages/schema-converter-shex/test/testData/orSimple.ts
index 9f9613e..55dadcf 100644
--- a/packages/schema-converter-shex/test/testData/orSimple.ts
+++ b/packages/schema-converter-shex/test/testData/orSimple.ts
@@ -76,5 +76,5 @@ export const orSimple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainerShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    primaryMedia: VideoShape | ImageShape;\n    media?: LdSet<VideoShape | ImageShape>;\n}\n\nexport interface VideoShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface ImageShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface MediaContainer {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "MediaContainer";\n    }>;\n    primaryMedia: Video | Image;\n    media?: LdSet<Video | Image>;\n}\n\nexport interface Video {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Video";\n    }>;\n}\n\nexport interface Image {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Image";\n    }>;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/profile.ts b/packages/schema-converter-shex/test/testData/profile.ts
index 8b479c0..58afd93 100644
--- a/packages/schema-converter-shex/test/testData/profile.ts
+++ b/packages/schema-converter-shex/test/testData/profile.ts
@@ -832,5 +832,5 @@ srs:RSAPublicKeyShape {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface SolidProfileShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * Defines the node as a Person (from Schema.org) | Defines the node as a Person (from foaf)\n     */\n    type: LdSet<{\n        "@id": "Person";\n    } | {\n        "@id": "Person2";\n    }>;\n    /**\n     * The formatted name of a person. Example: John Smith\n     */\n    fn?: string;\n    /**\n     * An alternate way to define a person\'s name.\n     */\n    name?: string;\n    /**\n     * The person\'s street address.\n     */\n    hasAddress?: LdSet<AddressShape>;\n    /**\n     * The person\'s email.\n     */\n    hasEmail?: LdSet<EmailShape>;\n    /**\n     * A link to the person\'s photo\n     */\n    hasPhoto?: {\n        "@id": string;\n    };\n    /**\n     * Photo link but in string form\n     */\n    img?: string;\n    /**\n     * Person\'s telephone number\n     */\n    hasTelephone?: LdSet<PhoneNumberShape>;\n    /**\n     * An alternative way to define a person\'s telephone number using a string\n     */\n    phone?: string;\n    /**\n     * The name of the organization with which the person is affiliated\n     */\n    organizationName?: string;\n    /**\n     * The name of the person\'s role in their organization\n     */\n    role?: string;\n    /**\n     * A list of app origins that are trusted by this user\n     */\n    trustedApp?: LdSet<TrustedAppShape>;\n    /**\n     * A list of RSA public keys that are associated with private keys the user holds.\n     */\n    key?: LdSet<RSAPublicKeyShape>;\n    /**\n     * The user\'s LDP inbox to which apps can post notifications\n     */\n    inbox: {\n        "@id": string;\n    };\n    /**\n     * The user\'s preferences\n     */\n    preferencesFile?: {\n        "@id": string;\n    };\n    /**\n     * The location of a Solid storage server related to this WebId\n     */\n    storage?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * The user\'s account\n     */\n    account?: {\n        "@id": string;\n    };\n    /**\n     * A registry of all types used on the user\'s Pod (for private access only)\n     */\n    privateTypeIndex?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * A registry of all types used on the user\'s Pod (for public access)\n     */\n    publicTypeIndex?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * A list of WebIds for all the people this user knows.\n     */\n    knows?: LdSet<{\n        "@id": string;\n    }>;\n}\n\nexport interface AddressShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The name of the user\'s country of residence\n     */\n    countryName?: string;\n    /**\n     * The name of the user\'s locality (City, Town etc.) of residence\n     */\n    locality?: string;\n    /**\n     * The user\'s postal code\n     */\n    postalCode?: string;\n    /**\n     * The name of the user\'s region (State, Province etc.) of residence\n     */\n    region?: string;\n    /**\n     * The user\'s street address\n     */\n    streetAddress?: string;\n}\n\nexport interface EmailShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The type of email.\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of an email as a mailto link (Example <mailto:jane@example.com>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\nexport interface PhoneNumberShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * They type of Phone Number\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of a phone number as a tel link (Example <tel:555-555-5555>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\nexport interface TrustedAppShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The level of access provided to this origin\n     */\n    mode: LdSet<{\n        "@id": "Append";\n    } | {\n        "@id": "Control";\n    } | {\n        "@id": "Read";\n    } | {\n        "@id": "Write";\n    }>;\n    /**\n     * The app origin the user trusts\n     */\n    origin: {\n        "@id": string;\n    };\n}\n\nexport interface RSAPublicKeyShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * RSA Modulus\n     */\n    modulus: string;\n    /**\n     * RSA Exponent\n     */\n    exponent: number;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface SolidProfile {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * Defines the node as a Person (from Schema.org) | Defines the node as a Person (from foaf)\n     */\n    type: LdSet<{\n        "@id": "Person";\n    } | {\n        "@id": "Person2";\n    }>;\n    /**\n     * The formatted name of a person. Example: John Smith\n     */\n    fn?: string;\n    /**\n     * An alternate way to define a person\'s name.\n     */\n    name?: string;\n    /**\n     * The person\'s street address.\n     */\n    hasAddress?: LdSet<Address>;\n    /**\n     * The person\'s email.\n     */\n    hasEmail?: LdSet<Email>;\n    /**\n     * A link to the person\'s photo\n     */\n    hasPhoto?: {\n        "@id": string;\n    };\n    /**\n     * Photo link but in string form\n     */\n    img?: string;\n    /**\n     * Person\'s telephone number\n     */\n    hasTelephone?: LdSet<PhoneNumber>;\n    /**\n     * An alternative way to define a person\'s telephone number using a string\n     */\n    phone?: string;\n    /**\n     * The name of the organization with which the person is affiliated\n     */\n    organizationName?: string;\n    /**\n     * The name of the person\'s role in their organization\n     */\n    role?: string;\n    /**\n     * A list of app origins that are trusted by this user\n     */\n    trustedApp?: LdSet<TrustedApp>;\n    /**\n     * A list of RSA public keys that are associated with private keys the user holds.\n     */\n    key?: LdSet<RSAPublicKey>;\n    /**\n     * The user\'s LDP inbox to which apps can post notifications\n     */\n    inbox: {\n        "@id": string;\n    };\n    /**\n     * The user\'s preferences\n     */\n    preferencesFile?: {\n        "@id": string;\n    };\n    /**\n     * The location of a Solid storage server related to this WebId\n     */\n    storage?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * The user\'s account\n     */\n    account?: {\n        "@id": string;\n    };\n    /**\n     * A registry of all types used on the user\'s Pod (for private access only)\n     */\n    privateTypeIndex?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * A registry of all types used on the user\'s Pod (for public access)\n     */\n    publicTypeIndex?: LdSet<{\n        "@id": string;\n    }>;\n    /**\n     * A list of WebIds for all the people this user knows.\n     */\n    knows?: LdSet<{\n        "@id": string;\n    }>;\n}\n\nexport interface Address {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The name of the user\'s country of residence\n     */\n    countryName?: string;\n    /**\n     * The name of the user\'s locality (City, Town etc.) of residence\n     */\n    locality?: string;\n    /**\n     * The user\'s postal code\n     */\n    postalCode?: string;\n    /**\n     * The name of the user\'s region (State, Province etc.) of residence\n     */\n    region?: string;\n    /**\n     * The user\'s street address\n     */\n    streetAddress?: string;\n}\n\nexport interface Email {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The type of email.\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of an email as a mailto link (Example <mailto:jane@example.com>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\nexport interface PhoneNumber {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * They type of Phone Number\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of a phone number as a tel link (Example <tel:555-555-5555>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\nexport interface TrustedApp {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The level of access provided to this origin\n     */\n    mode: LdSet<{\n        "@id": "Append";\n    } | {\n        "@id": "Control";\n    } | {\n        "@id": "Read";\n    } | {\n        "@id": "Write";\n    }>;\n    /**\n     * The app origin the user trusts\n     */\n    origin: {\n        "@id": string;\n    };\n}\n\nexport interface RSAPublicKey {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * RSA Modulus\n     */\n    modulus: string;\n    /**\n     * RSA Exponent\n     */\n    exponent: number;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/reducedProfile.ts b/packages/schema-converter-shex/test/testData/reducedProfile.ts
index 2207e36..1133224 100644
--- a/packages/schema-converter-shex/test/testData/reducedProfile.ts
+++ b/packages/schema-converter-shex/test/testData/reducedProfile.ts
@@ -249,5 +249,5 @@ srs:EmailShape EXTRA a {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface SolidProfileShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * Defines the node as a Person | Defines the node as a Person\n     */\n    type: LdSet<{\n        "@id": "Person";\n    } | {\n        "@id": "Person2";\n    }>;\n    /**\n     * The person\'s email.\n     */\n    hasEmail?: LdSet<EmailShape>;\n    /**\n     * An alternate way to define a person\'s name\n     */\n    name?: string;\n}\n\nexport interface EmailShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The type of email.\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of an email as a mailto link (Example <mailto:jane@example.com>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface SolidProfile {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * Defines the node as a Person | Defines the node as a Person\n     */\n    type: LdSet<{\n        "@id": "Person";\n    } | {\n        "@id": "Person2";\n    }>;\n    /**\n     * The person\'s email.\n     */\n    hasEmail?: LdSet<Email>;\n    /**\n     * An alternate way to define a person\'s name\n     */\n    name?: string;\n}\n\nexport interface Email {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    /**\n     * The type of email.\n     */\n    type?: LdSet<{\n        "@id": "Dom";\n    } | {\n        "@id": "Home";\n    } | {\n        "@id": "ISDN";\n    } | {\n        "@id": "Internet";\n    } | {\n        "@id": "Intl";\n    } | {\n        "@id": "Label";\n    } | {\n        "@id": "Parcel";\n    } | {\n        "@id": "Postal";\n    } | {\n        "@id": "Pref";\n    } | {\n        "@id": "Work";\n    } | {\n        "@id": "X400";\n    }>;\n    /**\n     * The value of an email as a mailto link (Example <mailto:jane@example.com>)\n     */\n    value: {\n        "@id": string;\n    };\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/reusedPredicates.ts b/packages/schema-converter-shex/test/testData/reusedPredicates.ts
index 30123e3..5d35efc 100644
--- a/packages/schema-converter-shex/test/testData/reusedPredicates.ts
+++ b/packages/schema-converter-shex/test/testData/reusedPredicates.ts
@@ -113,5 +113,5 @@ export const reusedPredicates: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface DocumentShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Document";\n    }>;\n    vocabulary?: LdSet<VocabularyShape>;\n    law: LawShape;\n}\n\nexport interface LawShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Law";\n    }>;\n    name?: LdSet<string>;\n    path: {\n        "@id": string;\n    };\n}\n\nexport interface VocabularyShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Vocabulary";\n    }>;\n    name: string;\n    path?: LdSet<{\n        "@id": string;\n    }>;\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Document {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Document";\n    }>;\n    vocabulary?: LdSet<Vocabulary>;\n    law: Law;\n}\n\nexport interface Law {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Law";\n    }>;\n    name?: LdSet<string>;\n    path: {\n        "@id": string;\n    };\n}\n\nexport interface Vocabulary {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    type: LdSet<{\n        "@id": "Vocabulary";\n    }>;\n    name: string;\n    path?: LdSet<{\n        "@id": string;\n    }>;\n}\n\n',
 };
diff --git a/packages/schema-converter-shex/test/testData/simple.ts b/packages/schema-converter-shex/test/testData/simple.ts
index 0197734..4f7511f 100644
--- a/packages/schema-converter-shex/test/testData/simple.ts
+++ b/packages/schema-converter-shex/test/testData/simple.ts
@@ -49,5 +49,5 @@ export const simple: TestData = {
     },
   },
   successfulTypings:
-    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface EmployeeShape {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    givenName: LdSet<string>;\n    familyName: string;\n    phone?: LdSet<{\n        "@id": string;\n    }>;\n    mbox: {\n        "@id": string;\n    };\n}\n\n',
+    'import { LdSet, LdoJsonldContext } from "@ldo/ldo"\n\nexport interface Employee {\n    "@id"?: string;\n    "@context"?: LdoJsonldContext;\n    givenName: LdSet<string>;\n    familyName: string;\n    phone?: LdSet<{\n        "@id": string;\n    }>;\n    mbox: {\n        "@id": string;\n    };\n}\n\n',
 };