diff --git a/BUILD.bazel b/BUILD.bazel
index eb12c6a..4f25c91 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -23,7 +23,7 @@ go_library(
         "safeopen_nix_common.go",
         "safeopen_linux.go",
         "safeopen_nix.go",
-        "safeopen_win.go",
+        "safeopen_windows.go",
     ],
     importpath = "github.com/google/safeopen",
     visibility = ["//visibility:public"],
@@ -46,7 +46,7 @@ go_test(
       "safeopen_test.go",
       "safeopen_linux_test.go",
       "safeopen_nix_test.go",
-      "safeopen_win_test.go",
+      "safeopen_windows_test.go",
     ],
     embed = [":safeopen"],
 )
diff --git a/safeopen_linux.go b/safeopen_linux.go
index 3155bde..d0604e4 100644
--- a/safeopen_linux.go
+++ b/safeopen_linux.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux
-// +build linux
-
 package safeopen
 
 import (
diff --git a/safeopen_linux_test.go b/safeopen_linux_test.go
index 76ae97e..0e9179b 100644
--- a/safeopen_linux_test.go
+++ b/safeopen_linux_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build linux
-// +build linux
-
 package safeopen
 
 import (
diff --git a/safeopen_nix.go b/safeopen_nix.go
index 4775ec0..462815b 100644
--- a/safeopen_nix.go
+++ b/safeopen_nix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build unix && !linux
-// +build unix,!linux
 
 package safeopen
 
diff --git a/safeopen_nix_common.go b/safeopen_nix_common.go
index 575e7c4..acac5ce 100644
--- a/safeopen_nix_common.go
+++ b/safeopen_nix_common.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build unix
-// +build unix
 
 package safeopen
 
diff --git a/safeopen_nix_test.go b/safeopen_nix_test.go
index a1f886b..2da6060 100644
--- a/safeopen_nix_test.go
+++ b/safeopen_nix_test.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build unix
-// +build unix
 
 package safeopen
 
diff --git a/safeopen_win.go b/safeopen_windows.go
similarity index 99%
rename from safeopen_win.go
rename to safeopen_windows.go
index a749ee3..90f70f1 100644
--- a/safeopen_win.go
+++ b/safeopen_windows.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build windows
-// +build windows
-
 package safeopen
 
 import (
diff --git a/safeopen_win_test.go b/safeopen_windows_test.go
similarity index 99%
rename from safeopen_win_test.go
rename to safeopen_windows_test.go
index 6176be3..82d76ab 100644
--- a/safeopen_win_test.go
+++ b/safeopen_windows_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build windows
-// +build windows
-
 package safeopen
 
 import (