diff --git a/command/server/config_test_helpers_oss.go b/command/server/config_test_helpers_oss_stubs.go
similarity index 100%
rename from command/server/config_test_helpers_oss.go
rename to command/server/config_test_helpers_oss_stubs.go
diff --git a/tools/stubmaker/main.go b/tools/stubmaker/main.go
index 8538e57b77..70417d27d4 100644
--- a/tools/stubmaker/main.go
+++ b/tools/stubmaker/main.go
@@ -50,12 +50,12 @@ func main() {
 
 	// Read the file and figure out if we need to do anything.
 	inputFile := os.Getenv("GOFILE")
-	if !strings.HasSuffix(inputFile, "_oss.go") {
-		fatal(fmt.Errorf("stubmaker should only be invoked from files ending in _oss.go"))
+	if !strings.HasSuffix(inputFile, "_stubs_oss.go") {
+		fatal(fmt.Errorf("stubmaker should only be invoked from files ending in _stubs_oss.go"))
 	}
 
-	baseFilename := strings.TrimSuffix(inputFile, "_oss.go")
-	outputFile := baseFilename + "_ent.go"
+	baseFilename := strings.TrimSuffix(inputFile, "_stubs_oss.go")
+	outputFile := baseFilename + "_stubs_ent.go"
 	b, err := os.ReadFile(inputFile)
 	if err != nil {
 		fatal(err)