diff --git a/conf/manifest/init b/conf/manifest/init
index 17ba0e92..51b06e6f 100755
--- a/conf/manifest/init
+++ b/conf/manifest/init
@@ -16,7 +16,7 @@ case "$__target_host" in
 
    # Alias in /etc/hosts for localhost
    cdist-archlinux)
-      __package_pacman django --state deinstalled
+      __package_pacman django --state uninstalled
       __package_pacman wireshark-cli --state installed
       __package_pacman zsh --state installed
    ;;
@@ -27,6 +27,6 @@ case "$__target_host" in
    # Real machines
    ikq*)
       __package_apt zsh --state installed
-      __package_apt apache2 --state deinstalled
+      __package_apt apache2 --state uninstalled
    ;;
 esac
diff --git a/conf/type/__package_apt/gencode b/conf/type/__package_apt/gencode
index b451eb9f..c85242e6 100755
--- a/conf/type/__package_apt/gencode
+++ b/conf/type/__package_apt/gencode
@@ -38,7 +38,7 @@ case "$state" in
          echo apt-get --quiet --yes install \"$name\"
       fi
    ;;
-   deinstalled)
+   uninstalled)
       # Remove only if existent
       if [ -n "$is_installed" ]; then
          echo apt-get --quiet --yes remove \"$name\"
diff --git a/conf/type/__package_emerge/gencode b/conf/type/__package_emerge/gencode
index ee95b823..47e8bc5e 100755
--- a/conf/type/__package_emerge/gencode
+++ b/conf/type/__package_emerge/gencode
@@ -34,9 +34,8 @@ case "$state" in
       # FIXME: only install if not already installed
       echo "emerge -q \"$name\""
    ;;
-   deinstalled)
+   uninstalled)
       # FIXME: only uninstall if currently installed
-      # FIXME: rename deinstalled to uninstalled
       echo "emerge -q -C \"$name\""
    ;;
 esac
diff --git a/conf/type/__package_pacman/gencode b/conf/type/__package_pacman/gencode
index 9702aa8e..536b7708 100755
--- a/conf/type/__package_pacman/gencode
+++ b/conf/type/__package_pacman/gencode
@@ -44,7 +44,7 @@ case "$state" in
          echo pacman "$pacopts" -S \"$name\"
       fi
    ;;
-   deinstalled)
+   uninstalled)
       if [ "$pkg_version" ]; then
          echo pacman "$pacopts" -R \"$name\"
       fi