diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index d379a43e112ce73f212a1ba3f072c6f679358c3d..a82eac0b860a7f7fa508a48d51a0ee5f1abb0720 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -7,7 +7,7 @@ hosts:
     hostname: srv1
     altname: 'server-md2.et2.com'
 
-    mdserver:
+    mdsigner:
       test:
         signer: hsm_signer
         metadir: metadata/test
@@ -24,7 +24,7 @@ hosts:
     hostname: srv2
     altname: 'server-md2.et2.com'
 
-    mdserver:
+    mdsigner:
       edugain:
         signer: hsm_signer
         metadir: metadata/edugain
@@ -50,7 +50,7 @@ hosts:
     hostname: srv4
     altname: 'server-md.example.com'
 
-    mdserver:
+    mdsigner:
       foobar:
         signer: normal_signer
         metadir: metadata/test
diff --git a/inventory/inventory b/inventory/inventory
index cbe5ab9a5e0e9d8cd83ec9d67c3106636f738719..49d8a9ddbd2426386876f4a843070bcdb49b2cf0 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -5,8 +5,8 @@ mdxcdn          ansible_host=mdxcdn.pt-38.utr.surfcloud.nl ansible_user=ansible
 alternative-mdx ansible_host=alternative-mdx.pt-76.utr.surfcloud.nl ansible_user=ansible ansible_ssh_private_key_file=.ssh/id_ansible
 okeanos         ansible_host=62.217.72.109 ansible_user=ansible ansible_ssh_private_key_file=.ssh/id_ansible
 
-# Hosts that receive the mdserver role
-[mdserver]
+# Hosts that receive the mdsigner role
+[mdsigner]
 et2
 mdxcdn
 alternative-mdx
@@ -25,6 +25,6 @@ mdxcdn
 
 # All hosts for base role
 [all:children]
-mdserver
+mdsigner
 mdproxy
 geodns
diff --git a/playbook.yml b/playbook.yml
index 33fb74c895abfc75bf046566c35b6e39e068cbda..f89049221b0d3a9fddc8cc04308004fde36927c9 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -10,12 +10,12 @@
   roles:
     - {role: geodns,        tags: ['geodns']}
 
-- name: MDServer
-  hosts: mdserver
+- name: MDSigner
+  hosts: mdsigner
   gather_facts: false
   roles:
     - {role: apache,        tags: ['apache']}
-    - {role: mdserver,      tags: ['mdserver']}
+    - {role: mdsigner,      tags: ['mdsigner']}
 
 - name: MDProxy
   hosts: mdproxy
diff --git a/roles/apache/templates/md.conf.j2 b/roles/apache/templates/md.conf.j2
index 66ac17b52405cf068f55ac927835299312128039..59ca6d422f5f551f051227ec3d34ad82d3cf64de 100644
--- a/roles/apache/templates/md.conf.j2
+++ b/roles/apache/templates/md.conf.j2
@@ -1,4 +1,4 @@
-{% if hosts[inventory_hostname].get('mdserver') %}
+{% if hosts[inventory_hostname].get('mdsigner') %}
 <VirtualHost *:80>
         ServerName {{ hosts[inventory_hostname]['hostname'] }}-signer.{{ tld }}
 {% if hosts[inventory_hostname].get('altname') %}
diff --git a/roles/mdserver/templates/mdserver.yaml.j2 b/roles/mdserver/templates/mdserver.yaml.j2
deleted file mode 100644
index b8fa37fdff0cfdf01a0609de43c151a1361b8e9a..0000000000000000000000000000000000000000
--- a/roles/mdserver/templates/mdserver.yaml.j2
+++ /dev/null
@@ -1,2 +0,0 @@
----
-{{ hosts[inventory_hostname]['mdserver'] | to_yaml }}
diff --git a/roles/mdserver/handlers/main.yml b/roles/mdsigner/handlers/main.yml
similarity index 58%
rename from roles/mdserver/handlers/main.yml
rename to roles/mdsigner/handlers/main.yml
index 8f6dc766a235281ce93568b7ebac931fc59f25f8..0681b640a75856f02e71931d42df46329a5dd0f0 100644
--- a/roles/mdserver/handlers/main.yml
+++ b/roles/mdsigner/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
-- name: enable mdserver job
+- name: enable mdsigner job
   systemd:
