diff --git a/.gitignore b/.gitignore
index bbe7333e369..8665171f70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ cover.html
 .mkdocs-virtual-env/
 vendor/
 examples/hotrod/hotrod
-cmd/standalone/standalone-linux
+cmd/all-in-one/all-in-one-*
 cmd/agent/agent
 cmd/agent/agent-linux
 cmd/collector/collector
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c05a11f838..4d2bb48f33a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,13 +43,13 @@ make test
 The `jaeger-ui` submodule contains the source code for the UI assets (requires Node.js 6+). The assets must be compiled first with `make build_ui`, which runs Node.js build and then packages the assets into a Go file that is `.gitignore`-ed. The packaged assets can be enabled by providing a build tag `ui`, e.g.:
 
 ```
-$ go run -tags ui ./cmd/standalone/main.go
+$ go run -tags ui ./cmd/all-in-one/main.go
 ```
 
 Alternatively, the path to the built UI assets can be provided via `--query.static-files` flag:
 
 ```
-$ go run ./cmd/standalone/main.go --query.static-files jaeger-ui/build
+$ go run ./cmd/all-in-one/main.go --query.static-files jaeger-ui/build
 ```
 
 ## Project Structure
diff --git a/Makefile b/Makefile
index 3cbd521e7ab..857ee792c84 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ test: go-gen
 
 .PHONY: integration-test
 integration-test: go-gen
-	$(GOTEST) -tags=integration ./cmd/standalone/...
+	$(GOTEST) -tags=integration ./cmd/all-in-one/...
 
 .PHONY: storage-integration-test
 storage-integration-test: go-gen
@@ -184,7 +184,7 @@ build-all-in-one-linux: build_ui
 
 .PHONY: build-all-in-one
 build-all-in-one:
-	CGO_ENABLED=0 installsuffix=cgo go build -tags ui -o ./cmd/standalone/standalone-$(GOOS) $(BUILD_INFO) ./cmd/standalone/main.go
+	CGO_ENABLED=0 installsuffix=cgo go build -tags ui -o ./cmd/all-in-one/all-in-one-$(GOOS) $(BUILD_INFO) ./cmd/all-in-one/main.go
 
 .PHONY: build-agent
 build-agent:
diff --git a/cmd/standalone/Dockerfile b/cmd/all-in-one/Dockerfile
similarity index 68%
rename from cmd/standalone/Dockerfile
rename to cmd/all-in-one/Dockerfile
index 7f4788163ab..271bae939fc 100644
--- a/cmd/standalone/Dockerfile
+++ b/cmd/all-in-one/Dockerfile
@@ -18,8 +18,8 @@ EXPOSE 14268
 # Web HTTP
 EXPOSE 16686
 
-COPY ./cmd/standalone/standalone-linux /go/bin/
-COPY ./cmd/standalone/sampling_strategies.json /etc/jaeger/
+COPY ./cmd/all-in-one/all-in-one-linux /go/bin/
+COPY ./cmd/all-in-one/sampling_strategies.json /etc/jaeger/
 
-ENTRYPOINT ["/go/bin/standalone-linux"]
+ENTRYPOINT ["/go/bin/all-in-one-linux"]
 CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]
diff --git a/cmd/standalone/standalone_test.go b/cmd/all-in-one/all_in_one_test.go
similarity index 98%
rename from cmd/standalone/standalone_test.go
rename to cmd/all-in-one/all_in_one_test.go
index e892d05ff6b..4dcf4956a11 100644
--- a/cmd/standalone/standalone_test.go
+++ b/cmd/all-in-one/all_in_one_test.go
@@ -51,7 +51,7 @@ var (
 	}
 )
 
-func TestStandalone(t *testing.T) {
+func TestAllInOne(t *testing.T) {
 	// Check if the query service is available
 	if err := healthCheck(); err != nil {
 		t.Fatal(err)
diff --git a/cmd/standalone/main.go b/cmd/all-in-one/main.go
similarity index 99%
rename from cmd/standalone/main.go
rename to cmd/all-in-one/main.go
index 6d3f32cd4c9..1b3a1ecec47 100644
--- a/cmd/standalone/main.go
+++ b/cmd/all-in-one/main.go
@@ -60,7 +60,7 @@ import (
 	zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
-// standalone/main is a standalone full-stack jaeger backend, backed by a memory store
+// all-in-one/main is a standalone full-stack jaeger backend, backed by a memory store
 func main() {
 	var signalsChannel = make(chan os.Signal)
 	signal.Notify(signalsChannel, os.Interrupt, syscall.SIGTERM)
@@ -78,7 +78,7 @@ func main() {
 	}
 	v := viper.New()
 	command := &cobra.Command{
-		Use:   "jaeger-standalone",
+		Use:   "jaeger-all-in-one",
 		Short: "Jaeger all-in-one distribution with agent, collector and query in one process.",
 		Long: `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version
 		 uses only in-memory database.`,
diff --git a/cmd/standalone/sampling_strategies.json b/cmd/all-in-one/sampling_strategies.json
similarity index 100%
rename from cmd/standalone/sampling_strategies.json
rename to cmd/all-in-one/sampling_strategies.json
diff --git a/cmd/all-in-one/standalone-linux b/cmd/all-in-one/standalone-linux
new file mode 100755
index 00000000000..7b2f5252e88
Binary files /dev/null and b/cmd/all-in-one/standalone-linux differ
diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh
index 06896b0c69a..933ef3bba2d 100755
--- a/scripts/travis/build-all-in-one-image.sh
+++ b/scripts/travis/build-all-in-one-image.sh
@@ -10,7 +10,7 @@ make build-all-in-one-linux
 
 export REPO=jaegertracing/all-in-one
 
-docker build -f cmd/standalone/Dockerfile -t $REPO:latest .
+docker build -f cmd/all-in-one/Dockerfile -t $REPO:latest .
 export CID=$(docker run -d -p 16686:16686 -p 5778:5778 $REPO:latest)
 make integration-test
 docker kill $CID
diff --git a/scripts/travis/package-deploy.sh b/scripts/travis/package-deploy.sh
index 5bf02d59978..7bd0ab3aa2e 100755
--- a/scripts/travis/package-deploy.sh
+++ b/scripts/travis/package-deploy.sh
@@ -20,7 +20,7 @@ function stage-platform-files {
     local PACKAGE_STAGING_DIR=$2
     local FILE_EXTENSION=$3
     
-    stage-file ./cmd/standalone/standalone-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-standalone$FILE_EXTENSION
+    stage-file ./cmd/all-in-one/all-in-one-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-all-in-one$FILE_EXTENSION
     stage-file ./cmd/agent/agent-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-agent$FILE_EXTENSION
     stage-file ./cmd/query/query-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-query$FILE_EXTENSION
     stage-file ./cmd/collector/collector-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-collector$FILE_EXTENSION