diff --git a/internal/core/export/adt.go b/internal/core/export/adt.go
index 95074622f..77ac1b69b 100644
--- a/internal/core/export/adt.go
+++ b/internal/core/export/adt.go
@@ -29,7 +29,7 @@ import (
 )
 
 func (e *exporter) ident(x adt.Feature) *ast.Ident {
-	s := x.IdentString(e.ctx)
+	s := e.identString(x)
 	if !ast.IsValidIdent(s) {
 		panic(s + " is not a valid identifier")
 	}
diff --git a/internal/core/export/self_test.go b/internal/core/export/self_test.go
index bd261db7b..6ba774c05 100644
--- a/internal/core/export/self_test.go
+++ b/internal/core/export/self_test.go
@@ -49,9 +49,6 @@ func TestSelfContained(t *testing.T) {
 			"self/selfcontained/cyclic":            `reference not properly substituted`,
 			"self-v3/selfcontained/cyclic":         `reference not properly substituted`,
 			"self-v3-noshare/selfcontained/cyclic": `reference not properly substituted`,
-
-			"self-v3/selfcontained/issue4254":         `hidden for clause variable not renamed`,
-			"self-v3-noshare/selfcontained/issue4254": `hidden for clause variable not renamed`,
 		},
 	}
 
diff --git a/internal/core/export/testdata/selfcontained/issue4254.txtar b/internal/core/export/testdata/selfcontained/issue4254.txtar
index 604b85c63..5b983ce84 100644
--- a/internal/core/export/testdata/selfcontained/issue4254.txtar
+++ b/internal/core/export/testdata/selfcontained/issue4254.txtar
@@ -20,4 +20,28 @@ data: _
 		_v
 	}
 }
+-- out/self-v3/default --
+import "mod.test/a/pkg"
+
+pkg
+-- out/self-v3-noshare/default --
+import "mod.test/a/pkg"
+
+pkg
 -- out/self/default --
+-- out/self-v3/expand_imports --
+data: _
+#foo: {
+	for _v_567475F3 in data
+	for _v_567475F3 in _v_567475F3 {
+		_v_567475F3
+	}
+}
+-- out/self-v3-noshare/expand_imports --
+data: _
+#foo: {
+	for _v_567475F3 in data
+	for _v_567475F3 in _v_567475F3 {
+		_v_567475F3
+	}
+}