diff --git a/Dockerfile b/Dockerfile
index d8dbadc6e..fb41046e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,6 @@ ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
 ENV GODEBUG=netdns=go
 ENV XDG_CACHE_HOME /var/lib/drone
 
-ADD release/drone-server /bin/
+ADD release/woodpecker-server /bin/
 
-ENTRYPOINT ["/bin/drone-server"]
+ENTRYPOINT ["/bin/woodpecker-server"]
diff --git a/Dockerfile.agent b/Dockerfile.agent
index 95a4e669c..5b38ea73e 100644
--- a/Dockerfile.agent
+++ b/Dockerfile.agent
@@ -2,9 +2,9 @@
 
 FROM drone/ca-certs
 ENV GODEBUG=netdns=go
-ADD release/drone-agent /bin/
+ADD release/woodpecker-agent /bin/
 
 EXPOSE 3000
-HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
+HEALTHCHECK CMD ["/bin/woodpecker-agent", "ping"]
 
-ENTRYPOINT ["/bin/drone-agent"]
+ENTRYPOINT ["/bin/woodpecker-agent"]
diff --git a/Dockerfile.agent.alpine b/Dockerfile.agent.alpine
index 10c7252bd..44ac43188 100644
--- a/Dockerfile.agent.alpine
+++ b/Dockerfile.agent.alpine
@@ -3,10 +3,10 @@ FROM alpine:3.9.4
 RUN apk add -U --no-cache ca-certificates
 
 ENV GODEBUG=netdns=go
-ADD release/drone-agent /bin/
+ADD release/woodpecker-agent /bin/
 
 EXPOSE 3000
-HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
+HEALTHCHECK CMD ["/bin/woodpecker-agent", "ping"]
 
-ENTRYPOINT ["/bin/drone-agent"]
+ENTRYPOINT ["/bin/woodpecker-agent"]
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index a87da8f16..bf71fc37e 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -8,6 +8,6 @@ ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
 ENV GODEBUG=netdns=go
 ENV XDG_CACHE_HOME /var/lib/drone
 
-ADD release/drone-server /bin/
+ADD release/woodpecker-server /bin/
 
-ENTRYPOINT ["/bin/drone-server"]
+ENTRYPOINT ["/bin/woodpecker-server"]
diff --git a/Makefile b/Makefile
index 90c71ba22..1ba6c1b5b 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,10 @@ vet:
 	@go vet $(GO_PACKAGES)
 
 test-agent:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-agent $(GO_PACKAGES)
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/agent $(GO_PACKAGES)
 
 test-server:
-	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/server
 
 test-frontend:
 	(cd web/; yarn run test)
@@ -54,10 +54,10 @@ test-lib:
 test: test-lib test-agent test-server
 
 build-agent:
-	$(DOCKER_RUN) go build -o build/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent
+	$(DOCKER_RUN) go build -o build/woodpecker-agent github.com/woodpecker-ci/woodpecker/cmd/agent
 
 build-server:
-	$(DOCKER_RUN) go build -o build/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
+	$(DOCKER_RUN) go build -o build/woodpecker-server github.com/woodpecker-ci/woodpecker/cmd/server
 
 build-frontend:
 	(cd web/; yarn run build)
@@ -65,10 +65,10 @@ build-frontend:
 build: build-agent build-server
 
 release-agent:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o release/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o release/woodpecker-agent github.com/woodpecker-ci/woodpecker/cmd/agent
 
 release-server:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -ldflags '${LDFLAGS}' -o release/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -ldflags '${LDFLAGS}' -o release/woodpecker-server github.com/woodpecker-ci/woodpecker/cmd/server
 
 release-cli:
 	# disable CGO for cross-compiling
@@ -89,7 +89,3 @@ release-cli:
 	sha256sum cli/release/*.tar.gz > cli/release/woodpecker_checksums.txt
 
 release: release-agent release-server
-
-install:
-	go install github.com/woodpecker-ci/woodpecker/cmd/drone-agent
-	go install github.com/woodpecker-ci/woodpecker/cmd/drone-server
diff --git a/cmd/drone-agent/agent.go b/cmd/agent/agent.go
similarity index 100%
rename from cmd/drone-agent/agent.go
rename to cmd/agent/agent.go
diff --git a/cmd/drone-agent/flags.go b/cmd/agent/flags.go
similarity index 100%
rename from cmd/drone-agent/flags.go
rename to cmd/agent/flags.go
diff --git a/cmd/drone-agent/health.go b/cmd/agent/health.go
similarity index 100%
rename from cmd/drone-agent/health.go
rename to cmd/agent/health.go
diff --git a/cmd/drone-agent/health_test.go b/cmd/agent/health_test.go
similarity index 100%
rename from cmd/drone-agent/health_test.go
rename to cmd/agent/health_test.go
diff --git a/cmd/drone-agent/main.go b/cmd/agent/main.go
similarity index 94%
rename from cmd/drone-agent/main.go
rename to cmd/agent/main.go
index c59c2f61a..3a1c6e996 100644
--- a/cmd/drone-agent/main.go
+++ b/cmd/agent/main.go
@@ -26,9 +26,9 @@ import (
 
 func main() {
 	app := cli.NewApp()
-	app.Name = "drone-agent"
+	app.Name = "woodpecker-agent"
 	app.Version = version.String()
-	app.Usage = "drone agent"
+	app.Usage = "woodpecker agent"
 	app.Action = loop
 	app.Commands = []cli.Command{
 		{
diff --git a/cmd/drone-agent/signal.go b/cmd/agent/signal.go
similarity index 100%
rename from cmd/drone-agent/signal.go
rename to cmd/agent/signal.go
diff --git a/cmd/drone-server/flags.go b/cmd/server/flags.go
similarity index 100%
rename from cmd/drone-server/flags.go
rename to cmd/server/flags.go
diff --git a/cmd/drone-server/main.go b/cmd/server/main.go
similarity index 93%
rename from cmd/drone-server/main.go
rename to cmd/server/main.go
index 69d6549a6..ace116915 100644
--- a/cmd/drone-server/main.go
+++ b/cmd/server/main.go
@@ -28,9 +28,9 @@ import (
 func main() {
 	godotenv.Load(".env")
 	app := cli.NewApp()
-	app.Name = "drone-server"
+	app.Name = "woodpecker-server"
 	app.Version = version.String()
-	app.Usage = "drone server"
+	app.Usage = "woodpecker server"
 	app.Action = server
 	app.Flags = flags
 	app.Before = before
diff --git a/cmd/drone-server/server.go b/cmd/server/server.go
similarity index 100%
rename from cmd/drone-server/server.go
rename to cmd/server/server.go
diff --git a/cmd/drone-server/setup.go b/cmd/server/setup.go
similarity index 100%
rename from cmd/drone-server/setup.go
rename to cmd/server/setup.go