diff --git a/site-modules/profile/manifests/swh/deploy/graph.pp b/site-modules/profile/manifests/swh/deploy/graph.pp
--- a/site-modules/profile/manifests/swh/deploy/graph.pp
+++ b/site-modules/profile/manifests/swh/deploy/graph.pp
@@ -18,11 +18,11 @@
 
   # install services from templates
   $services = [ {  # this matches the current status
-    'name' => 'swhgraphshm',
+    'name' => 'swh-graph-shm-mount',
     'status'  => 'running',
     'enable' => false,
   }, {
-    'name' => 'swhgraphdev',
+    'name' => 'swh-graph',
     'status'  => 'running',
     'enable' => true,
   }
@@ -57,7 +57,7 @@
     $local_check_address = $backend_listen_host
   }
 
-  # swhgraphdev.service exposes the main graph server.
+  # swh-graph.service exposes the main graph server.
   # Ensure the port is working ok through icinga checks
   @@::icinga2::object::service {"swh-graph api (local on ${::fqdn})":
     service_name     => "swh-graph api (localhost)",
diff --git a/site-modules/profile/templates/swh/deploy/graph/swhgraphshm.service.erb b/site-modules/profile/templates/swh/deploy/graph/swh-graph-shm-mount.service.erb
rename from site-modules/profile/templates/swh/deploy/graph/swhgraphshm.service.erb
rename to site-modules/profile/templates/swh/deploy/graph/swh-graph-shm-mount.service.erb
--- a/site-modules/profile/templates/swh/deploy/graph/swhgraphshm.service.erb
+++ b/site-modules/profile/templates/swh/deploy/graph/swh-graph-shm-mount.service.erb
@@ -2,7 +2,7 @@
 # Changes will be overwritten
 
 [Unit]
-Description=swh graph shm mapper
+Description=swh-graph RAM data cache in /dev/shm
 
 [Service]
 Type=oneshot
diff --git a/site-modules/profile/templates/swh/deploy/graph/swhgraphdev.service.erb b/site-modules/profile/templates/swh/deploy/graph/swh-graph.service.erb
rename from site-modules/profile/templates/swh/deploy/graph/swhgraphdev.service.erb
rename to site-modules/profile/templates/swh/deploy/graph/swh-graph.service.erb
--- a/site-modules/profile/templates/swh/deploy/graph/swhgraphdev.service.erb
+++ b/site-modules/profile/templates/swh/deploy/graph/swh-graph.service.erb
@@ -2,9 +2,9 @@
 # Changes will be overwritten
 
 [Unit]
-Description=swh graph
-After=swhgraphshm.service
-Requires=swhgraphshm.service
+Description=swh-graph HTTP server
+After=swh-graph-shm-mount.service
+Requires=swh-graph-shm-mount.service
 
 [Service]
 <%- if !@sentry_dsn.nil? and !@sentry_dsn.empty? -%>