diff --git a/dovecot/dovecot-lib.pl b/dovecot/dovecot-lib.pl
index 16651963f..cc6715b0f 100755
--- a/dovecot/dovecot-lib.pl
+++ b/dovecot/dovecot-lib.pl
@@ -555,9 +555,9 @@ return 0 if (!$ver);
 return &compare_version_numbers($ver, $wantver) >= 0;
 }
 
-# version_atmost(ver)
-# Returns 1 if running at most some version or below
-sub version_atmost
+# version_below(ver)
+# Returns 1 if running below some version
+sub version_below
 {
 local ($wantver) = @_;
 local $ver = &get_dovecot_version();
diff --git a/dovecot/edit_login.cgi b/dovecot/edit_login.cgi
index 5d5f1c0b6..6ce3e1444 100755
--- a/dovecot/edit_login.cgi
+++ b/dovecot/edit_login.cgi
@@ -91,7 +91,7 @@ elsif ($userdb =~ /^sql\s+(.*)/) {
 else {
 	$other = $userdb;
 	}
-if (&version_atmost("2.4")) {
+if (&version_below("2.4")) {
 	print &ui_table_row($text{'login_userdb'},
 	&ui_radio("usermode", $usermode,
 		[ [ "passwd", $text{'login_passwd'}."<br>" ],
@@ -181,7 +181,7 @@ else {
 	$pother = $passdb;
 	}
 
-if (&version_atmost("2.4")) {
+if (&version_below("2.4")) {
 	print &ui_table_row($text{'login_passdb'},
 	&ui_radio("passmode", $passmode,
 		[ [ "passwd", $text{'login_passwd2'}."<br>" ],
diff --git a/dovecot/edit_mail.cgi b/dovecot/edit_mail.cgi
index 53190b177..98df1adcf 100755
--- a/dovecot/edit_mail.cgi
+++ b/dovecot/edit_mail.cgi
@@ -107,7 +107,7 @@ print &ui_table_row($text{'mail_change'},
 	    [ "", &getdef($dirty, \@opts) ] ]), 3);
 
 # Permissions on files
-if (&version_atmost("2")) {
+if (&version_below("2")) {
 	$umask = &find_value("umask", $conf);
 	print &ui_table_row($text{'mail_umask'},
 		&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
diff --git a/dovecot/edit_ssl.cgi b/dovecot/edit_ssl.cgi
index abf8b8d24..b29b86a16 100755
--- a/dovecot/edit_ssl.cgi
+++ b/dovecot/edit_ssl.cgi
@@ -66,7 +66,7 @@ print &ui_table_row($text{'ssl_pass'},
 	    [ undef, "nowrap" ]);
 
 # Parameter regen time
-if (&version_atmost("2.4")) {
+if (&version_below("2.4")) {
 	$regen = &find_value("ssl_parameters_regenerate", $conf);
 	print &ui_table_row($text{'ssl_regen'},
 			&ui_opt_textbox("regen", $regen, 5,
diff --git a/dovecot/save_login.cgi b/dovecot/save_login.cgi
index aa417d44c..ac23cdeb4 100755
--- a/dovecot/save_login.cgi
+++ b/dovecot/save_login.cgi
@@ -28,7 +28,7 @@ else {
 			join(" ", split(/\0/, $in{'mechs'})), "auth","default");
 	}
 
-if (&version_atmost("2.4")) {
+if (&version_below("2.4")) {
 	# User database
 	$userdb = $in{'usermode'};
 	if ($in{'usermode'} eq 'passwd-file') {
diff --git a/dovecot/save_mail.cgi b/dovecot/save_mail.cgi
index 328c71761..bd03b4ecf 100755
--- a/dovecot/save_mail.cgi
+++ b/dovecot/save_mail.cgi
@@ -66,7 +66,7 @@ else {
 			$in{'change'} ? $in{'change'} : undef);
 	}
 
-if (&version_atmost("2")) {
+if (&version_below("2")) {
 	# Umask
 	$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||
 		&error($text{'mail_eumask'});
diff --git a/dovecot/save_ssl.cgi b/dovecot/save_ssl.cgi
index fe48ed8ed..459bb9eb0 100755
--- a/dovecot/save_ssl.cgi
+++ b/dovecot/save_ssl.cgi
@@ -67,7 +67,7 @@ $in{'pass_def'} || $in{'pass'} =~ /\S/ || &error($text{'ssl_epass'});
 	$in{'pass_def'} ? undef : $in{'pass'});
 
 # Save SSL parameter regeneration time
-if (&version_atmost("2.4")) {
+if (&version_below("2.4")) {
 	$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ ||
 		&error($text{'ssl_eregen'});
 	&save_directive($conf, "ssl_parameters_regenerate",