diff --git a/Dockerfile b/Dockerfile
index dade863ca..fec76ee37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,8 @@ RUN mkdir -p /usr/src/paperless/src
 COPY src/ /usr/src/paperless/src/
 
 # Set consumption directory
-ENV PAPERLESS_CONSUME /consume
-RUN mkdir -p $PAPERLESS_CONSUME
+ENV PAPERLESS_CONSUMPTION_DIR /consume
+RUN mkdir -p $PAPERLESS_CONSUMPTION_DIR
 
 # Migrate database
 WORKDIR /usr/src/paperless/src
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index 7e3557aa8..488fc83d2 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -8,8 +8,8 @@ services:
             # modifying the part before the `:`.
             - "8000:8000"
         volumes:
-            - paperless-data:/usr/src/paperless/data
-            - paperless-media:/usr/src/paperless/media
+            - data:/usr/src/paperless/data
+            - media:/usr/src/paperless/media
         env_file: docker-compose.env
         environment:
             - PAPERLESS_OCR_LANGUAGES=
@@ -18,20 +18,20 @@ services:
     consumer:
         image: paperless
         volumes:
-            - paperless-data:/usr/src/paperless/data
-            - paperless-media:/usr/src/paperless/media
+            - data:/usr/src/paperless/data
+            - media:/usr/src/paperless/media
             # You have to adapt the local path you want the consumption
             # directory to mount to by modifying the part before the ':'.
             - /path/to/arbitrary/place:/consume
             # Likewise, you can add a local path to mount a directory for
             # exporting. This is not strictly needed for paperless to
             # function, only if you're exporting your files: uncomment
-            # it and fill in a local path if you know you're going to 
+            # it and fill in a local path if you know you're going to
             # want to export your documents.
             # - /path/to/another/arbitrary/place:/export
         env_file: docker-compose.env
         command: ["document_consumer"]
 
 volumes:
-    paperless-data:
-    paperless-media:
+    data:
+    media:
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 9001574a1..14d385469 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -16,8 +16,8 @@ map_uidgid() {
 
 set_permissions() {
     # Set permissions for consumption directory
-    chgrp paperless "$PAPERLESS_CONSUME"
-    chmod g+x "$PAPERLESS_CONSUME"
+    chgrp paperless "$PAPERLESS_CONSUMPTION_DIR"
+    chmod g+x "$PAPERLESS_CONSUMPTION_DIR"
 
     # Set permissions for application directory
     chown -Rh paperless:paperless /usr/src/paperless