diff --git a/src/tests/modules/files/compound_key b/src/tests/modules/files/compound_key
index 3f491f279c21..1dfbe0d8b358 100644
--- a/src/tests/modules/files/compound_key
+++ b/src/tests/modules/files/compound_key
@@ -1 +1 @@
-test0:test1	Tmp-String-0 := 'matched'
+test0:test1	Realm := 'matched'
diff --git a/src/tests/modules/files/compound_key.unlang b/src/tests/modules/files/compound_key.unlang
index beedfe54598c..72dec4dd2f89 100644
--- a/src/tests/modules/files/compound_key.unlang
+++ b/src/tests/modules/files/compound_key.unlang
@@ -1,12 +1,12 @@
-&Tmp-String-0 := 'test0'
-&Tmp-String-1 := 'test1'
+&Filter-Id := 'test0'
+&Callback-Id := 'test1'
 
 compound_key
 if (!ok) {
 	test_fail
 }
-
-if (!(&control.Tmp-String-0 == 'matched')) {
+debug_all
+if (!(&control.Realm == 'matched')) {
 	test_fail
 }
 
diff --git a/src/tests/modules/files/module.conf b/src/tests/modules/files/module.conf
index 00870dbea19a..d8e6ea4eb436 100644
--- a/src/tests/modules/files/module.conf
+++ b/src/tests/modules/files/module.conf
@@ -19,12 +19,12 @@ files subnet2 {
 }
 
 files compound_key {
-	key = "%{Tmp-String-0}:%{Tmp-String-1}"
+	key = "%{Filter-Id}:%{Callback-Id}"
 	filename = $ENV{MODULE_TEST_DIR}/compound_key
 }
 
 #
-#   
+#
 #
 #
 #
diff --git a/src/tests/modules/icmp/ping.unlang b/src/tests/modules/icmp/ping.unlang
index 93050d280d98..61f11efaad6e 100644
--- a/src/tests/modules/icmp/ping.unlang
+++ b/src/tests/modules/icmp/ping.unlang
@@ -1,9 +1,10 @@
-&control.Tmp-String-0 := %ping(127.0.0.1)
+string test_string
+&test_string := %ping(127.0.0.1)
 
 #
 #  @todo - conditions do not yet support YIELD
 #
-if (&control.Tmp-String-0 == "yes") {
+if (&test_string == "yes") {
 	&control.Password.Cleartext := "hello"
 
 	&reply += {
diff --git a/src/tests/modules/idn/idn.unlang b/src/tests/modules/idn/idn.unlang
index 1fe85afe9bb1..d7c6c5f67511 100644
--- a/src/tests/modules/idn/idn.unlang
+++ b/src/tests/modules/idn/idn.unlang
@@ -1,34 +1,34 @@
+string test_string
 #
 #  PRE: update if
 #
 
-&Tmp-String-0 := "%idn('example.com')"
-&Tmp-String-1 := "%idn('èxâmpłé.com')"
-&Tmp-String-2 := "%idn('пример.com')"
-&Tmp-String-3 := "%idn('παράδειγμα.com')"
-&Tmp-String-4 := "%idn('ตัวอย่าง.com')"
-
-if (&Tmp-String-0 != "example.com") {
+&test_string := "%idn('example.com')"
+if (&test_string != "example.com") {
         test_fail
 }
 
-if (&Tmp-String-1 != "xn--xmp-ila2ak63d.com") {
+&test_string := "%idn('èxâmpłé.com')"
+if (&test_string != "xn--xmp-ila2ak63d.com") {
         test_fail
 }
 
-if (&Tmp-String-2 != "xn--e1afmkfd.com") {
+&test_string := "%idn('пример.com')"
+if (&test_string != "xn--e1afmkfd.com") {
         test_fail
 }
 
-if (&Tmp-String-3 != "xn--hxajbheg2az3al.com") {
+&test_string := "%idn('παράδειγμα.com')"
+if (&test_string != "xn--hxajbheg2az3al.com") {
         test_fail
 }
 
-if (&Tmp-String-4 != "xn--72c1a1bt4awk9o.com") {
+&test_string := "%idn('ตัวอย่าง.com')"
+if (&test_string != "xn--72c1a1bt4awk9o.com") {
         test_fail
 }
 
-&Tmp-String-0 := "%idn('invalid_example.com')"
+&test_string := "%idn('invalid_example.com')"
 
 if (&Module-Failure-Message != "Non-digit/letter/hyphen in input") {
         test_fail
@@ -40,7 +40,7 @@ if (&Module-Failure-Message == "") {
 
 &request -= &Module-Failure-Message[*]
 
-&Tmp-String-0 := "%idn('a.véry.löng.ņàme.whîch.when.expânded.exceedş.ţhe.dns.stanđard.fór.string.łength.of.twø.hündred.ând.fifty.threé.charáctèrs.and.therefore.is.invalid.for.idn.conversion')"
+&test_string := "%idn('a.véry.löng.ņàme.whîch.when.expânded.exceedş.ţhe.dns.stanđard.fór.string.łength.of.twø.hündred.ând.fifty.threé.charáctèrs.and.therefore.is.invalid.for.idn.conversion')"
 
 if (&Module-Failure-Message != "Conversion was truncated") {
         test_fail