diff --git a/docker-compose.yml b/docker-compose.yml
index 631b236..b29abae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,20 +28,21 @@ services:
       - WAARDEPAPIEREN_CONFIG=/app/configuration/waardepapieren-verblijfplaatshistorie-config-compose-travis.json
       # Ignore self-signed ephemeral cert issues
       - NODE_TLS_REJECT_UNAUTHORIZED=0
-  clerk-frontend:
+  haarlem-frontend:
     build:
-      context: clerk-frontend/
+      context: haarlem-frontend/
       args:
         - CERTIFICATE_HOST=http://$CERT_HOST_IP:8880
-    links:
+        - IPV8_HOST=http://$CERT_HOST_IP
+    depends_on:
       - waardepapieren-service
     ports:
-    - 443:443
-    - 8880:8880
+      - 443:443
+      - 8880:8880
     healthcheck:
       test: service nginx status
     volumes:
-    - ./clerk-frontend/nginx/certs:/etc/nginx/certs:ro
+      - ./haarlem-frontend/nginx/certs:/etc/nginx/certs:ro
   mock-nlx:
     image: nlxio/outway:latest
     volumes:
diff --git a/clerk-frontend/.gitignore b/waardepapieren-component/.gitignore
similarity index 100%
rename from clerk-frontend/.gitignore
rename to waardepapieren-component/.gitignore
diff --git a/clerk-frontend/README.md b/waardepapieren-component/README.md
similarity index 100%
rename from clerk-frontend/README.md
rename to waardepapieren-component/README.md
diff --git a/clerk-frontend/package-lock.json b/waardepapieren-component/package-lock.json
similarity index 100%
rename from clerk-frontend/package-lock.json
rename to waardepapieren-component/package-lock.json
diff --git a/clerk-frontend/package.json b/waardepapieren-component/package.json
similarity index 100%
rename from clerk-frontend/package.json
rename to waardepapieren-component/package.json
diff --git a/clerk-frontend/public/form-assets/another_pdf_template.png b/waardepapieren-component/public/form-assets/another_pdf_template.png
similarity index 100%
rename from clerk-frontend/public/form-assets/another_pdf_template.png
rename to waardepapieren-component/public/form-assets/another_pdf_template.png
diff --git a/clerk-frontend/public/form-assets/discipl.png b/waardepapieren-component/public/form-assets/discipl.png
similarity index 100%
rename from clerk-frontend/public/form-assets/discipl.png
rename to waardepapieren-component/public/form-assets/discipl.png
diff --git a/clerk-frontend/public/form-assets/logo.png b/waardepapieren-component/public/form-assets/logo.png
similarity index 100%
rename from clerk-frontend/public/form-assets/logo.png
rename to waardepapieren-component/public/form-assets/logo.png
diff --git a/clerk-frontend/public/index.html b/waardepapieren-component/public/index.html
similarity index 100%
rename from clerk-frontend/public/index.html
rename to waardepapieren-component/public/index.html
diff --git a/clerk-frontend/public/manifest.json b/waardepapieren-component/public/manifest.json
similarity index 100%
rename from clerk-frontend/public/manifest.json
rename to waardepapieren-component/public/manifest.json
diff --git a/clerk-frontend/scripts/build-non-split.js b/waardepapieren-component/scripts/build-non-split.js
similarity index 100%
rename from clerk-frontend/scripts/build-non-split.js
rename to waardepapieren-component/scripts/build-non-split.js
diff --git a/clerk-frontend/src/App.jsx b/waardepapieren-component/src/App.jsx
similarity index 100%
rename from clerk-frontend/src/App.jsx
rename to waardepapieren-component/src/App.jsx
diff --git a/clerk-frontend/src/App.test.jsx b/waardepapieren-component/src/App.test.jsx
similarity index 100%
rename from clerk-frontend/src/App.test.jsx
rename to waardepapieren-component/src/App.test.jsx
diff --git a/clerk-frontend/src/index.css b/waardepapieren-component/src/index.css
similarity index 100%
rename from clerk-frontend/src/index.css
rename to waardepapieren-component/src/index.css
diff --git a/clerk-frontend/src/index.jsx b/waardepapieren-component/src/index.jsx
similarity index 100%
rename from clerk-frontend/src/index.jsx
rename to waardepapieren-component/src/index.jsx
diff --git a/clerk-frontend/src/need-wizard/BSNStep.jsx b/waardepapieren-component/src/need-wizard/BSNStep.jsx
similarity index 100%
rename from clerk-frontend/src/need-wizard/BSNStep.jsx
rename to waardepapieren-component/src/need-wizard/BSNStep.jsx
diff --git a/clerk-frontend/src/need-wizard/ConfirmStep.jsx b/waardepapieren-component/src/need-wizard/ConfirmStep.jsx
similarity index 100%
rename from clerk-frontend/src/need-wizard/ConfirmStep.jsx
rename to waardepapieren-component/src/need-wizard/ConfirmStep.jsx
diff --git a/clerk-frontend/src/need-wizard/DeliveryStep.jsx b/waardepapieren-component/src/need-wizard/DeliveryStep.jsx
similarity index 100%
rename from clerk-frontend/src/need-wizard/DeliveryStep.jsx
rename to waardepapieren-component/src/need-wizard/DeliveryStep.jsx
diff --git a/clerk-frontend/src/need-wizard/NeedStep.jsx b/waardepapieren-component/src/need-wizard/NeedStep.jsx
similarity index 100%
rename from clerk-frontend/src/need-wizard/NeedStep.jsx
rename to waardepapieren-component/src/need-wizard/NeedStep.jsx
diff --git a/clerk-frontend/src/need-wizard/NeedWizard.css b/waardepapieren-component/src/need-wizard/NeedWizard.css
similarity index 100%
rename from clerk-frontend/src/need-wizard/NeedWizard.css
rename to waardepapieren-component/src/need-wizard/NeedWizard.css
diff --git a/clerk-frontend/src/need-wizard/NeedWizard.jsx b/waardepapieren-component/src/need-wizard/NeedWizard.jsx
similarity index 100%
rename from clerk-frontend/src/need-wizard/NeedWizard.jsx
rename to waardepapieren-component/src/need-wizard/NeedWizard.jsx