diff --git a/src/commands/signencryptfilescommand.cpp b/src/commands/signencryptfilescommand.cpp
--- a/src/commands/signencryptfilescommand.cpp
+++ b/src/commands/signencryptfilescommand.cpp
@@ -167,7 +167,7 @@
         mode |= SignEncryptFilesController::SignDisallowed;
         break;
     case Force:
-        mode |= SignEncryptFilesController::SignForced;
+        mode |= SignEncryptFilesController::SignSelected;
         break;
     }
     try {
@@ -184,7 +184,7 @@
         return NoPolicy;
     case SignEncryptFilesController::SignAllowed:
         return Allow;
-    case SignEncryptFilesController::SignForced:
+    case SignEncryptFilesController::SignSelected:
         return Force;
     case SignEncryptFilesController::SignDisallowed:
         return Deny;
@@ -204,7 +204,7 @@
         mode |= SignEncryptFilesController::EncryptDisallowed;
         break;
     case Force:
-        mode |= SignEncryptFilesController::EncryptForced;
+        mode |= SignEncryptFilesController::EncryptSelected;
         break;
     }
     try {
@@ -221,7 +221,7 @@
         return NoPolicy;
     case SignEncryptFilesController::EncryptAllowed:
         return Allow;
-    case SignEncryptFilesController::EncryptForced:
+    case SignEncryptFilesController::EncryptSelected:
         return Force;
     case SignEncryptFilesController::EncryptDisallowed:
         return Deny;
diff --git a/src/crypto/signencryptfilescontroller.h b/src/crypto/signencryptfilescontroller.h
--- a/src/crypto/signencryptfilescontroller.h
+++ b/src/crypto/signencryptfilescontroller.h
@@ -64,21 +64,21 @@
     enum Operation {
         SignDisallowed = 0,
         SignAllowed = 1,
-        SignForced  = 2,
+        SignSelected  = 2,
 
-        SignMask = SignAllowed | SignForced,
+        SignMask = SignAllowed | SignSelected,
 
         EncryptDisallowed = 0,
         EncryptAllowed = 4,
-        EncryptForced = 8,
+        EncryptSelected = 8,
 
-        EncryptMask = EncryptAllowed | EncryptForced,
+        EncryptMask = EncryptAllowed | EncryptSelected,
 
         ArchiveDisallowed = 0,
         ArchiveAllowed = 16,
-        ArchiveForced = 32,
+        ArchiveSelected = 32,
 
-        ArchiveMask = ArchiveAllowed | ArchiveForced
+        ArchiveMask = ArchiveAllowed | ArchiveSelected
     };
     void setOperationMode(unsigned int mode);
     unsigned int operationMode() const;
diff --git a/src/crypto/signencryptfilescontroller.cpp b/src/crypto/signencryptfilescontroller.cpp
--- a/src/crypto/signencryptfilescontroller.cpp
+++ b/src/crypto/signencryptfilescontroller.cpp
@@ -143,12 +143,12 @@
 {
     const bool signDisallowed = (op & SignMask) == SignDisallowed;
     const bool encryptDisallowed = (op & EncryptMask) == EncryptDisallowed;
-    const bool archiveForced = (op & ArchiveMask) == ArchiveForced;
+    const bool archiveSelected = (op & ArchiveMask) == ArchiveSelected;
 
     kleo_assert(!signDisallowed || !encryptDisallowed);
 
     if (!signDisallowed && encryptDisallowed) {
-        if (archiveForced) {
+        if (archiveSelected) {
             return i18n("Archive and Sign Files");
         } else {
             return i18n("Sign Files");
@@ -156,14 +156,14 @@
     }
 
     if (signDisallowed && !encryptDisallowed) {
-        if (archiveForced) {
+        if (archiveSelected) {
             return i18n("Archive and Encrypt Files");
         } else {
             return i18n("Encrypt Files");
         }
     }
 
-    if (archiveForced) {
+    if (archiveSelected) {
         return i18n("Archive and Sign/Encrypt Files");
     } else {
         return i18n("Sign/Encrypt Files");
@@ -210,13 +210,13 @@
 {
     kleo_assert((op & SignMask)    == SignDisallowed    ||
                 (op & SignMask)    == SignAllowed       ||
-                (op & SignMask)    == SignForced);
+                (op & SignMask)    == SignSelected);
     kleo_assert((op & EncryptMask) == EncryptDisallowed ||
                 (op & EncryptMask) == EncryptAllowed    ||
-                (op & EncryptMask) == EncryptForced);
+                (op & EncryptMask) == EncryptSelected);
     kleo_assert((op & ArchiveMask) == ArchiveDisallowed ||
                 (op & ArchiveMask) == ArchiveAllowed    ||
-                (op & ArchiveMask) == ArchiveForced);
+                (op & ArchiveMask) == ArchiveSelected);
     kleo_assert((op & ~(SignMask | EncryptMask | ArchiveMask)) == 0);
 }
 
@@ -224,7 +224,7 @@
 {
     Private::assertValidOperation(mode);
     if (contains_dir(d->files)) {
-        mode = (mode & ~ArchiveMask) | ArchiveForced;
+        mode = (mode & ~ArchiveMask) | ArchiveSelected;
     }
     d->operation = mode;
     d->updateWizardMode();
@@ -247,7 +247,7 @@
         wizard->setSigningUserMutable(true);
         wizard->setSigningPreset(false);
 
-        if (signOp == SignForced) {
+        if (signOp == SignSelected) {
             wizard->setSigningPreset(true);
         }
     }
@@ -259,7 +259,7 @@
         wizard->setEncryptionUserMutable(true);
         wizard->setEncryptionPreset(false);
 
-        if (encrOp == EncryptForced) {
+        if (encrOp == EncryptSelected) {
             wizard->setEncryptionPreset(true);
         }
     }
@@ -271,7 +271,7 @@
         wizard->setCreateArchiveUserMutable(true);
         wizard->setCreateArchivePreset(false);
 
-        if (archOp == ArchiveForced) {
+        if (archOp == ArchiveSelected) {
             wizard->setCreateArchivePreset(true);
         }
     }
@@ -287,7 +287,7 @@
     kleo_assert(!files.empty());
     d->files = files;
     if (contains_dir(files)) {
-        setOperationMode((operationMode() & ~ArchiveMask) | ArchiveForced);
+        setOperationMode((operationMode() & ~ArchiveMask) | ArchiveSelected);
     }
     d->ensureWizardCreated();
     d->wizard->setFiles(files);
diff --git a/src/uiserver/signencryptfilescommand.h b/src/uiserver/signencryptfilescommand.h
--- a/src/uiserver/signencryptfilescommand.h
+++ b/src/uiserver/signencryptfilescommand.h
@@ -50,21 +50,21 @@
     enum Operation {
         SignDisallowed = 0,
         SignAllowed = 1,
-        SignForced  = 2,
+        SignSelected  = 2,
 
-        SignMask = SignAllowed | SignForced,
+        SignMask = SignAllowed | SignSelected,
 
         EncryptDisallowed = 0,
         EncryptAllowed = 4,
-        EncryptForced = 8,
+        EncryptSelected = 8,
 
-        EncryptMask = EncryptAllowed | EncryptForced
+        EncryptMask = EncryptAllowed | EncryptSelected
     };
 
 private:
     virtual unsigned int operation() const
     {
-        return SignForced | EncryptForced;
+        return SignSelected | EncryptSelected;
     }
 private:
     int doStart() Q_DECL_OVERRIDE;
@@ -98,7 +98,7 @@
     }
     unsigned int operation() const Q_DECL_OVERRIDE
     {
-        return SignAllowed | EncryptForced;
+        return SignAllowed | EncryptSelected;
     }
 };
 
@@ -111,7 +111,7 @@
     }
     unsigned int operation() const Q_DECL_OVERRIDE
     {
-        return SignForced | EncryptAllowed;
+        return SignSelected | EncryptAllowed;
     }
 };
 
diff --git a/src/uiserver/signencryptfilescommand.cpp b/src/uiserver/signencryptfilescommand.cpp
--- a/src/uiserver/signencryptfilescommand.cpp
+++ b/src/uiserver/signencryptfilescommand.cpp
@@ -123,7 +123,7 @@
 
     unsigned int op = operation();
     if (hasOption("archive")) {
-        op |= SignEncryptFilesController::ArchiveForced;
+        op |= SignEncryptFilesController::ArchiveSelected;
     } else {
         op |= SignEncryptFilesController::ArchiveAllowed;
     }