diff --git a/README.md b/README.md
index 8e46d2fd9..aa2f0e8da 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-![Logo](https://github.com/phax/peppol-smp-server/blob/master/docs/logo/logo-gradient-446-100.png)
+![Logo](https://github.com/phax/phoss-smp/blob/master/docs/logo/logo-gradient-446-100.png)
 
 phoss SMP is a complete SMP server that supports both the PEPPOL SMP specification as well as the OASIS BDXR SMP 1.0 specification.
 It comes with a management GUI and an XML backend for simplified operations.  
 It was the first SMP to be [CEF eDelivery conformant](https://ec.europa.eu/cefdigital/wiki/display/CEFDIGITAL/OASIS+SMP+conformant+solutions).
 
-[![Gitter](https://badges.gitter.im/phax/peppol-smp-server.svg)](https://gitter.im/phax/peppol-smp-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/phax/phoss-smp.svg)](https://gitter.im/phax/peppol-smp-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-Latest version: **[5.1.1](https://github.com/phax/peppol-smp-server/releases/tag/peppol-smp-server-parent-pom-5.1.1)** (2019-04-23).
+Latest version: **[5.1.2](https://github.com/phax/phoss-smp/releases/tag/peppol-smp-server-parent-pom-5.1.2)** (2019-05-28).
 A Docker container can be found at [https://hub.docker.com/r/phelger/smp/tags/](https://hub.docker.com/r/phelger/smp/tags/).
-If you are on an old 4.x version see the special [Upgrade guide to v5.0.0](https://github.com/phax/peppol-smp-server/wiki/Upgrade-Guide-V5).
+If you are on an old 4.x version see the special [Upgrade guide to v5.0.0](https://github.com/phax/phoss-smp/wiki/Upgrade-Guide-V5).
 
-Please read the **[Wiki](https://github.com/phax/peppol-smp-server/wiki)** for a detailed description, configuration reference and setup hints. It contains an introduction with screenshots, configuration, building and running instructions as well as [News and noteworthy](https://github.com/phax/peppol-smp-server/wiki/News-and-noteworthy).
+Please read the **[Wiki](https://github.com/phax/phoss-smp/wiki)** for a detailed description, configuration reference and setup hints. It contains an introduction with screenshots, configuration, building and running instructions as well as [News and noteworthy](https://github.com/phax/phoss-smp/wiki/News-and-noteworthy).
 
 For querying an SMP server you may want to have a look at the OSS [peppol-smp-client](https://github.com/phax/peppol-commons/) library.
 
diff --git a/docker/Dockerfile-release-binary-sql b/docker/Dockerfile-release-binary-sql
index c7de4c985..fe6bac8fe 100644
--- a/docker/Dockerfile-release-binary-sql
+++ b/docker/Dockerfile-release-binary-sql
@@ -16,7 +16,7 @@
 #
 
 # Use an official Tomcat runtime as a base image
-FROM tomcat:8.5
+FROM tomcat:9-jre11
 
 # Special encoded slash handling for SMP
 # Use non-blocking random
@@ -34,16 +34,16 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \
 
 # Set arguments and labels after initial cleanup was performed :)
 # Minimum version for this layout is 5.0.1
-ARG VERSION
+ARG SMP_VERSION
 # Set to environment to be persistent
-ENV VERSION=${VERSION:-5.1.1}
+ENV SMP_VERSION=${SMP_VERSION:-5.1.2}
 LABEL vendor="Philip Helger"
-LABEL version=$VERSION
+LABEL version=$SMP_VERSION
  
 # Download, unzip and copy result to Tomcat webapps dir
 WORKDIR /home/git
-RUN echo Downloading phoss SMP $VERSION \
-  && wget -nv https://github.com/phax/peppol-smp-server/releases/download/peppol-smp-server-parent-pom-$VERSION/peppol-smp-server-webapp-sql-$VERSION.war -O smp.zip \ 
+RUN echo Downloading phoss SMP $SMP_VERSION \
+  && wget -nv https://github.com/phax/phoss-smp/releases/download/peppol-smp-server-parent-pom-$SMP_VERSION/peppol-smp-server-webapp-sql-$SMP_VERSION.war -O smp.zip \ 
   && unzip smp.zip -d smp/ \
   && cp -r smp/ $CATALINA_HOME/webapps/ROOT \
   && rm smp.zip
diff --git a/docker/Dockerfile-release-binary-xml b/docker/Dockerfile-release-binary-xml
index 1a1c360d1..d1a0e9b56 100644
--- a/docker/Dockerfile-release-binary-xml
+++ b/docker/Dockerfile-release-binary-xml
@@ -16,7 +16,7 @@
 #
 
 # Use an official Tomcat runtime as a base image
-FROM tomcat:8.5
+FROM tomcat:9-jre11
 
 # Special encoded slash handling for SMP
 # Use non-blocking random
@@ -34,16 +34,16 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \
 
 # Set arguments and labels after initial cleanup was performed :)
 # Minimum version for this layout is 5.0.1
-ARG VERSION
+ARG SMP_VERSION
 # Set to environment to be persistent
-ENV VERSION=${VERSION:-5.1.1}
+ENV SMP_VERSION=${SMP_VERSION:-5.1.2}
 LABEL vendor="Philip Helger"
-LABEL version=$VERSION
+LABEL version=$SMP_VERSION
  
 # Download, unzip and copy result to Tomcat webapps dir
 WORKDIR /home/git
-RUN echo Downloading phoss SMP $VERSION \
-  && wget -nv https://github.com/phax/peppol-smp-server/releases/download/peppol-smp-server-parent-pom-$VERSION/peppol-smp-server-webapp-xml-$VERSION.war -O smp.zip \ 
+RUN echo Downloading phoss SMP $SMP_VERSION \
+  && wget -nv https://github.com/phax/phoss-smp/releases/download/peppol-smp-server-parent-pom-$SMP_VERSION/peppol-smp-server-webapp-xml-$SMP_VERSION.war -O smp.zip \ 
   && unzip smp.zip -d smp/ \
   && cp -r smp/ $CATALINA_HOME/webapps/ROOT \
   && rm smp.zip
diff --git a/docker/Dockerfile-release-from-source-xml b/docker/Dockerfile-release-from-source-xml
index 872d80107..c83fa8ebc 100644
--- a/docker/Dockerfile-release-from-source-xml
+++ b/docker/Dockerfile-release-from-source-xml
@@ -1,5 +1,5 @@
 # Use an official Tomcat runtime as a base image
-FROM tomcat:8.5
+FROM tomcat:9-jre11
 
 # Special encoded slash handling for SMP
 # Use non-blocking random
@@ -17,18 +17,18 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \
 
 # Set arguments and labels after initial cleanup was performed :)
 # Minimum version for this layout is 5.0.1
-ARG VERSION
+ARG SMP_VERSION
 # Set to environment to be persistent
-ENV VERSION=${VERSION:-5.1.1}
+ENV SMP_VERSION=${SMP_VERSION:-5.1.2}
 LABEL vendor="Philip Helger"
-LABEL version=$VERSION
+LABEL version=$SMP_VERSION
  
 # Checkout from git and build
 WORKDIR /home/git
-RUN echo Building phoss SMP $VERSION \
-  && git clone https://github.com/phax/peppol-smp-server.git . \
-  && git checkout tags/peppol-smp-server-parent-pom-$VERSION -b work \
+RUN echo Building phoss SMP $SMP_VERSION \
+  && git clone https://github.com/phax/phoss-smp.git . \
+  && git checkout tags/peppol-smp-server-parent-pom-$SMP_VERSION -b work \
   && mvn clean install -DskipTests
 
 # Copy result to Tomcat webapps dir
-RUN cp -r peppol-smp-server-webapp-xml/target/peppol-smp-server-webapp-xml-$VERSION/ $CATALINA_HOME/webapps/ROOT
+RUN cp -r peppol-smp-server-webapp-xml/target/peppol-smp-server-webapp-xml-$SMP_VERSION/ $CATALINA_HOME/webapps/ROOT
diff --git a/docker/Dockerfile-snapshot-from-source-xml b/docker/Dockerfile-snapshot-from-source-xml
index 77ae3ffe2..7abdc8a14 100644
--- a/docker/Dockerfile-snapshot-from-source-xml
+++ b/docker/Dockerfile-snapshot-from-source-xml
@@ -1,13 +1,13 @@
 # Use an official Tomcat runtime as a base image
-FROM tomcat:8.5
+FROM tomcat:9-jre11
 
 # Special encoded slash handling for SMP
 # Use non-blocking random
 ENV CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Djava.security.egd=file:/dev/urandom"
 
-# Install vim, Java 8 JDK, Maven and Git
+# Install vim, Java 11 JDK, Maven and Git
 RUN apt-get update \
-  && apt-get install -y vim openjdk-8-jdk-headless git maven \
+  && apt-get install -y vim openjdk-11-jdk-headless git maven \
   && rm -rf /var/lib/apt/lists/*
 
 # Remove predefined Tomcat webapps
@@ -20,8 +20,8 @@ LABEL version="HEAD"
  
 # Checkout from git and build
 WORKDIR /home/git
-RUN echo Building phoss SMP $VERSION \
-  && git clone https://github.com/phax/peppol-smp-server.git . \
+RUN echo Building phoss SMP $SMP_VERSION \
+  && git clone https://github.com/phax/phoss-smp.git . \
   && git checkout -b work \
   && mvn clean install -DskipTests
 
diff --git a/docker/README.md b/docker/README.md
index 0b914cbfa..bb287dab5 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -81,7 +81,7 @@ Open `http://localhost:8888` in your browser.
 To change the version build of release versions you can specify the version on the commandline when building:
 
 ```
-docker build --build-arg VERSION=5.1.1 -t phoss-smp-release-binary-xml-5.1.1 -f Dockerfile-release-binary-xml .
+docker build --build-arg SMP_VERSION=5.1.2 -t phoss-smp-release-binary-xml-5.1.2 -f Dockerfile-release-binary-xml .
 ```
 
 Note: since the file system layout changed between 5.0.0 and 5.0.1, the current version is only applicable to versions ≥ 5.0.1
@@ -91,9 +91,9 @@ Note: since the file system layout changed between 5.0.0 and 5.0.1, the current
 Running a pre-build image (XML backend only):
 
 ```
-docker run -d --name phoss-smp-release-binary-xml-5.1.1 -p 8888:8080 phelger/smp:5.1.1
-docker stop phoss-smp-release-binary-xml-5.1.1
-docker rm phoss-smp-release-binary-xml-5.1.1
+docker run -d --name phoss-smp-release-binary-xml-5.1.2 -p 8888:8080 phelger/smp:5.1.2
+docker stop phoss-smp-release-binary-xml-5.1.2
+docker rm phoss-smp-release-binary-xml-5.1.2
 ```
 
 It exposes port 8888 where Tomcat is running successfully.
@@ -109,7 +109,7 @@ Short explanation on docker running
 
 Upon successful completion opening http://localhost:8888 in your browser should show you the start page of phoss SMP.
 
-Default credentials are in the Wiki at https://github.com/phax/peppol-smp-server/wiki/Running#default-login
+Default credentials are in the Wiki at https://github.com/phax/phoss-smp/wiki/Running#default-login
 
 The data directory inside the Docker image, where the data is stored is usually `/home/git/conf`.
  
@@ -158,5 +158,5 @@ To persistently save all the data stored by the SMP add another volume that moun
 On my Windows machine I use the following command to run the whole SMP on port 8888 with the correct configuration and the persistent storage like this: 
 
 ```
-docker run -d --name phoss-smp-with-config -p 8888:8080 -v c:\dev\git\peppol-smp-server\docker\example-config-dir:/config -v C:\dev\git\peppol-smp-server\docker\persistent\:/home/git/conf phoss-smp-with-config
+docker run -d --name phoss-smp-with-config -p 8888:8080 -v c:\dev\git\phoss-smp\docker\example-config-dir:/config -v C:\dev\git\phoss-smp\docker\persistent\:/home/git/conf phoss-smp-with-config
 ```
diff --git a/docker/build-release-latest.cmd b/docker/build-release-latest.cmd
index 6b67f1f56..a45c0141d 100644
--- a/docker/build-release-latest.cmd
+++ b/docker/build-release-latest.cmd
@@ -16,7 +16,7 @@
 @REM
 
 @echo off
-set XVER=5.1.1
+set XVER=5.1.2
 docker build --build-arg VERSION=%XVER% -t phoss-smp-release-binary-xml-%XVER% -f Dockerfile-release-binary-xml .
 if errorlevel 1 goto end
 docker tag phoss-smp-release-binary-xml-%XVER% phelger/smp:%XVER%
diff --git a/vagrant/playbook-xml.yml b/vagrant/playbook-xml.yml
index 9b952bde3..69f7d2873 100644
--- a/vagrant/playbook-xml.yml
+++ b/vagrant/playbook-xml.yml
@@ -115,19 +115,19 @@
   - name: Configure pd-client.properties.path (required for config files)
     lineinfile: dest="{{tomcat_dir}}/conf/catalina.properties" regexp="^peppol.pd.client.properties.path=" line="peppol.pd.client.properties.path={{tomcat_dir}}/conf/pdclient.properties"    
 
-  - name: Clone the phoss SMP Server in {{ sources_dir }}/peppol-smp-server
-    git: repo=https://github.com/phax/peppol-smp-server.git dest={{ sources_dir }}/peppol-smp-server version=peppol-smp-server-parent-pom-5.1.1
+  - name: Clone the phoss SMP Server in {{ sources_dir }}/phoss-smp
+    git: repo=https://github.com/phax/phoss-smp.git dest={{ sources_dir }}/phoss-smp version=peppol-smp-server-parent-pom-5.1.2
     register: smp_result
 
-  - name: Build SMP Server from {{ sources_dir }}/peppol-smp-server 
+  - name: Build SMP Server from {{ sources_dir }}/phoss-smp 
     when: smp_result | changed
     command: "mvn clean install -DskipTests"
 #    command: 'mvn clean install -DskipTests -Dhttp.proxyHost=1.2.3.4 -Dhttp.proxyPort=8080 -Dhttps.proxyHost=1.2.3.4 -Dhttps.proxyPort=8080 -Dhttp.nonProxyHosts="localhost|127.0.0.1"'
     args:
-      chdir: "{{ sources_dir }}/peppol-smp-server"
+      chdir: "{{ sources_dir }}/phoss-smp"
 
   - name: Deploy SMP Server to tomcat
-    copy: src="{{ sources_dir }}/peppol-smp-server/peppol-smp-server-webapp-xml/target/peppol-smp-server-webapp-xml-5.1.1.war" dest="{{tomcat_dir}}/webapps/ROOT.war"
+    copy: src="{{ sources_dir }}/phoss-smp/peppol-smp-server-webapp-xml/target/peppol-smp-server-webapp-xml-5.1.2.war" dest="{{tomcat_dir}}/webapps/ROOT.war"
 
   - name: Copy SMP Keystore to tomcat
     copy: src="{{smp_keystore}}" dest="{{smp_keystore_path}}" mode=0600 backup=yes