diff --git a/.travis.yml b/.travis.yml
index c1cbe477..53020c40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ before_script:
 
 script:
   - psql -c 'create database mpwo_test;' -U postgres
-  - docker-compose -f docker-compose-ci.yml run api flask init_db
+  - docker-compose -f docker-compose-ci.yml run mpwo-api flask init_db
   - sh test.sh
 
 after_script:
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 839f7a35..e270c19e 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -17,8 +17,8 @@ services:
     ports:
       - 5001:5000
     environment:
-      - DATABASE_URL=postgres://postgres:postgres@api-db:5432/mpwo
-      - DATABASE_TEST_URL=postgres://postgres:postgres@api-db:5432/mpwo_test
+      - DATABASE_URL=postgres://postgres:postgres@mpwo-db:5432/mpwo
+      - DATABASE_TEST_URL=postgres://postgres:postgres@mpwo-db:5432/mpwo_test
       - FLASK_APP=server.py
       - FLASK_DEBUG=1
       - APP_SETTINGS=mpwo_api.config.TestingConfig
diff --git a/test.sh b/test.sh
index 379d2ebd..d2620b89 100644
--- a/test.sh
+++ b/test.sh
@@ -8,7 +8,7 @@ inspect() {
   fi
 }
 
-docker-compose -f docker-compose-ci.yml run api flask test
+docker-compose -f docker-compose-ci.yml run mpwo-api flask test
 inspect $? api
 
 testcafe chrome mpwo_client/e2e