diff --git a/conf/type/__package_apt/gencode-remote b/conf/type/__package_apt/gencode-remote
index 47e76ec8..406708c2 100755
--- a/conf/type/__package_apt/gencode-remote
+++ b/conf/type/__package_apt/gencode-remote
@@ -32,11 +32,11 @@ state_should="$(cat "$__object/parameter/state")"
 # Correct pre 2.1 naming - FIXME in 2.1
 case "$state_should" in
     installed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
         state_should="present"
     ;;
     removed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
         state_should="absent"
     ;;
 esac
diff --git a/conf/type/__package_pacman/gencode-remote b/conf/type/__package_pacman/gencode-remote
index 1516370c..6d445ddc 100755
--- a/conf/type/__package_pacman/gencode-remote
+++ b/conf/type/__package_pacman/gencode-remote
@@ -36,11 +36,11 @@ fi
 state_should="$(cat "$__object/parameter/state")"
 case "$state_should" in
     installed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2       
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
         state_should="present"
     ;;  
     removed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2       
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
         state_should="absent"
     ;;  
 esac
diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/conf/type/__package_pkg_openbsd/gencode-remote
index e8309f20..0cf27a93 100755
--- a/conf/type/__package_pkg_openbsd/gencode-remote
+++ b/conf/type/__package_pkg_openbsd/gencode-remote
@@ -47,11 +47,11 @@ state_should="$(cat "$__object/parameter/state")"
 # Correct pre 2.1 naming - FIXME in 2.1
 case "$state_should" in
     installed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
         state_should="present"
     ;;
     removed)
-        echo "WARNING: $state_should is deprecated, please change to present/absent (will be removed in cdist 2.1)" >&2
+        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
         state_should="absent"
     ;;
 esac