diff --git a/src/modules/Nfs/Options.ycp b/src/modules/Nfs/Options.ycp
index acf9a48..a0b6e5e 100644
--- a/src/modules/Nfs/Options.ycp
+++ b/src/modules/Nfs/Options.ycp
@@ -75,17 +75,22 @@ global define string validate (string options) {
 
 /**
 FIXME: factor out get_nfs4(vfstype, options) (depending on n::o)!
+ * @param options fstab option string
  * @return is version >= 4.1 enabled
  */
 global boolean get_nfs41(string options) {
     list<string> option_list = splitstring (options, ",");
 
-    return contains(option_list, "minorversion=1");
+    const string ENABLED = "minorversion=1";
+    return contains(option_list, ENABLED);
 }
 
 /**
  * Add or remove minorversion=1 according to nfs41.
  * FIXME vfstype=nfs4 is deprecated in favor of nfsvers=4 (aka vers=4)
+ * @param options fstab option string
+ * @param nfs41   is version >= 4.1 enabled
+ * @return        new fstab option string
  */
 global define string set_nfs41(string options, boolean nfs41) {
     // don't mutate the string unnecessarily
@@ -93,16 +98,16 @@ global define string set_nfs41(string options, boolean nfs41) {
         return options;
     }
 
-    const string OPT   = "minorversion=1";
-    const string CLEAN = "minorversion=0";
+    const string ENABLED  = "minorversion=1";
+    const string DISABLED = "minorversion=0";
 
     if (options == "defaults") { options = ""; }
     list<string> option_list = splitstring(options, ",");
-    option_list = filter(string opt, option_list, ``( opt != OPT ));
-    option_list = filter(string opt, option_list, ``( opt != CLEAN ));
+    option_list = filter(string opt, option_list, ``( opt != ENABLED ));
+    option_list = filter(string opt, option_list, ``( opt != DISABLED ));
 
     if (nfs41) {
-        option_list = add(option_list, OPT);
+        option_list = add(option_list, ENABLED);
     }
 
     options = mergestring(option_list, ",");