diff --git a/applications/examples/sandbox-app/build.gradle b/applications/examples/sandbox-app/build.gradle
index 6c10a2c33f8..bb2edcab25c 100644
--- a/applications/examples/sandbox-app/build.gradle
+++ b/applications/examples/sandbox-app/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     runtimeOnly project(':libs:messaging:db-message-bus-impl')
     runtimeOnly project(':libs:serialization:serialization-checkpoint-api')
     runtimeOnly project(':libs:serialization:serialization-kryo')
-    runtimeOnly project(":libs:state-manager:state-manager-db-impl")
+    runtimeOnly project(':libs:state-manager:state-manager-db-impl')
     runtimeOnly project(':testing:group-policy-test-common')
     runtimeOnly project(':libs:web:web-impl')
 
diff --git a/components/flow/flow-service/build.gradle b/components/flow/flow-service/build.gradle
index 93cac3f5011..e1f2bc3c398 100644
--- a/components/flow/flow-service/build.gradle
+++ b/components/flow/flow-service/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     integrationTestRuntimeOnly project(':libs:messaging:messaging-impl')
     integrationTestRuntimeOnly project(':libs:serialization:serialization-checkpoint-api')
     integrationTestRuntimeOnly project(':libs:serialization:serialization-kryo')
-    integrationTestRuntimeOnly project(":libs:state-manager:state-manager-db-impl")
+    integrationTestRuntimeOnly project(':libs:state-manager:state-manager-db-impl')
     integrationTestRuntimeOnly project(':components:membership:membership-group-read-impl')
     integrationTestRuntimeOnly project(':components:virtual-node:cpk-read-service-impl')
 
diff --git a/components/ledger/ledger-common-flow/build.gradle b/components/ledger/ledger-common-flow/build.gradle
index a1ccbcf7405..870d35a2e3d 100644
--- a/components/ledger/ledger-common-flow/build.gradle
+++ b/components/ledger/ledger-common-flow/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     integrationTestRuntimeOnly project(':libs:messaging:db-message-bus-impl')
     integrationTestRuntimeOnly project(':libs:messaging:messaging-impl')
     integrationTestRuntimeOnly project(':libs:flows:session-manager-impl')
-    integrationTestRuntimeOnly project(":libs:state-manager:state-manager-db-impl")
+    integrationTestRuntimeOnly project(':libs:state-manager:state-manager-db-impl')
     integrationTestRuntimeOnly "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:$ariesDynamicFrameworkExtensionVersion"
 
     cpis project(path: ':testing:ledger:ledger-common-empty-app', configuration: 'cordaCPB')
diff --git a/components/ledger/ledger-consensual-flow/build.gradle b/components/ledger/ledger-consensual-flow/build.gradle
index 84a9996622d..1d5e368bd22 100644
--- a/components/ledger/ledger-consensual-flow/build.gradle
+++ b/components/ledger/ledger-consensual-flow/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     integrationTestRuntimeOnly project(':libs:messaging:messaging-impl')
     integrationTestRuntimeOnly project(':libs:lifecycle:lifecycle-impl')
     integrationTestRuntimeOnly project(':libs:flows:session-manager-impl')
-    integrationTestRuntimeOnly project(":libs:state-manager:state-manager-db-impl")
+    integrationTestRuntimeOnly project(':libs:state-manager:state-manager-db-impl')
     cpis project(path: ':testing:ledger:ledger-consensual-state-app', configuration: 'cordaCPB')
 }
 
diff --git a/components/ledger/ledger-utxo-flow/build.gradle b/components/ledger/ledger-utxo-flow/build.gradle
index 33e0f595e8c..c7b937da4cf 100644
--- a/components/ledger/ledger-utxo-flow/build.gradle
+++ b/components/ledger/ledger-utxo-flow/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     integrationTestRuntimeOnly project(':libs:lifecycle:lifecycle-impl')
     integrationTestRuntimeOnly project(':libs:flows:session-manager-impl')
     integrationTestRuntimeOnly project(':libs:membership:membership-impl')
-    integrationTestRuntimeOnly project(":libs:state-manager:state-manager-db-impl")
+    integrationTestRuntimeOnly project(':libs:state-manager:state-manager-db-impl')
 
     cpis project(path: ':testing:ledger:ledger-utxo-state-app', configuration: 'cordaCPB')
 }
