diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md
index 78631e852..a6e7e1670 100644
--- a/guacamole-docker/README.md
+++ b/guacamole-docker/README.md
@@ -55,7 +55,7 @@ Deploying Guacamole with PostgreSQL authentication
 --------------------------------------------------
 
     docker run --name some-guacamole --link some-guacd:guacd \
-        --link some-postgresql:postgresql      \
+        --link some-postgres:postgres        \
         -e POSTGRESQL_DATABASE=guacamole_db  \
         -e POSTGRESQL_USER=guacamole_user    \
         -e POSTGRESQL_PASSWORD=some_password \
diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index c3da02687..e696c379b 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -273,9 +273,9 @@ END
 associate_postgresql() {
 
     # Use linked container if specified
-    if [ -n "$POSTGRESQL_NAME" ]; then
-        POSTGRESQL_HOSTNAME="$POSTGRESQL_PORT_5432_TCP_ADDR"
-        POSTGRESQL_PORT="$POSTGRESQL_PORT_5432_TCP_PORT"
+    if [ -n "$POSTGRES_NAME" ]; then
+        POSTGRESQL_HOSTNAME="$POSTGRES_PORT_5432_TCP_ADDR"
+        POSTGRESQL_PORT="$POSTGRES_PORT_5432_TCP_PORT"
     fi
 
     # Use default port if none specified
@@ -284,11 +284,11 @@ associate_postgresql() {
     # Verify required connection information is present
     if [ -z "$POSTGRESQL_HOSTNAME" -o -z "$POSTGRESQL_PORT" ]; then
         cat <<END
-FATAL: Missing POSTGRESQL_HOSTNAME or "postgresql" link.
+FATAL: Missing POSTGRESQL_HOSTNAME or "postgres" link.
 -------------------------------------------------------------------------------
 If using a PostgreSQL database, you must either:
 
-(a) Explicitly link that container with the link named "postgresql".
+(a) Explicitly link that container with the link named "postgres".
 
 (b) If not using a Docker container for PostgreSQL, explicitly specify the TCP
     connection to your database using the following environment variables: