diff --git a/roles/pvc/handlers/main.yml b/roles/pvc/handlers/main.yml
index 2f72826..0f6f4c0 100644
--- a/roles/pvc/handlers/main.yml
+++ b/roles/pvc/handlers/main.yml
@@ -40,6 +40,6 @@
   shell: "{% if is_coordinator %}sleep {{ 15 * (hostvars[ansible_hostname].ansible_local.host_id|int - 1) }} &&  systemctl restart ceph-mgr@{{ ansible_hostname }}.service{% endif %}"
   ignore_errors: true
 
-- name: restart pvcd
-  shell: "{% if is_coordinator %}sleep {{ 15 * (hostvars[ansible_hostname].ansible_local.host_id|int - 1) }} &&{% endif %} systemctl restart pvcd.service"
+- name: restart pvcnoded
+  shell: "{% if is_coordinator %}sleep {{ 15 * (hostvars[ansible_hostname].ansible_local.host_id|int - 1) }} &&{% endif %} systemctl restart pvcnoded.service"
   ignore_errors: true
diff --git a/roles/pvc/tasks/pvc/bootstrap.yml b/roles/pvc/tasks/pvc/bootstrap.yml
index ab8c580..4dab72b 100644
--- a/roles/pvc/tasks/pvc/bootstrap.yml
+++ b/roles/pvc/tasks/pvc/bootstrap.yml
@@ -3,9 +3,9 @@
   command: ip address add {{ pvc_upstream_floatingip }}/{{ pvc_upstream_netmask }} dev {{ pvc_upstream_device }}
   ignore_errors: yes
 
-- name: start the API client
+- name: start the API daemon
   service:
-    name: pvc-api.service
+    name: pvcapid.service
     state: started
 
 - name: use http as the API request scheme
@@ -28,9 +28,9 @@
     url: "{{ api_uri_scheme }}://{{ pvc_api_listen_address }}:{{ pvc_api_listen_port }}/api/v1/initialize"
     method: POST
 
-- name: stop the API client
+- name: stop the API daemon
   service:
-    name: pvc-api.service
+    name: pvcapid.service
     state: stopped
 
 - name: remove floating IP address to upstream interface
diff --git a/roles/pvc/tasks/pvc/main.yml b/roles/pvc/tasks/pvc/main.yml
index cd53c2b..6e172a0 100644
--- a/roles/pvc/tasks/pvc/main.yml
+++ b/roles/pvc/tasks/pvc/main.yml
@@ -2,10 +2,10 @@
 - name: install pvc packages
   apt:
     name:
-      - pvc-daemon
-      - pvc-client-common
+      - pvc-daemon-node
+      - pvc-daemon-api
+      - pvc-daemon-common
       - pvc-client-cli
-      - pvc-client-api
       - debootstrap
       - ethtool
       - jq
@@ -16,10 +16,10 @@
     src: pvc/{{ item }}.j2
     dest: /etc/pvc/{{ item }}
   notify:
-    - restart pvcd
+    - restart pvcnoded
   with_items:
-    - pvcd.yaml
-    - pvc-api.yaml
+    - pvcnoded.yaml
+    - pvcapid.yaml
 
 - name: install API SSL certificate file
   copy:
@@ -56,8 +56,8 @@
     enabled: yes
   with_items:
     - pvc-flush.service
-    - pvcd.service
-    - pvcd.target
+    - pvcnoded.service
+    - pvc.target
 
 - name: install daily vacuum script
   template:
diff --git a/roles/pvc/templates/pvc/pvc-api.yaml.j2 b/roles/pvc/templates/pvc/pvcapid.yaml.j2
similarity index 99%
rename from roles/pvc/templates/pvc/pvc-api.yaml.j2
rename to roles/pvc/templates/pvc/pvcapid.yaml.j2
index c84bcd1..800789a 100644
--- a/roles/pvc/templates/pvc/pvc-api.yaml.j2
+++ b/roles/pvc/templates/pvc/pvcapid.yaml.j2
@@ -1,5 +1,5 @@
 ---
-# pvc-api client configuration
+# pvcapid configuration
 # {{ ansible_managed }}
 pvc:
     debug: False
diff --git a/roles/pvc/templates/pvc/pvcd.yaml.j2 b/roles/pvc/templates/pvc/pvcnoded.yaml.j2
similarity index 99%
rename from roles/pvc/templates/pvc/pvcd.yaml.j2
rename to roles/pvc/templates/pvc/pvcnoded.yaml.j2
index 8556d63..393f6c2 100644
--- a/roles/pvc/templates/pvc/pvcd.yaml.j2
+++ b/roles/pvc/templates/pvc/pvcnoded.yaml.j2
@@ -1,5 +1,5 @@
 ---
-# pvcd cluster configuration
+# pvcnoded configuration
 # {{ ansible_managed }}
 pvc:
   node: {% for node in pvc_nodes if node.hostname == ansible_hostname %}{{ node.hostname }}{% endfor %}