-    name: "mdserver.service"
+    name: "mdsigner.service"
     enabled: true
     state: "restarted"
     daemon_reload: true
diff --git a/roles/mdserver/tasks/main.yml b/roles/mdsigner/tasks/main.yml
similarity index 73%
rename from roles/mdserver/tasks/main.yml
rename to roles/mdsigner/tasks/main.yml
index 3e9970ade1fd843669c653a47e0da643e445b80f..d3dd9a3b89d8ce8307b4487c870accf6c78206a0 100644
--- a/roles/mdserver/tasks/main.yml
+++ b/roles/mdsigner/tasks/main.yml
@@ -4,12 +4,12 @@
   import_role:
     name: alternate-mdx
 
-- name: Create mdserver config
+- name: Create mdsigner config
   ansible.builtin.template:
-    src: "mdserver.yaml.j2"
-    dest: "{{ altmdx_dir }}/mdserver.yaml"
+    src: "mdsigner.yaml.j2"
+    dest: "{{ altmdx_dir }}/mdsigner.yaml"
   notify:
-    - "enable mdserver job"
+    - "enable mdsigner job"
 
 - name: Create metadata dir
   ansible.builtin.file:
@@ -22,7 +22,7 @@
     path: "{{ altmdx_metadir }}/{{ item.key }}"
     state: directory
     mode: '0755'
-  with_dict: "{{ hosts[inventory_hostname]['mdserver'] }}"
+  with_dict: "{{ hosts[inventory_hostname]['mdsigner'] }}"
 
 - name: Check existence of metadata signing cert
   stat:
@@ -39,9 +39,9 @@
     creates: "{{ altmdx_dir }}/meta.crt"
   when: not mdcert.stat.exists
 
-- name: Copy mdserver service files
+- name: Copy mdsigner service files
   ansible.builtin.template:
-    src: "mdserver.service.j2"
-    dest: "/etc/systemd/system/mdserver.service"
+    src: "mdsigner.service.j2"
+    dest: "/etc/systemd/system/mdsigner.service"
   notify:
-    - "enable mdserver job"
+    - "enable mdsigner job"
diff --git a/roles/mdserver/templates/mdserver.service.j2 b/roles/mdsigner/templates/mdsigner.service.j2
similarity index 66%
rename from roles/mdserver/templates/mdserver.service.j2
rename to roles/mdsigner/templates/mdsigner.service.j2
index 6c6fb2611be0dd2f0d3c85e6a4b2113163cc44b0..b8e8f29c270011d11e0b7da1b56b17076fb653bf 100644
--- a/roles/mdserver/templates/mdserver.service.j2
+++ b/roles/mdsigner/templates/mdsigner.service.j2
@@ -1,15 +1,15 @@
 [Unit]
-Description=MDServer
+Description=MDSignerr
 After=syslog.target network.target
 
 [Service]
 Type=simple
 WorkingDirectory={{ altmdx_dir }}
-ExecStart={{ altmdx_dir }}/bin/python -u mdserver.py
+ExecStart={{ altmdx_dir }}/bin/python -u mdsigner.py
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartSec=10
-SyslogIdentifier=mdserver
+SyslogIdentifier=mdsigner
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/mdsigner/templates/mdsigner.yaml.j2 b/roles/mdsigner/templates/mdsigner.yaml.j2
new file mode 100644
index 0000000000000000000000000000000000000000..c2259f34a09d41e7559d17a31e31bb1db72732d9
--- /dev/null
+++ b/roles/mdsigner/templates/mdsigner.yaml.j2
@@ -0,0 +1,2 @@
+---
+{{ hosts[inventory_hostname]['mdsigner'] | to_yaml }}