diff --git a/model/raw/src/main/scala/aqua/raw/ops/RawTag.scala b/model/raw/src/main/scala/aqua/raw/ops/RawTag.scala
index 96f64cfd..a035ccdc 100644
--- a/model/raw/src/main/scala/aqua/raw/ops/RawTag.scala
+++ b/model/raw/src/main/scala/aqua/raw/ops/RawTag.scala
@@ -292,8 +292,7 @@ case class ClosureTag(
   override def renameExports(map: Map[String, String]): RawTag =
     copy(func =
       func.copy(
-        name = map.getOrElse(func.name, func.name),
-        arrow = func.arrow.copy(ret = func.arrow.ret.map(_.renameVars(map)))
+        name = map.getOrElse(func.name, func.name)
       )
     )
 
@@ -301,6 +300,7 @@ case class ClosureTag(
     copy(
       func.copy(arrow =
         func.arrow.copy(
+          ret = func.arrow.ret.map(_.map(f)),
           body = func.arrow.body.map(_.mapValues(f))
         )
       )