diff --git a/libs/state-manager/state-manager-api/src/main/kotlin/net/corda/libs/statemanager/api/Metadata.kt b/libs/state-manager/state-manager-api/src/main/kotlin/net/corda/libs/statemanager/api/Metadata.kt
index 5099f2bf0fb..70746c6eb33 100644
--- a/libs/state-manager/state-manager-api/src/main/kotlin/net/corda/libs/statemanager/api/Metadata.kt
+++ b/libs/state-manager/state-manager-api/src/main/kotlin/net/corda/libs/statemanager/api/Metadata.kt
@@ -1,7 +1,7 @@
 package net.corda.libs.statemanager.api
 
 /**
- * Mutable map that allows only primitive types to be used as values.
+ * Map that allows only primitive types to be used as values.
  */
 class Metadata(
     private val map: Map<String, Any> = emptyMap()
diff --git a/libs/state-manager/state-manager-api/src/test/kotlin/net/corda/libs/statemanager/api/MetadataTests.kt b/libs/state-manager/state-manager-api/src/test/kotlin/net/corda/libs/statemanager/api/MetadataTests.kt
index 337b3130483..c1215394581 100644
--- a/libs/state-manager/state-manager-api/src/test/kotlin/net/corda/libs/statemanager/api/MetadataTests.kt
+++ b/libs/state-manager/state-manager-api/src/test/kotlin/net/corda/libs/statemanager/api/MetadataTests.kt
@@ -42,5 +42,12 @@ class MetadataTests {
         assertThat(meta2).isNotSameAs(meta1)
     }
 
+    @Test
+    fun `new meta with additional elements`() {
+        val meta1 = Metadata(mapOf("foo" to "bar"))
+        assertThat(meta1.plus("batman" to "joker"))
+            .containsExactlyInAnyOrderEntriesOf(mapOf("foo" to "bar", "batman" to "joker"))
+    }
+
     data class Superman(val kudos: Int)
 }
\ No newline at end of file
diff --git a/processors/flow-mapper-processor/build.gradle b/processors/flow-mapper-processor/build.gradle
index 1441efb4245..c683d9cb6b9 100644
--- a/processors/flow-mapper-processor/build.gradle
+++ b/processors/flow-mapper-processor/build.gradle
@@ -17,49 +17,49 @@ dependencies {
     implementation 'net.corda:corda-ledger-utxo'
     implementation 'net.corda:corda-notary-plugin'
 
-    implementation project(":components:configuration:configuration-read-service")
-    implementation project(":components:flow:flow-mapper-service")
-    implementation project(":components:flow:flow-p2p-filter-service")
-    implementation project(":components:membership:locally-hosted-identities-service")
+    implementation project(':components:configuration:configuration-read-service')
+    implementation project(':components:flow:flow-mapper-service')
+    implementation project(':components:flow:flow-p2p-filter-service')
+    implementation project(':components:membership:locally-hosted-identities-service')
     implementation project(':components:membership:group-policy')
-    implementation project(":components:membership:membership-group-read")
-    implementation project(":components:membership:membership-persistence-client")
-    implementation project(":components:virtual-node:cpi-info-read-service")
-    implementation project(":components:virtual-node:virtual-node-info-read-service")
-    implementation project(":libs:lifecycle:lifecycle")
+    implementation project(':components:membership:membership-group-read')
+    implementation project(':components:membership:membership-persistence-client')
+    implementation project(':components:virtual-node:cpi-info-read-service')
+    implementation project(':components:virtual-node:virtual-node-info-read-service')
+    implementation project(':libs:lifecycle:lifecycle')
     implementation project(":libs:messaging:messaging")
     implementation project(':libs:utilities')
-    implementation project(":notary-plugins:notary-plugin-common")
+    implementation project(':notary-plugins:notary-plugin-common')
 
     runtimeOnly project(":components:configuration:configuration-read-service-impl")
     runtimeOnly project(':libs:ledger:ledger-common-data')
     runtimeOnly project(":components:ledger:notary-worker-selection-impl")
     runtimeOnly project(':libs:ledger:ledger-consensual-data')
     runtimeOnly project(':libs:ledger:ledger-utxo-data')
-    runtimeOnly project(":libs:crypto:crypto-serialization-impl")
+    runtimeOnly project(':libs:crypto:crypto-serialization-impl')
     runtimeOnly project(':libs:crypto:merkle-impl')
-    runtimeOnly project(":components:configuration:configuration-read-service-impl")
-    runtimeOnly project(":components:flow:flow-mapper-impl")
-    runtimeOnly project(":components:membership:locally-hosted-identities-service-impl")
-    runtimeOnly project(":components:membership:membership-group-read-impl")
-    runtimeOnly project(":components:membership:membership-persistence-client-impl")
-    runtimeOnly project(":components:membership:group-policy-impl")
-    runtimeOnly project(":components:uniqueness:uniqueness-checker-client-service-impl")
-    runtimeOnly project(":components:virtual-node:cpi-info-read-service-impl")
-    runtimeOnly project(":libs:application:application-impl")
+    runtimeOnly project(':components:configuration:configuration-read-service-impl')
+    runtimeOnly project(':components:flow:flow-mapper-impl')
+    runtimeOnly project(':components:membership:locally-hosted-identities-service-impl')
+    runtimeOnly project(':components:membership:membership-group-read-impl')
+    runtimeOnly project(':components:membership:membership-persistence-client-impl')
+    runtimeOnly project(':components:membership:group-policy-impl')
+    runtimeOnly project(':components:uniqueness:uniqueness-checker-client-service-impl')
+    runtimeOnly project(':components:virtual-node:cpi-info-read-service-impl')
+    runtimeOnly project(':libs:application:application-impl')
     runtimeOnly project(':libs:crypto:cipher-suite-impl')
     runtimeOnly project(":libs:crypto:crypto-serialization-impl")
     runtimeOnly project(':libs:crypto:merkle-impl')
     runtimeOnly project(':libs:db:db-orm-impl')
-    runtimeOnly project(":libs:flows:external-event-responses-impl")
-    runtimeOnly project(":libs:flows:flow-api")
-    runtimeOnly project(":libs:flows:session-manager-impl")
-    runtimeOnly project(":libs:messaging:messaging-impl")
+    runtimeOnly project(':libs:flows:external-event-responses-impl')
+    runtimeOnly project(':libs:flows:flow-api')
+    runtimeOnly project(':libs:flows:session-manager-impl')
+    runtimeOnly project(':libs:messaging:messaging-impl')
     runtimeOnly project(':libs:ledger:ledger-common-data')
     runtimeOnly project(':libs:ledger:ledger-consensual-data')
     runtimeOnly project(':libs:ledger:ledger-utxo-data')
-    runtimeOnly project(":libs:lifecycle:lifecycle-impl")
-    runtimeOnly project(":libs:schema-registry:schema-registry-impl")
-    runtimeOnly project(":libs:state-manager:state-manager-db-impl")
+    runtimeOnly project(':libs:lifecycle:lifecycle-impl')
+    runtimeOnly project(':libs:schema-registry:schema-registry-impl')
+    runtimeOnly project(':libs:state-manager:state-manager-db-impl')
 
 }
