diff --git a/enumerator/usb_go1.10_darwin.go b/enumerator/usb_darwin.go
similarity index 99%
rename from enumerator/usb_go1.10_darwin.go
rename to enumerator/usb_darwin.go
index 357904b..c72a19a 100644
--- a/enumerator/usb_go1.10_darwin.go
+++ b/enumerator/usb_darwin.go
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file.
 //
 
-// +build go1.10
+// +build go1.10,darwin
 
 package enumerator // import "go.bug.st/serial.v1/enumerator"
 
diff --git a/enumerator/usb_go1.9_darwin.go b/enumerator/usb_darwin_go1.9.go
similarity index 99%
rename from enumerator/usb_go1.9_darwin.go
rename to enumerator/usb_darwin_go1.9.go
index f8ed324..24cd32f 100644
--- a/enumerator/usb_go1.9_darwin.go
+++ b/enumerator/usb_darwin_go1.9.go
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file.
 //
 
-// +build !go1.10
+// +build !go1.10,darwin
 
 // This file is here to keep compatibility with the older versions of go
 // and is no more maintained or bugfixed, please update your go version