diff --git a/Makefile b/Makefile
index df6cde1..d46972b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 VERSION := $(shell git describe --tags)
 BUILD_DIR?=$(shell pwd)/build
+NAME=rio
 
 all: tools deps build-all compress
 
@@ -11,14 +12,14 @@ deps:
 	 dep ensure
 
 build:
-	go build -o rio -ldflags "-X main.version=${VERSION}" rio.go
+	go build -o ${NAME} -ldflags "-X main.version=${VERSION}" main.go
 
 
 build-all:
 	mkdir -p ${BUILD_DIR}/
 	gox -verbose -ldflags "-X main.version=${VERSION}" \
 	  -osarch="linux/amd64 darwin/amd64 windows/amd64 freebsd/amd64" \
-	  -output="${BUILD_DIR}/{{.Dir}}-${VERSION}-{{.OS}}-{{.Arch}}"
+	  -output="${BUILD_DIR}/${NAME}-${VERSION}-{{.OS}}-{{.Arch}}"
 
 compress:
 	gzip -v ${BUILD_DIR}/*
diff --git a/rio.go b/main.go
similarity index 100%
rename from rio.go
rename to main.go