diff --git a/src/language/ContextMapperDslModule.ts b/src/language/ContextMapperDslModule.ts
index ac7cd0f..3dc5ce4 100644
--- a/src/language/ContextMapperDslModule.ts
+++ b/src/language/ContextMapperDslModule.ts
@@ -9,8 +9,8 @@ import {
 } from 'langium/lsp'
 import { ContextMapperDslGeneratedModule, ContextMapperDslGeneratedSharedModule } from './generated/module.js'
 import { ContextMapperDslValidator } from './validation/ContextMapperDslValidator.js'
-import { ContextMapperDslSemanticTokenProvider } from './semantictokens/ContextMapperDslSemanticTokenProvider.js'
-import { SemanticTokenProviderRegistry } from './semantictokens/SemanticTokenProviderRegistry.js'
+import { ContextMapperDslSemanticTokenProvider } from './semanticTokens/ContextMapperDslSemanticTokenProvider.js'
+import { SemanticTokenProviderRegistry } from './semanticTokens/SemanticTokenProviderRegistry.js'
 import { ContextMapperDslValidationRegistry } from './validation/ContextMapperDslValidationRegistry.js'
 import { ContextMapperValidationProviderRegistry } from './validation/ContextMapperValidationProviderRegistry.js'
 import { ContextMapperDslScopeProvider } from './references/ContextMapperDslScopeProvider.js'
diff --git a/src/language/semantictokens/ContextMapperDslSemanticTokenProvider.ts b/src/language/semanticTokens/ContextMapperDslSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/ContextMapperDslSemanticTokenProvider.ts
rename to src/language/semanticTokens/ContextMapperDslSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/ContextMapperSemanticTokenProvider.ts b/src/language/semanticTokens/ContextMapperSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/ContextMapperSemanticTokenProvider.ts
rename to src/language/semanticTokens/ContextMapperSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/HighlightingHelper.ts b/src/language/semanticTokens/HighlightingHelper.ts
similarity index 100%
rename from src/language/semantictokens/HighlightingHelper.ts
rename to src/language/semanticTokens/HighlightingHelper.ts
diff --git a/src/language/semantictokens/SemanticTokenProviderRegistry.ts b/src/language/semanticTokens/SemanticTokenProviderRegistry.ts
similarity index 100%
rename from src/language/semantictokens/SemanticTokenProviderRegistry.ts
rename to src/language/semanticTokens/SemanticTokenProviderRegistry.ts
diff --git a/src/language/semantictokens/boundedContext/AggregateSemanticTokenProvider.ts b/src/language/semanticTokens/boundedContext/AggregateSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/boundedContext/AggregateSemanticTokenProvider.ts
rename to src/language/semanticTokens/boundedContext/AggregateSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/boundedContext/BoundedContextSemanticTokenProvider.ts b/src/language/semanticTokens/boundedContext/BoundedContextSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/boundedContext/BoundedContextSemanticTokenProvider.ts
rename to src/language/semanticTokens/boundedContext/BoundedContextSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/boundedContext/SculptorModuleSemanticTokenProvider.ts b/src/language/semanticTokens/boundedContext/SculptorModuleSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/boundedContext/SculptorModuleSemanticTokenProvider.ts
rename to src/language/semanticTokens/boundedContext/SculptorModuleSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/contextMap/ContextMapSemanticTokenProvider.ts b/src/language/semanticTokens/contextMap/ContextMapSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/contextMap/ContextMapSemanticTokenProvider.ts
rename to src/language/semanticTokens/contextMap/ContextMapSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/contextMap/RelationshipSemanticTokenProvider.ts b/src/language/semanticTokens/contextMap/RelationshipSemanticTokenProvider.ts
similarity index 97%
rename from src/language/semantictokens/contextMap/RelationshipSemanticTokenProvider.ts
rename to src/language/semanticTokens/contextMap/RelationshipSemanticTokenProvider.ts
index 2dd8f94..b9b7608 100644
--- a/src/language/semantictokens/contextMap/RelationshipSemanticTokenProvider.ts
+++ b/src/language/semanticTokens/contextMap/RelationshipSemanticTokenProvider.ts
@@ -62,7 +62,7 @@ export class RelationshipSemanticTokenProvider implements ContextMapperSemanticT
     if (node.upstreamRoles.length > 0) {
       acceptor({
         node,
-        type: SemanticTokenTypes.enumMember,
+        type: SemanticTokenTypes.keyword,
         property: 'upstreamRoles'
       })
     }
@@ -72,7 +72,7 @@ export class RelationshipSemanticTokenProvider implements ContextMapperSemanticT
     if (node.downstreamRoles.length > 0) {
       acceptor({
         node,
-        type: SemanticTokenTypes.enumMember,
+        type: SemanticTokenTypes.keyword,
         property: 'downstreamRoles'
       })
     }