diff --git a/processors/flow-processor/build.gradle b/processors/flow-processor/build.gradle
index a463888f3d0..770df86e505 100644
--- a/processors/flow-processor/build.gradle
+++ b/processors/flow-processor/build.gradle
@@ -17,22 +17,22 @@ dependencies {
     implementation 'net.corda:corda-ledger-utxo'
     implementation 'net.corda:corda-notary-plugin'
 
-    implementation project(":components:configuration:configuration-read-service")
-    implementation project(":components:flow:flow-service")
+    implementation project(':components:configuration:configuration-read-service')
+    implementation project(':components:flow:flow-service')
     implementation project(':components:membership:group-policy')
     implementation project(':components:membership:locally-hosted-identities-service')
-    implementation project(":components:membership:membership-group-read")
-    implementation project(":components:membership:membership-persistence-client")
-    implementation project(":components:ledger:ledger-utxo-token-cache")
-    implementation project(":components:virtual-node:cpi-info-read-service")
-    implementation project(":components:virtual-node:cpk-read-service")
-    implementation project(":components:virtual-node:sandbox-group-context-service")
-    implementation project(":components:virtual-node:virtual-node-info-read-service")
+    implementation project(':components:membership:membership-group-read')
+    implementation project(':components:membership:membership-persistence-client')
+    implementation project(':components:ledger:ledger-utxo-token-cache')
+    implementation project(':components:virtual-node:cpi-info-read-service')
+    implementation project(':components:virtual-node:cpk-read-service')
+    implementation project(':components:virtual-node:sandbox-group-context-service')
+    implementation project(':components:virtual-node:virtual-node-info-read-service')
     implementation project(":libs:lifecycle:lifecycle")
     implementation project(":libs:messaging:messaging")
     implementation project(':libs:utilities')
     implementation project(':libs:virtual-node:sandbox-group-context')
-    implementation project(":notary-plugins:notary-plugin-common")
+    implementation project(':notary-plugins:notary-plugin-common')
 
     runtimeOnly project(":components:configuration:configuration-read-service-impl")
     runtimeOnly project(":components:flow:flow-service")
@@ -40,37 +40,37 @@ dependencies {
     runtimeOnly project(':libs:ledger:ledger-common-data')
     runtimeOnly project(':components:ledger:ledger-consensual-flow')
     runtimeOnly project(':components:ledger:ledger-utxo-flow')
-    runtimeOnly project(":components:ledger:notary-worker-selection-impl")
+    runtimeOnly project(':components:ledger:notary-worker-selection-impl')
     runtimeOnly project(':libs:ledger:ledger-consensual-data')
     runtimeOnly project(':components:ledger:ledger-utxo-flow')
     runtimeOnly project(':libs:ledger:ledger-utxo-data')
-    runtimeOnly project(":libs:crypto:crypto-serialization-impl")
+    runtimeOnly project(':libs:crypto:crypto-serialization-impl')
     runtimeOnly project(':libs:crypto:merkle-impl')
     runtimeOnly project(':libs:crypto:cipher-suite-impl')
-    runtimeOnly project(":components:configuration:configuration-read-service-impl")
-    runtimeOnly project(":components:uniqueness:uniqueness-checker-client-service-impl")
-    runtimeOnly project(":components:membership:membership-group-read-impl")
-    runtimeOnly project(":components:membership:membership-persistence-client-impl")
-    runtimeOnly project(":components:membership:group-policy-impl")
-    runtimeOnly project(":components:membership:locally-hosted-identities-service-impl")
-    runtimeOnly project(":components:uniqueness:uniqueness-checker-client-service-impl")
-    runtimeOnly project(":components:virtual-node:cpi-info-read-service-impl")
-    runtimeOnly project(":components:virtual-node:cpk-read-service-impl")
-    runtimeOnly project(":components:flow:flow-mapper-impl")
-    runtimeOnly project(":libs:application:application-impl")
+    runtimeOnly project(':components:configuration:configuration-read-service-impl')
+    runtimeOnly project(':components:uniqueness:uniqueness-checker-client-service-impl')
+    runtimeOnly project(':components:membership:membership-group-read-impl')
+    runtimeOnly project(':components:membership:membership-persistence-client-impl')
+    runtimeOnly project(':components:membership:group-policy-impl')
+    runtimeOnly project(':components:membership:locally-hosted-identities-service-impl')
+    runtimeOnly project(':components:uniqueness:uniqueness-checker-client-service-impl')
+    runtimeOnly project(':components:virtual-node:cpi-info-read-service-impl')
+    runtimeOnly project(':components:virtual-node:cpk-read-service-impl')
+    runtimeOnly project(':components:flow:flow-mapper-impl')
+    runtimeOnly project(':libs:application:application-impl')
     runtimeOnly project(':libs:db:db-orm-impl')
-    runtimeOnly project(":libs:flows:external-event-responses-impl")
-    runtimeOnly project(":libs:flows:flow-api")
-    runtimeOnly project(":libs:flows:session-manager-impl")
-    runtimeOnly project(":libs:messaging:messaging-impl")
+    runtimeOnly project(':libs:flows:external-event-responses-impl')
+    runtimeOnly project(':libs:flows:flow-api')
+    runtimeOnly project(':libs:flows:session-manager-impl')
+    runtimeOnly project(':libs:messaging:messaging-impl')
     runtimeOnly project(':libs:ledger:ledger-common-data')
     runtimeOnly project(':libs:ledger:ledger-consensual-data')
     runtimeOnly project(':libs:ledger:ledger-utxo-data')
-    runtimeOnly project(":libs:lifecycle:lifecycle-impl")
-    runtimeOnly project(":libs:sandbox-internal")
-    runtimeOnly project(":libs:schema-registry:schema-registry-impl")
-    runtimeOnly project(":libs:serialization:serialization-kryo")
-    runtimeOnly project(":libs:state-manager:state-manager-db-impl")
+    runtimeOnly project(':libs:lifecycle:lifecycle-impl')
+    runtimeOnly project(':libs:sandbox-internal')
+    runtimeOnly project(':libs:schema-registry:schema-registry-impl')
+    runtimeOnly project(':libs:serialization:serialization-kryo')
+    runtimeOnly project(':libs:state-manager:state-manager-db-impl')
     runtimeOnly project(":libs:web:web-impl")
 
 }