diff --git a/eidas-eumd-common/overlay/etc/credentials/swedenconnect-signer.crt b/eumd-common/overlay/etc/credentials/swedenconnect-signer.crt
similarity index 100%
rename from eidas-eumd-common/overlay/etc/credentials/swedenconnect-signer.crt
rename to eumd-common/overlay/etc/credentials/swedenconnect-signer.crt
diff --git a/eidas-eumd-common/overlay/etc/mirror-mdq/post.d/10-template.sh b/eumd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
similarity index 100%
rename from eidas-eumd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
rename to eumd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
diff --git a/eidas-eumd-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh b/eumd-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
similarity index 100%
rename from eidas-eumd-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
rename to eumd-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
diff --git a/eidas-eumd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css b/eumd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
similarity index 100%
rename from eidas-eumd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
rename to eumd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
diff --git a/eidas-eumd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg b/eumd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
similarity index 100%
rename from eidas-eumd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
rename to eumd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
diff --git a/eidas-eumd-common/overlay/etc/mirror-mdq/template/index.html b/eumd-common/overlay/etc/mirror-mdq/template/index.html
similarity index 100%
rename from eidas-eumd-common/overlay/etc/mirror-mdq/template/index.html
rename to eumd-common/overlay/etc/mirror-mdq/template/index.html
diff --git a/eidas-natmd-common/overlay/etc/credentials/swedenconnect-signer.crt b/natmd-common/overlay/etc/credentials/swedenconnect-signer.crt
similarity index 100%
rename from eidas-natmd-common/overlay/etc/credentials/swedenconnect-signer.crt
rename to natmd-common/overlay/etc/credentials/swedenconnect-signer.crt
diff --git a/eidas-natmd-common/overlay/etc/mirror-mdq/post.d/10-template.sh b/natmd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
similarity index 100%
rename from eidas-natmd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
rename to natmd-common/overlay/etc/mirror-mdq/post.d/10-template.sh
diff --git a/eidas-natmd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css b/natmd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
similarity index 100%
rename from eidas-natmd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
rename to natmd-common/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
diff --git a/eidas-natmd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg b/natmd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
similarity index 100%
rename from eidas-natmd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
rename to natmd-common/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
diff --git a/eidas-natmd-common/overlay/etc/mirror-mdq/template/index.html b/natmd-common/overlay/etc/mirror-mdq/template/index.html
similarity index 100%
rename from eidas-natmd-common/overlay/etc/mirror-mdq/template/index.html
rename to natmd-common/overlay/etc/mirror-mdq/template/index.html