diff --git a/client/allocdir/alloc_dir_linux.go b/client/allocdir/builder.go
similarity index 99%
rename from client/allocdir/alloc_dir_linux.go
rename to client/allocdir/builder.go
index 67da9813f..7efb0a334 100644
--- a/client/allocdir/alloc_dir_linux.go
+++ b/client/allocdir/builder.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 package allocdir
 
 import (
diff --git a/client/allocdir/alloc_dir_windows.go b/client/allocdir/builder_windows.go
similarity index 91%
rename from client/allocdir/alloc_dir_windows.go
rename to client/allocdir/builder_windows.go
index 524d40014..b6ef79c6a 100644
--- a/client/allocdir/alloc_dir_windows.go
+++ b/client/allocdir/builder_windows.go
@@ -1,3 +1,5 @@
+// +build !linux
+
 package allocdir
 
 import "github.com/hashicorp/nomad/nomad/structs"