diff --git a/Makefile b/Makefile
index f28bbdaf5..ca3f65e5d 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ version:
 		-o bin/node-problem-detector \
 		-ldflags '-X $(PKG)/pkg/version.version=$(VERSION)' \
 		$(BUILD_TAGS) \
-		cmd/node_problem_detector.go
+		./cmd/node-problem-detector
 
 Dockerfile: Dockerfile.in
 	sed -e 's|@BASEIMAGE@|$(BASEIMAGE)|g' $< >$@
diff --git a/cmd/node_problem_detector.go b/cmd/node-problem-detector/node_problem_detector.go
similarity index 100%
rename from cmd/node_problem_detector.go
rename to cmd/node-problem-detector/node_problem_detector.go
diff --git a/cmd/plugins.go b/cmd/node-problem-detector/plugins.go
similarity index 100%
rename from cmd/plugins.go
rename to cmd/node-problem-detector/plugins.go