diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/build-environment.expected b/go/ql/integration-tests/all-platforms/go/bazel-sample-1/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-1/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/bazel-sample-1/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/build-environment.expected b/go/ql/integration-tests/all-platforms/go/bazel-sample-2/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/bazel-sample-2/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/bazel-sample-2/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build-environment.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/build-environment.expected b/go/ql/integration-tests/all-platforms/go/extract-vendor/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/extract-vendor/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/extract-vendor/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build-environment.expected b/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/build-environment.expected b/go/ql/integration-tests/all-platforms/go/go-mod-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-sample/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/go-mod-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/build-environment.expected b/go/ql/integration-tests/all-platforms/go/go-mod-without-version/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-mod-without-version/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/go-mod-without-version/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/build-environment.expected b/go/ql/integration-tests/all-platforms/go/go-version-bump/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/go-version-bump/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/go-version-bump/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/build-environment.expected b/go/ql/integration-tests/all-platforms/go/make-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/make-sample/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/make-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/build-environment.expected b/go/ql/integration-tests/all-platforms/go/mixed-layout/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/mixed-layout/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/mixed-layout/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/build-environment.expected b/go/ql/integration-tests/all-platforms/go/ninja-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/ninja-sample/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/ninja-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build-environment.expected b/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build-environment.expected b/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build-environment.expected b/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build-environment.expected b/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build-environment.expected b/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build-environment.expected b/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build-environment.expected b/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build-environment.expected b/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build-environment.expected b/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build-environment.expected
rename to go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/build-environment.expected b/go/ql/integration-tests/linux-only/go/dep-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/dep-sample/build-environment.expected
rename to go/ql/integration-tests/linux-only/go/dep-sample/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/build-environment.expected b/go/ql/integration-tests/linux-only/go/glide-sample/build_environment.expected
similarity index 100%
rename from go/ql/integration-tests/linux-only/go/glide-sample/build-environment.expected
rename to go/ql/integration-tests/linux-only/go/glide-sample/build_environment.expected