diff --git a/api/src/main/proto/spine/protodata/events.proto b/api/src/main/proto/spine/protodata/events.proto
index caa3d7aba..c5524b9c4 100644
--- a/api/src/main/proto/spine/protodata/events.proto
+++ b/api/src/main/proto/spine/protodata/events.proto
@@ -58,7 +58,7 @@ message FileEntered {
 message FileOptionDiscovered {
     option (is).java_type = "io.spine.protodata.ast.OptionAware";
 
-    // The file, option of which was found.
+    // The file in which the option is discovered.
     File file = 1 [(required) = true];
 
     // The discovered option.
@@ -93,17 +93,20 @@ message TypeEntered {
 }
 
 // Emitted when a message-level option is found.
-message TypeOptionDiscovered {
+message MessageOptionDiscovered {
     option (is).java_type = "io.spine.protodata.ast.OptionAware";
 
     // The file in which the type is defined.
     File file = 1 [(required) = true];
 
-    // The type in which the option is discovered.
-    TypeName type = 2 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    TypeName type = 2 [deprecated = true];
 
     // The discovered option.
     Option option = 3 [(required) = true];
+
+    // The message type in which the option is discovered.
+    MessageType subject = 4 [(required) = true];
 }
 
 // Emitted when a message type is completely discovered, including all the fields, etc.
@@ -182,16 +185,10 @@ message FieldOptionDiscovered {
     // The file in which the field is defined.
     File file = 1 [(required) = true];
 
-    // The type in which the field is defined.
-    //
     // Deprecated: please use `subject` instead.
-    //
     TypeName type = 2 [deprecated = true];
 
-    // The field in which the option is discovered.
-    //
     // Deprecated: please use `subject` instead.
-    //
     FieldName field = 3 [deprecated = true];
 
     // The field in which the option is discovered.
@@ -241,11 +238,14 @@ message EnumOptionDiscovered {
     // The file in which the enum is defined.
     File file = 1 [(required) = true];
 
-    // The type name of the enum.
-    TypeName type = 2 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    TypeName type = 2 [deprecated = true];
 
     // The discovered option.
     Option option = 3 [(required) = true];
+
+    // The enum in which the option is discovered.
+    EnumType subject = 4 [(required) = true];
 }
 
 // Emitted when processing reaches an enum constant a.k.a. enum value.
@@ -268,14 +268,17 @@ message EnumConstantOptionDiscovered {
     // The file in which the enum is defined.
     File file = 1 [(required) = true];
 
-    // The type name of the enum.
-    TypeName type = 2 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    TypeName type = 2 [deprecated = true];
 
-    // The enum constant in which the option is discovered.
-    ConstantName constant = 3 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    ConstantName constant = 3 [deprecated = true];
 
     // The discovered option.
     Option option = 4 [(required) = true];
+
+    // The enum constant in which the option is discovered.
+    EnumConstant subject = 5 [(required) = true];
 }
 
 // Emitted when an enum constant is completely discovered.
@@ -328,11 +331,14 @@ message ServiceOptionDiscovered {
     // The file in which the service is defined.
     File file = 1 [(required) = true];
 
-    // The name of the service in which the option is discovered.
-    ServiceName service = 2 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    ServiceName service = 2 [deprecated = true];
 
     // The discovered option.
     Option option = 3 [(required) = true];
+
+    // The service in which the option is discovered.
+    Service subject = 4 [(required) = true];
 }
 
 // Emitted when a service is completely discovered, including all the option and RPCs.
@@ -365,14 +371,17 @@ message RpcOptionDiscovered {
     // The file in which the RPC is defined.
     File file = 1 [(required) = true];
 
-    // The name of the service in which the RPC is defined.
-    ServiceName service = 2 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    ServiceName service = 2 [deprecated = true];
 
-    // The RPC in which the option is discovered.
-    RpcName rpc = 3 [(required) = true];
+    // Deprecated: please use `subject` instead.
+    RpcName rpc = 3 [deprecated = true];
 
     // The discovered option.
     Option option = 4 [(required) = true];
+
+    // The RPC in which the option is discovered.
+    Rpc subject = 5 [(required) = true];
 }
 
 // Emitted when an RPC is completely discovered.
diff --git a/backend/src/main/kotlin/io/spine/protodata/backend/event/EnumEvents.kt b/backend/src/main/kotlin/io/spine/protodata/backend/event/EnumEvents.kt
index 451611fbb..f75c2a309 100644
--- a/backend/src/main/kotlin/io/spine/protodata/backend/event/EnumEvents.kt
+++ b/backend/src/main/kotlin/io/spine/protodata/backend/event/EnumEvents.kt
@@ -76,7 +76,7 @@ internal class EnumEvents(header: ProtoFileHeader) : DeclarationEvents<EnumDescr
         produceOptionEvents(desc.options, desc) {
             enumOptionDiscovered {
                 file = path
-                this.type = typeName
+                subject = enumType
                 option = it
             }
         }
@@ -118,8 +118,7 @@ internal class EnumEvents(header: ProtoFileHeader) : DeclarationEvents<EnumDescr
         produceOptionEvents(desc.options, desc) {
             enumConstantOptionDiscovered {
                 file = path
-                type = typeName
-                constant = name
+                subject = theConstant
                 option = it
             }
         }
diff --git a/backend/src/main/kotlin/io/spine/protodata/backend/event/MessageEvents.kt b/backend/src/main/kotlin/io/spine/protodata/backend/event/MessageEvents.kt
index 130db8fa5..8e50066d7 100644
--- a/backend/src/main/kotlin/io/spine/protodata/backend/event/MessageEvents.kt
+++ b/backend/src/main/kotlin/io/spine/protodata/backend/event/MessageEvents.kt
@@ -38,13 +38,13 @@ import io.spine.protodata.ast.event.OneofGroupExited
 import io.spine.protodata.ast.event.fieldEntered
 import io.spine.protodata.ast.event.fieldExited
 import io.spine.protodata.ast.event.fieldOptionDiscovered
+import io.spine.protodata.ast.event.messageOptionDiscovered
 import io.spine.protodata.ast.event.oneofGroupEntered
 import io.spine.protodata.ast.event.oneofGroupExited
 import io.spine.protodata.ast.event.oneofOptionDiscovered
 import io.spine.protodata.ast.event.typeDiscovered
 import io.spine.protodata.ast.event.typeEntered
 import io.spine.protodata.ast.event.typeExited
-import io.spine.protodata.ast.event.typeOptionDiscovered
 import io.spine.protodata.ast.produceOptionEvents
 import io.spine.protodata.ast.withAbsoluteFile
 import io.spine.protodata.protobuf.name
@@ -88,9 +88,9 @@ internal class MessageEvents(header: ProtoFileHeader) : DeclarationEvents<Descri
             }
         )
         produceOptionEvents(desc.options, desc) {
-            typeOptionDiscovered {
+            messageOptionDiscovered {
                 file = path
-                type = typeName
+                subject = messageType
                 option = it
             }
         }
diff --git a/backend/src/main/kotlin/io/spine/protodata/backend/event/ServiceEvents.kt b/backend/src/main/kotlin/io/spine/protodata/backend/event/ServiceEvents.kt
index e8c977326..aab1a77ea 100644
--- a/backend/src/main/kotlin/io/spine/protodata/backend/event/ServiceEvents.kt
+++ b/backend/src/main/kotlin/io/spine/protodata/backend/event/ServiceEvents.kt
@@ -80,7 +80,7 @@ internal class ServiceEvents(header: ProtoFileHeader) :
         produceOptionEvents(desc.options, desc) {
             serviceOptionDiscovered {
                 file = path
-                service = serviceName
+                subject = serviceType
                 option = it
             }
         }
@@ -111,8 +111,7 @@ internal class ServiceEvents(header: ProtoFileHeader) :
         produceOptionEvents(desc.options, desc) {
             rpcOptionDiscovered {
                 file = path
-                service = serviceName
-                rpc = theRpc.name
+                subject = theRpc
                 option = it
             }
         }
diff --git a/dependencies.md b/dependencies.md
index 822d8038e..c6b833977 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine.protodata:protodata-api:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-api:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -1113,12 +1113,12 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:22 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-api-tests:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-api-tests:0.93.12`
 
 ## Runtime
 1.  **Group** : org.jetbrains. **Name** : annotations. **Version** : 13.0.
@@ -1955,12 +1955,12 @@ This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:22 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-backend:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-backend:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -3069,12 +3069,12 @@ This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:23 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-cli:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-cli:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -4218,12 +4218,12 @@ This report was generated on **Mon Apr 14 13:39:09 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:23 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-gradle-api:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-gradle-api:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -5259,12 +5259,12 @@ This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:23 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-gradle-plugin:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-gradle-plugin:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -6388,12 +6388,12 @@ This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:24 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-java:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-java:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -7502,12 +7502,12 @@ This report was generated on **Mon Apr 14 13:39:10 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:24 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-params:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-params:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -8619,12 +8619,12 @@ This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:24 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-protoc:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-protoc:0.93.12`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -9454,12 +9454,12 @@ This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:24 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-test-env:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-test-env:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -10575,12 +10575,12 @@ This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 15 14:51:25 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.protodata:protodata-testlib:0.93.11`
+# Dependencies of `io.spine.protodata:protodata-testlib:0.93.12`
 
 ## Runtime
 1.  **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.15.3.
@@ -11815,4 +11815,4 @@ This report was generated on **Mon Apr 14 13:39:11 CEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon Apr 14 13:39:12 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+This report was generated on **Tue Apr 15 14:51:25 CEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 638596cd7..835597333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine.protodata</groupId>
 <artifactId>ProtoData</artifactId>
-<version>0.93.11</version>
+<version>0.93.12</version>
 
 <inceptionYear>2015</inceptionYear>
 
diff --git a/version.gradle.kts b/version.gradle.kts
index 0b9a33c02..7acc31c5f 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -32,4 +32,4 @@
  *
  * For dependencies on Spine SDK module please see [io.spine.dependency.local.Spine].
  */
-val protoDataVersion: String by extra("0.93.11")
+val protoDataVersion: String by extra("0.93.12")