diff --git a/.github/workflows/ci-tm-helpers.yaml b/.github/workflows/ci-thing-model.yaml
similarity index 90%
rename from .github/workflows/ci-tm-helpers.yaml
rename to .github/workflows/ci-thing-model.yaml
index 8036515..870d881 100644
--- a/.github/workflows/ci-tm-helpers.yaml
+++ b/.github/workflows/ci-thing-model.yaml
@@ -4,16 +4,16 @@ on:
   push:
     branches: [main]
     paths:
-      - "node/tm-helpers/**"
+      - "node/thing-model/**"
   pull_request:
     branches: [main]
     paths:
-      - "node/tm-helpers/**"
+      - "node/thing-model/**"
   workflow_dispatch:
 
 defaults:
   run:
-    working-directory: node/tm-helpers
+    working-directory: node/thing-model
 
 jobs:
   setup-and-test:
diff --git a/node/tm-helpers/README.md b/node/thing-model/README.md
similarity index 100%
rename from node/tm-helpers/README.md
rename to node/thing-model/README.md
diff --git a/node/tm-helpers/package-lock.json b/node/thing-model/package-lock.json
similarity index 99%
rename from node/tm-helpers/package-lock.json
rename to node/thing-model/package-lock.json
index fdab9f8..37b4972 100644
--- a/node/tm-helpers/package-lock.json
+++ b/node/thing-model/package-lock.json
@@ -1,11 +1,11 @@
 {
-    "name": "tm-helpers",
+    "name": "thing-model",
     "version": "1.0.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "tm-helpers",
+            "name": "thing-model",
             "version": "1.0.0",
             "license": "EPL-2.0 OR W3C-20150513",
             "dependencies": {
diff --git a/node/tm-helpers/package.json b/node/thing-model/package.json
similarity index 98%
rename from node/tm-helpers/package.json
rename to node/thing-model/package.json
index ffef157..9597e9b 100644
--- a/node/tm-helpers/package.json
+++ b/node/thing-model/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "tm-helpers",
+    "name": "thing-model",
     "version": "1.0.0",
     "repository": {
         "type": "git",
diff --git a/node/tm-helpers/src/tm-helpers.ts b/node/thing-model/src/tm-helpers.ts
similarity index 100%
rename from node/tm-helpers/src/tm-helpers.ts
rename to node/thing-model/src/tm-helpers.ts
diff --git a/node/tm-helpers/test/thing-model/tmodels/BasicOnOffTM.jsonld b/node/thing-model/test/thing-model/tmodels/BasicOnOffTM.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/BasicOnOffTM.jsonld
rename to node/thing-model/test/thing-model/tmodels/BasicOnOffTM.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/Led.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/Led.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/Led.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/Led.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/Led.tm.jsonld b/node/thing-model/test/thing-model/tmodels/Led.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/Led.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/Led.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/LedExtend.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/LedExtend.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/LedExtend.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/LedExtend.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/LedExtend.tm.jsonld b/node/thing-model/test/thing-model/tmodels/LedExtend.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/LedExtend.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/LedExtend.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/LedExtendLoop.tm.jsonld b/node/thing-model/test/thing-model/tmodels/LedExtendLoop.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/LedExtendLoop.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/LedExtendLoop.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/OnOff.jsonld b/node/thing-model/test/thing-model/tmodels/OnOff.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/OnOff.jsonld
rename to node/thing-model/test/thing-model/tmodels/OnOff.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartLampControlExtend.jsonld b/node/thing-model/test/thing-model/tmodels/SmartLampControlExtend.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartLampControlExtend.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartLampControlExtend.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartLampControlExtended.jsonld b/node/thing-model/test/thing-model/tmodels/SmartLampControlExtended.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartLampControlExtended.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartLampControlExtended.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartLampControlImport.jsonld b/node/thing-model/test/thing-model/tmodels/SmartLampControlImport.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartLampControlImport.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartLampControlImport.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartLampControlImported.jsonld b/node/thing-model/test/thing-model/tmodels/SmartLampControlImported.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartLampControlImported.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartLampControlImported.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilator.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilator.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilator.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilator.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilator.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilator.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilator.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilator.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilatorRecursive.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilatorRecursive.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilatorRecursive.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilatorRecursive.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilatorRecursive.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilatorRecursive.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilatorRecursive.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilatorRecursive.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilatorSubExtend.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilatorSubExtend.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilatorSubExtend.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilatorSubExtend.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/SmartVentilatorSubExtend.tm.jsonld b/node/thing-model/test/thing-model/tmodels/SmartVentilatorSubExtend.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/SmartVentilatorSubExtend.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/SmartVentilatorSubExtend.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/Ventilator.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/Ventilator.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/Ventilator.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/Ventilator.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/Ventilator.tm.jsonld b/node/thing-model/test/thing-model/tmodels/Ventilator.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/Ventilator.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/Ventilator.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/VentilatorRecursive.composed.tm.jsonld b/node/thing-model/test/thing-model/tmodels/VentilatorRecursive.composed.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/VentilatorRecursive.composed.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/VentilatorRecursive.composed.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/VentilatorRecursive.tm.jsonld b/node/thing-model/test/thing-model/tmodels/VentilatorRecursive.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/VentilatorRecursive.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/VentilatorRecursive.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/depsLoop/BasicOnOffTM.jsonld b/node/thing-model/test/thing-model/tmodels/depsLoop/BasicOnOffTM.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/depsLoop/BasicOnOffTM.jsonld
rename to node/thing-model/test/thing-model/tmodels/depsLoop/BasicOnOffTM.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/depsLoop/OnOff.jsonld b/node/thing-model/test/thing-model/tmodels/depsLoop/OnOff.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/depsLoop/OnOff.jsonld
rename to node/thing-model/test/thing-model/tmodels/depsLoop/OnOff.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/depsLoop/SmartLampControlImport.jsonld b/node/thing-model/test/thing-model/tmodels/depsLoop/SmartLampControlImport.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/depsLoop/SmartLampControlImport.jsonld
rename to node/thing-model/test/thing-model/tmodels/depsLoop/SmartLampControlImport.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/noDepsLoop/BasicOnOffTM.jsonld b/node/thing-model/test/thing-model/tmodels/noDepsLoop/BasicOnOffTM.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/noDepsLoop/BasicOnOffTM.jsonld
rename to node/thing-model/test/thing-model/tmodels/noDepsLoop/BasicOnOffTM.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/noDepsLoop/Led.tm.jsonld b/node/thing-model/test/thing-model/tmodels/noDepsLoop/Led.tm.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/noDepsLoop/Led.tm.jsonld
rename to node/thing-model/test/thing-model/tmodels/noDepsLoop/Led.tm.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/noDepsLoop/OnOff.jsonld b/node/thing-model/test/thing-model/tmodels/noDepsLoop/OnOff.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/noDepsLoop/OnOff.jsonld
rename to node/thing-model/test/thing-model/tmodels/noDepsLoop/OnOff.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.jsonld b/node/thing-model/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.jsonld
rename to node/thing-model/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.jsonld
diff --git a/node/tm-helpers/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.td.jsonld b/node/thing-model/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.td.jsonld
similarity index 100%
rename from node/tm-helpers/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.td.jsonld
rename to node/thing-model/test/thing-model/tmodels/noDepsLoop/SmartLampControlImport.td.jsonld
diff --git a/node/tm-helpers/test/thingModelHelper.test.ts b/node/thing-model/test/thingModelHelper.test.ts
similarity index 100%
rename from node/tm-helpers/test/thingModelHelper.test.ts
rename to node/thing-model/test/thingModelHelper.test.ts
diff --git a/node/tm-helpers/test/thingModelHelperComposition.test.ts b/node/thing-model/test/thingModelHelperComposition.test.ts
similarity index 100%
rename from node/tm-helpers/test/thingModelHelperComposition.test.ts
rename to node/thing-model/test/thingModelHelperComposition.test.ts
diff --git a/node/tm-helpers/tsconfig.json b/node/thing-model/tsconfig.json
similarity index 100%
rename from node/tm-helpers/tsconfig.json
rename to node/thing-model/tsconfig.json