diff --git a/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.expected b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.expected
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.expected
diff --git a/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.go
similarity index 93%
rename from ql/test/experimental/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.go
index 5bcad719eb0..aa1ce839e96 100644
--- a/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go
+++ b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.go
@@ -11,7 +11,7 @@ func source() interface{} {
 }
 
 // Package clevergo.tech/clevergo@v0.5.2
-func ClevergoTechClevergov052() {
+func HeaderWrite_ClevergoTechClevergov052() {
 	// Header write via method calls.
 	{
 		// Header write via method calls on clevergo.tech/clevergo.Context.
diff --git a/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.ql b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.ql
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/HeaderWrite.ql
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.expected b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.expected
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.expected
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.go
similarity index 92%
rename from ql/test/experimental/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.go
index 690b2b2d357..3148184f0a6 100644
--- a/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go
+++ b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.go
@@ -11,7 +11,7 @@ func source() interface{} {
 }
 
 // Package clevergo.tech/clevergo@v0.5.2
-func ClevergoTechClevergov052() {
+func HttpRedirect_ClevergoTechClevergov052() {
 	// Redirect via method calls.
 	{
 		// Redirect via method calls on clevergo.tech/clevergo.Context.
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.ql b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.ql
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/HttpRedirect.ql
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.expected b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.expected
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.expected
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.go
similarity index 99%
rename from ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.go
index 8967560c93f..3b0c23b1cd6 100644
--- a/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go
+++ b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.go
@@ -11,7 +11,7 @@ func source() interface{} {
 }
 
 // Package clevergo.tech/clevergo@v0.5.2
-func ClevergoTechClevergov052() {
+func HttpResponseBody_ClevergoTechClevergov052() {
 	// Response body is set via a method call (the content-type is implicit in the method name).
 	{
 		// Response body is set via a method call on the clevergo.tech/clevergo.Context type (the content-type is implicit in the method name).
diff --git a/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.ql b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.ql
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/HttpResponseBody.ql
diff --git a/ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.expected b/ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.expected
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.expected
diff --git a/ql/test/experimental/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go b/ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.go
similarity index 98%
rename from ql/test/experimental/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.go
index 65c01b54edc..adcbe501fce 100644
--- a/ql/test/experimental/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go
+++ b/ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.go
@@ -19,7 +19,7 @@ func source() interface{} {
 }
 
 // Package clevergo.tech/clevergo@v0.5.2
-func ClevergoTechClevergov052() {
+func TaintTracking_ClevergoTechClevergov052() {
 	// Taint-tracking through functions.
 	{
 		// func CleanPath(p string) string
diff --git a/ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.ql b/ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.ql
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/TaintTracking.ql
diff --git a/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.expected b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.expected
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.expected
diff --git a/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.go
similarity index 98%
rename from ql/test/experimental/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.go
index 32fd90629e0..aa2d9232c79 100644
--- a/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go
+++ b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.go
@@ -9,7 +9,7 @@ func main()                 {}
 func sink(v ...interface{}) {}
 
 // Package clevergo.tech/clevergo@v0.5.2
-func ClevergoTechClevergov052() {
+func UntrustedSources_ClevergoTechClevergov052() {
 	// Untrusted flow sources from method calls.
 	{
 		// Untrusted flow sources from method calls on clevergo.tech/clevergo.Context.
diff --git a/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.ql b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.ql
similarity index 100%
rename from ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/UntrustedSources.ql