diff --git a/Dockerfile b/Dockerfile
index 5e1b57b5..c67f2537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,8 +31,7 @@ RUN curl -L https://github.com/kelseyhightower/confd/releases/download/v${CONFDV
 ADD patronictl.py patroni.py docker/entrypoint.sh /
 ADD patroni /patroni/
 ADD extras/confd /etc/confd
-RUN    ln -s /ppatroni.py /usr/local/bin/patroni \
-    && ln -s /patronictl.py /usr/local/bin/patronictl
+RUN ln -s /patronictl.py /usr/local/bin/patronictl
 
 ### Setting up a simple script that will serve as an entrypoint
 RUN mkdir /data/ && touch /pgpass /patroni/postgres.yml /var/run/haproxy.pid \
diff --git a/docker/dev_patroni_cluster.sh b/docker/dev_patroni_cluster.sh
index e14da579..2e801d59 100755
--- a/docker/dev_patroni_cluster.sh
+++ b/docker/dev_patroni_cluster.sh
@@ -83,7 +83,7 @@ echo "The etcd container is ${etcd_container}, ip=${etcd_container_ip}"
 
 for i in $(seq 1 "${MEMBERS}")
 do
-    container_name="postgres${i}"
+    container_name=$(random_name)
     patroni_container=$(docker run -P -d -e "PATRONI_NAME=${container_name}" -e "PATRONI_ETCD_HOST=${etcd_container_ip}:4001" --name="${PATRONI_SCOPE}_${container_name}" "${DOCKER_IMAGE}" --etcd="${etcd_container_ip}:4001" --name="${PATRONI_SCOPE}")
     patroni_container_ip=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${patroni_container})
     echo "Started Patroni container ${patroni_container}, ip=${patroni_container_ip}"