diff --git a/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 1ce194945..4ca441e32 100644
--- a/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/debian/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -156,25 +156,21 @@ debian/tmp/opt/trinity/share/mimelnk/media/blankdvd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/camera_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/camera_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvdvideo.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy5_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy5_unmounted.desktop
@@ -182,17 +178,15 @@ debian/tmp/opt/trinity/share/mimelnk/media/floppy_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/gphoto2camera.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/nfs_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/nfs_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/svcd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/vcd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/zip_mounted.desktop
diff --git a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 1ce194945..4ca441e32 100644
--- a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -156,25 +156,21 @@ debian/tmp/opt/trinity/share/mimelnk/media/blankdvd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/camera_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/camera_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvdvideo.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy5_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy5_unmounted.desktop
@@ -182,17 +178,15 @@ debian/tmp/opt/trinity/share/mimelnk/media/floppy_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/floppy_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/gphoto2camera.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/nfs_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/nfs_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_locked.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/svcd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/vcd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/zip_mounted.desktop