diff --git a/src/language/semantictokens/domain/DomainSemanticTokenProvider.ts b/src/language/semanticTokens/domain/DomainSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/domain/DomainSemanticTokenProvider.ts
rename to src/language/semanticTokens/domain/DomainSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/model/ContextMappingModelSemanticTokenProvider.ts b/src/language/semanticTokens/model/ContextMappingModelSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/model/ContextMappingModelSemanticTokenProvider.ts
rename to src/language/semanticTokens/model/ContextMappingModelSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/requirements/FeatureSemanticTokenProvider.ts b/src/language/semanticTokens/requirements/FeatureSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/requirements/FeatureSemanticTokenProvider.ts
rename to src/language/semanticTokens/requirements/FeatureSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/requirements/RequirementsSemanticTokenProvider.ts b/src/language/semanticTokens/requirements/RequirementsSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/requirements/RequirementsSemanticTokenProvider.ts
rename to src/language/semanticTokens/requirements/RequirementsSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/requirements/StoryValuationSemanticTokenProvider.ts b/src/language/semanticTokens/requirements/StoryValuationSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/requirements/StoryValuationSemanticTokenProvider.ts
rename to src/language/semanticTokens/requirements/StoryValuationSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/AbstractStakeholderSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/AbstractStakeholderSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/AbstractStakeholderSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/AbstractStakeholderSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ActionSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ActionSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ActionSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ActionSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ConsequenceSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ConsequenceSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ConsequenceSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ConsequenceSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/StakeholdersSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/StakeholdersSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/StakeholdersSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/StakeholdersSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueClusterSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueClusterSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueClusterSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueClusterSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueElicitationSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueElicitationSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueElicitationSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueElicitationSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueEpicSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueEpicSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueEpicSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueEpicSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueNarrativeSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueNarrativeSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueNarrativeSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueNarrativeSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueRegisterSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueRegisterSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueRegisterSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueRegisterSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueSemanticTokenProvider.ts
diff --git a/src/language/semantictokens/vdad/ValueWeightingSemanticTokenProvider.ts b/src/language/semanticTokens/vdad/ValueWeightingSemanticTokenProvider.ts
similarity index 100%
rename from src/language/semantictokens/vdad/ValueWeightingSemanticTokenProvider.ts
rename to src/language/semanticTokens/vdad/ValueWeightingSemanticTokenProvider.ts
diff --git a/test/semnantictokens/CommentSemanticTokenProvider.test.ts b/test/semnanticTokens/CommentSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/CommentSemanticTokenProvider.test.ts
rename to test/semnanticTokens/CommentSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/SemanticTokenTestHelper.ts b/test/semnanticTokens/SemanticTokenTestHelper.ts
similarity index 100%
rename from test/semnantictokens/SemanticTokenTestHelper.ts
rename to test/semnanticTokens/SemanticTokenTestHelper.ts
diff --git a/test/semnantictokens/boundedContext/AggregateSemanticTokenProvider.test.ts b/test/semnanticTokens/boundedContext/AggregateSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/boundedContext/AggregateSemanticTokenProvider.test.ts
rename to test/semnanticTokens/boundedContext/AggregateSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/boundedContext/BoundedContextSemanticTokens.test.ts b/test/semnanticTokens/boundedContext/BoundedContextSemanticTokens.test.ts
similarity index 100%
rename from test/semnantictokens/boundedContext/BoundedContextSemanticTokens.test.ts
rename to test/semnanticTokens/boundedContext/BoundedContextSemanticTokens.test.ts
diff --git a/test/semnantictokens/boundedContext/SculptorModuleSemanticTokenProvider.test.ts b/test/semnanticTokens/boundedContext/SculptorModuleSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/boundedContext/SculptorModuleSemanticTokenProvider.test.ts
rename to test/semnanticTokens/boundedContext/SculptorModuleSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/contextMap/ContextMapSemanticTokenProvider.test.ts b/test/semnanticTokens/contextMap/ContextMapSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/contextMap/ContextMapSemanticTokenProvider.test.ts
rename to test/semnanticTokens/contextMap/ContextMapSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/contextMap/RelationshipSemanticTokenProvider.test.ts b/test/semnanticTokens/contextMap/RelationshipSemanticTokenProvider.test.ts
similarity index 99%
rename from test/semnantictokens/contextMap/RelationshipSemanticTokenProvider.test.ts
rename to test/semnanticTokens/contextMap/RelationshipSemanticTokenProvider.test.ts
index cf2f006..dd1092f 100644
--- a/test/semnantictokens/contextMap/RelationshipSemanticTokenProvider.test.ts
+++ b/test/semnanticTokens/contextMap/RelationshipSemanticTokenProvider.test.ts
@@ -354,10 +354,10 @@ describe('Relationship semantic token tests', () => {
 
     expectSemanticTokensToEqual(tokens[1], 1, 10, 11, semanticTokenProvider.tokenTypes.type, 0)
     expectSemanticTokensToEqual(tokens[2], 0, 13, 1, semanticTokenProvider.tokenTypes.keyword, 0)
-    expectSemanticTokensToEqual(tokens[3], 0, 2, 3, semanticTokenProvider.tokenTypes.enumMember, 0)
+    expectSemanticTokensToEqual(tokens[3], 0, 2, 3, semanticTokenProvider.tokenTypes.keyword, 0)
     expectSemanticTokensToEqual(tokens[4], 0, 5, 2, semanticTokenProvider.tokenTypes.operator, 0)
     expectSemanticTokensToEqual(tokens[5], 0, 4, 1, semanticTokenProvider.tokenTypes.keyword, 0)
-    expectSemanticTokensToEqual(tokens[6], 0, 2, 2, semanticTokenProvider.tokenTypes.enumMember, 0)
+    expectSemanticTokensToEqual(tokens[6], 0, 2, 2, semanticTokenProvider.tokenTypes.keyword, 0)
     expectSemanticTokensToEqual(tokens[7], 0, 4, 12, semanticTokenProvider.tokenTypes.type, 0)
     expectSemanticTokensToEqual(tokens[8], 0, 15, 7, semanticTokenProvider.tokenTypes.type, semanticTokenProvider.tokenModifiers.declaration)
 
@@ -481,10 +481,10 @@ describe('Relationship semantic token tests', () => {
 
     expectSemanticTokensToEqual(tokens[1], 1, 10, 11, semanticTokenProvider.tokenTypes.type, 0)
     expectSemanticTokensToEqual(tokens[2], 0, 13, 1, semanticTokenProvider.tokenTypes.keyword, 0)
-    expectSemanticTokensToEqual(tokens[3], 0, 2, 3, semanticTokenProvider.tokenTypes.enumMember, 0)
+    expectSemanticTokensToEqual(tokens[3], 0, 2, 3, semanticTokenProvider.tokenTypes.keyword, 0)
     expectSemanticTokensToEqual(tokens[4], 0, 5, 2, semanticTokenProvider.tokenTypes.operator, 0)
     expectSemanticTokensToEqual(tokens[5], 0, 4, 1, semanticTokenProvider.tokenTypes.keyword, 0)
-    expectSemanticTokensToEqual(tokens[6], 0, 2, 2, semanticTokenProvider.tokenTypes.enumMember, 0)
+    expectSemanticTokensToEqual(tokens[6], 0, 2, 2, semanticTokenProvider.tokenTypes.keyword, 0)
     expectSemanticTokensToEqual(tokens[7], 0, 4, 12, semanticTokenProvider.tokenTypes.type, 0)
     expectSemanticTokensToEqual(tokens[8], 0, 15, 7, semanticTokenProvider.tokenTypes.type, semanticTokenProvider.tokenModifiers.declaration)
 
diff --git a/test/semnantictokens/domain/DomainSemanticTokenProvider.test.ts b/test/semnanticTokens/domain/DomainSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/domain/DomainSemanticTokenProvider.test.ts
rename to test/semnanticTokens/domain/DomainSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/requirements/FeatureSemanticTokenProvider.test.ts b/test/semnanticTokens/requirements/FeatureSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/requirements/FeatureSemanticTokenProvider.test.ts
rename to test/semnanticTokens/requirements/FeatureSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/requirements/RequirementsSemanticTokenProvider.test.ts b/test/semnanticTokens/requirements/RequirementsSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/requirements/RequirementsSemanticTokenProvider.test.ts
rename to test/semnanticTokens/requirements/RequirementsSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/vdad/StakeholdersSemanticTokenProvider.test.ts b/test/semnanticTokens/vdad/StakeholdersSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/vdad/StakeholdersSemanticTokenProvider.test.ts
rename to test/semnanticTokens/vdad/StakeholdersSemanticTokenProvider.test.ts
diff --git a/test/semnantictokens/vdad/ValueRegisterSemanticTokenProvider.test.ts b/test/semnanticTokens/vdad/ValueRegisterSemanticTokenProvider.test.ts
similarity index 100%
rename from test/semnantictokens/vdad/ValueRegisterSemanticTokenProvider.test.ts
rename to test/semnanticTokens/vdad/ValueRegisterSemanticTokenProvider.test.ts