diff --git a/scio-macros/src/main/scala/com/spotify/scio/MagnoliaMacros.scala b/scio-macros/src/main/scala/com/spotify/scio/MagnoliaMacros.scala
index 416b8cb22d..4bf2093794 100644
--- a/scio-macros/src/main/scala/com/spotify/scio/MagnoliaMacros.scala
+++ b/scio-macros/src/main/scala/com/spotify/scio/MagnoliaMacros.scala
@@ -47,17 +47,17 @@ private[scio] object MagnoliaMacros {
             super.transform(
               q"$caseClass($typeName, $isObject, $isValueClass, $parametersArray, Array.empty[Any], Array.empty[Any], Array.empty[Any])"
             )
-          case q"Param.apply[$tc_, $t_, $p_]($name, $typeNameParam, $idx, $isRepeated, $typeclassParam, $defaultVal, $_, $_, $_)" =>
+          case q"Param.apply[$TC, $T, $P]($name, $typeNameParam, $idx, $isRepeated, $typeclassParam, $defaultVal, $_, $_, $_)" =>
             super.transform(
-              q"_root_.magnolia1.Param[$tc_, $t_, $p_]($name, $typeNameParam, $idx, $isRepeated, $typeclassParam, $defaultVal, Array.empty[Any], Array.empty[Any], Array.empty[Any])"
+              q"_root_.magnolia1.Param[$TC, $T, $P]($name, $typeNameParam, $idx, $isRepeated, $typeclassParam, $defaultVal, Array.empty[Any], Array.empty[Any], Array.empty[Any])"
             )
           case q"new SealedTrait($typeName, $subtypesArray, $_, $_, $_)" =>
             super.transform(
               q"new _root_.magnolia1.SealedTrait($typeName, $subtypesArray, Array.empty[Any], Array.empty[Any], Array.empty[Any])"
             )
-          case q"Subtype[$tc_, $t_, $s_]($name, $idx, $_, $_, $_, $tc, $isType, $asType)" =>
+          case q"Subtype[$TC, $T, $S]($name, $idx, $_, $_, $_, $tc, $isType, $asType)" =>
             super.transform(
-              q"_root_.magnolia1.Subtype[$tc_, $t_,$s_]($name, $idx, Array.empty[Any], Array.empty[Any], Array.empty[Any], $tc, $isType, $asType)"
+              q"_root_.magnolia1.Subtype[$TC, $T, $S]($name, $idx, Array.empty[Any], Array.empty[Any], Array.empty[Any], $tc, $isType, $asType)"
             )
           case t =>
             super.transform(t)