diff --git a/src/common/logging/clap.h b/src/common/logging/clap.h
index edf018a2..69293787 100644
--- a/src/common/logging/clap.h
+++ b/src/common/logging/clap.h
@@ -88,7 +88,7 @@ class ClapLogger {
 
     template <typename T>
     void log_response(bool is_host_plugin,
-                      const PrimitiveWrapper<T>& value,
+                      const PrimitiveResponse<T>& value,
                       bool from_cache = false) {
         log_response_base(is_host_plugin, [&](auto& message) {
             if constexpr (std::is_same_v<T, bool>) {
diff --git a/src/common/logging/vst3.h b/src/common/logging/vst3.h
index 05880650..2e4ab3f4 100644
--- a/src/common/logging/vst3.h
+++ b/src/common/logging/vst3.h
@@ -347,7 +347,7 @@ class Vst3Logger {
 
     template <typename T>
     void log_response(bool is_host_plugin,
-                      const PrimitiveWrapper<T>& value,
+                      const PrimitiveResponse<T>& value,
                       bool from_cache = false) {
         // For logging all primitive return values other than `tresult`
         log_response_base(is_host_plugin, [&](auto& message) {
diff --git a/src/common/serialization/clap/plugin.h b/src/common/serialization/clap/plugin.h
index fc9cc10e..7a358e39 100644
--- a/src/common/serialization/clap/plugin.h
+++ b/src/common/serialization/clap/plugin.h
@@ -235,7 +235,7 @@ struct Deactivate {
  * Message struct for `clap_plugin::start_processing()`.
  */
 struct StartProcessing {
-    using Response = PrimitiveWrapper<bool>;
+    using Response = PrimitiveResponse<bool>;
 
     native_size_t instance_id;
 
diff --git a/src/common/serialization/common.h b/src/common/serialization/common.h
index c08f8358..85935c1d 100644
--- a/src/common/serialization/common.h
+++ b/src/common/serialization/common.h
@@ -50,10 +50,10 @@ struct Ack {
  * you define a serialization function.
  */
 template <typename T>
-class PrimitiveWrapper {
+class PrimitiveResponse {
    public:
-    PrimitiveWrapper() noexcept {}
-    PrimitiveWrapper(T value) noexcept : value_(value) {}
+    PrimitiveResponse() noexcept {}
+    PrimitiveResponse(T value) noexcept : value_(value) {}
 
     operator T() const noexcept { return value_; }
 
diff --git a/src/common/serialization/vst3/plugin/audio-processor.h b/src/common/serialization/vst3/plugin/audio-processor.h
index a0b6deb4..d0cff86c 100644
--- a/src/common/serialization/vst3/plugin/audio-processor.h
+++ b/src/common/serialization/vst3/plugin/audio-processor.h
@@ -166,7 +166,7 @@ class YaAudioProcessor : public Steinberg::Vst::IAudioProcessor {
      * to the Wine plugin host.
      */
     struct GetLatencySamples {
-        using Response = PrimitiveWrapper<uint32>;
+        using Response = PrimitiveResponse<uint32>;
 
         native_size_t instance_id;
 
@@ -279,7 +279,7 @@ class YaAudioProcessor : public Steinberg::Vst::IAudioProcessor {
      * to the Wine plugin host.
      */
     struct GetTailSamples {
-        using Response = PrimitiveWrapper<uint32>;
+        using Response = PrimitiveResponse<uint32>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/component.h b/src/common/serialization/vst3/plugin/component.h
index 7ea5b80a..f290a0e9 100644
--- a/src/common/serialization/vst3/plugin/component.h
+++ b/src/common/serialization/vst3/plugin/component.h
@@ -126,7 +126,7 @@ class YaComponent : public Steinberg::Vst::IComponent {
      * the Wine plugin host.
      */
     struct GetBusCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/edit-controller.h b/src/common/serialization/vst3/plugin/edit-controller.h
index 67f11c6a..7f3f83e0 100644
--- a/src/common/serialization/vst3/plugin/edit-controller.h
+++ b/src/common/serialization/vst3/plugin/edit-controller.h
@@ -102,7 +102,7 @@ class YaEditController : public Steinberg::Vst::IEditController {
      * to the Wine plugin host.
      */
     struct GetParameterCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
@@ -242,7 +242,7 @@ class YaEditController : public Steinberg::Vst::IEditController {
      * Wine plugin host.
      */
     struct NormalizedParamToPlain {
-        using Response = PrimitiveWrapper<Steinberg::Vst::ParamValue>;
+        using Response = PrimitiveResponse<Steinberg::Vst::ParamValue>;
 
         native_size_t instance_id;
 
@@ -267,7 +267,7 @@ class YaEditController : public Steinberg::Vst::IEditController {
      * plugin host.
      */
     struct PlainParamToNormalized {
-        using Response = PrimitiveWrapper<Steinberg::Vst::ParamValue>;
+        using Response = PrimitiveResponse<Steinberg::Vst::ParamValue>;
 
         native_size_t instance_id;
 
@@ -291,7 +291,7 @@ class YaEditController : public Steinberg::Vst::IEditController {
      * `IEditController::getParamNormalized(id)` to the Wine plugin host.
      */
     struct GetParamNormalized {
-        using Response = PrimitiveWrapper<Steinberg::Vst::ParamValue>;
+        using Response = PrimitiveResponse<Steinberg::Vst::ParamValue>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/keyswitch-controller.h b/src/common/serialization/vst3/plugin/keyswitch-controller.h
index 05376e85..9af676fc 100644
--- a/src/common/serialization/vst3/plugin/keyswitch-controller.h
+++ b/src/common/serialization/vst3/plugin/keyswitch-controller.h
@@ -69,7 +69,7 @@ class YaKeyswitchController : public Steinberg::Vst::IKeyswitchController {
      * plugin host.
      */
     struct GetKeyswitchCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/note-expression-controller.h b/src/common/serialization/vst3/plugin/note-expression-controller.h
index 0da12556..337393a1 100644
--- a/src/common/serialization/vst3/plugin/note-expression-controller.h
+++ b/src/common/serialization/vst3/plugin/note-expression-controller.h
@@ -73,7 +73,7 @@ class YaNoteExpressionController
      * to the Wine plugin host.
      */
     struct GetNoteExpressionCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/process-context-requirements.h b/src/common/serialization/vst3/plugin/process-context-requirements.h
index 0dd24269..50562719 100644
--- a/src/common/serialization/vst3/plugin/process-context-requirements.h
+++ b/src/common/serialization/vst3/plugin/process-context-requirements.h
@@ -72,7 +72,7 @@ class YaProcessContextRequirements
      * Wine plugin host.
      */
     struct GetProcessContextRequirements {
-        using Response = PrimitiveWrapper<uint32>;
+        using Response = PrimitiveResponse<uint32>;
 
         native_size_t instance_id;
 
diff --git a/src/common/serialization/vst3/plugin/unit-info.h b/src/common/serialization/vst3/plugin/unit-info.h
index cfa2bbc2..67408b60 100644
--- a/src/common/serialization/vst3/plugin/unit-info.h
+++ b/src/common/serialization/vst3/plugin/unit-info.h
@@ -69,7 +69,7 @@ class YaUnitInfo : public Steinberg::Vst::IUnitInfo {
      * plugin host.
      */
     struct GetUnitCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
@@ -123,7 +123,7 @@ class YaUnitInfo : public Steinberg::Vst::IUnitInfo {
      * the Wine plugin host.
      */
     struct GetProgramListCount {
-        using Response = PrimitiveWrapper<int32>;
+        using Response = PrimitiveResponse<int32>;
 
         native_size_t instance_id;
 
@@ -332,7 +332,7 @@ class YaUnitInfo : public Steinberg::Vst::IUnitInfo {
      * Wine plugin host.
      */
     struct GetSelectedUnit {
-        using Response = PrimitiveWrapper<Steinberg::Vst::UnitID>;
+        using Response = PrimitiveResponse<Steinberg::Vst::UnitID>;
 
         native_size_t instance_id;