diff --git a/bin/update-images b/bin/update-images
index 42a7aa57..97f79ac3 100755
--- a/bin/update-images
+++ b/bin/update-images
@@ -19,7 +19,7 @@ while :; do
     sleep 1
 done
 
-# Make sure LXD is functional
+# Make sure Incus is functional
 incus delete update-images -f >/dev/null 2>&1 || true
 incus init update-images --empty --quiet
 incus delete -f update-images
diff --git a/images/centos.yaml b/images/centos.yaml
index 63ca4711..76ff9524 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -375,7 +375,7 @@ files:
   generator: dump
   content: |-
     [Unit]
-    Description=LXD - agent (centos workaround)
+    Description=Incus - agent (centos workaround)
     Before=incus-agent.service
 
     [Service]
diff --git a/images/funtoo.yaml b/images/funtoo.yaml
index 48a9de29..2fd5a0d9 100644
--- a/images/funtoo.yaml
+++ b/images/funtoo.yaml
@@ -283,7 +283,7 @@ actions:
 - trigger: post-packages
   action: |-
     #!/bin/bash
-    # Configure LXD/LXC tty
+    # Configure tty
     sed -e 's|^#x1|x1|g' -e '/^c[0-9].*/d' -i /etc/inittab
 
 
diff --git a/images/nixos.yaml b/images/nixos.yaml
index 606df49d..452e33a2 100644
--- a/images/nixos.yaml
+++ b/images/nixos.yaml
@@ -39,7 +39,7 @@ packages:
 
 files:
   - name: conf-hostname
-    path: /etc/nixos/lxd.nix
+    path: /etc/nixos/incus.nix
     generator: template
     content: |-
       { lib, config, pkgs, ... }:
diff --git a/images/openeuler.yaml b/images/openeuler.yaml
index 8d4304ba..4d92d32c 100644
--- a/images/openeuler.yaml
+++ b/images/openeuler.yaml
@@ -143,7 +143,7 @@ files:
   generator: dump
   content: |-
     [Unit]
-    Description=LXD - agent (openEuler workaround)
+    Description=Incus - agent (openEuler workaround)
     Before=incus-agent.service
 
     [Service]
diff --git a/images/springdalelinux.yaml b/images/springdalelinux.yaml
index 571cf1ea..da0cdae8 100644
--- a/images/springdalelinux.yaml
+++ b/images/springdalelinux.yaml
@@ -216,7 +216,7 @@ files:
   generator: dump
   content: |-
     [Unit]
-    Description=LXD - agent (centos workaround)
+    Description=Incus - agent (springdale workaround)
     Before=incus-agent.service
 
     [Service]
diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml
index cb424ef1..1a389f0b 100644
--- a/images/ubuntu.yaml
+++ b/images/ubuntu.yaml
@@ -725,7 +725,7 @@ actions:
     # Automatic disk resize
     cat << EOF > /etc/systemd/system/incus-growpart.service
     [Unit]
-    Description=LXD - grow root partition
+    Description=Incus - grow root partition
 
     [Service]
     Type=oneshot