diff --git a/.travis.yml b/.travis.yml
index a3f85f70..4afe4079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,6 @@ before_install:
   - pip install codecov
   - docker-compose build
 
-script: docker-compose run --rm bigchain py.test -v --cov=bigchaindb
+script: docker-compose run --rm bigchaindb py.test -v --cov=bigchaindb
 
 after_success: codecov
diff --git a/docker-compose.yml b/docker-compose.yml
index a758e86d..c5679e8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ rethinkdb-data:
     - /data
   command: "true"
 
-bigchain:
+bigchaindb:
   build: .
   volumes:
     - ./:/usr/src/app/
@@ -20,4 +20,4 @@ bigchain:
     - rethinkdb
   environment:
     BIGCHAIN_DATABASE_HOST: rethinkdb
-  command: bigchain start
+  command: bigchaindb start