diff --git a/actions/confirmemail.php b/actions/confirmaddress.php
similarity index 100%
rename from actions/confirmemail.php
rename to actions/confirmaddress.php
diff --git a/htaccess.sample b/htaccess.sample
index 41ae878c63..37575d2903 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -16,8 +16,8 @@ RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
 
 RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
 RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
-RewriteRule ^main/confirmemail$ index.php?action=confirmemail [L,QSA]
-RewriteRule ^main/confirmemail/(.*)$ index.php?action=confirmemail&code=$1 [L,QSA]
+RewriteRule ^main/confirmaddress$ index.php?action=confirmaddress [L,QSA]
+RewriteRule ^main/confirmaddress/(.*)$ index.php?action=confirmaddress&code=$1 [L,QSA]
 
 RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
 RewriteRule ^settings/password$ index.php?action=password [L,QSA]
diff --git a/lib/mail.php b/lib/mail.php
index c1332ab2ba..53b360e3c0 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -69,7 +69,7 @@ function mail_confirm_address($code, $nickname, $address) {
 	$body .= "\n\n";
 	$body .= 'If it was you, and you want to confirm your entry, use the URL below:';
 	$body .= "\n\n";
-	$body .= "\t".common_local_url('confirmemail',
+	$body .= "\t".common_local_url('confirmaddress',
 								   array('code' => $code));
 	$body .= "\n\n";
 	$body .= 'If not, just ignore this message.';
diff --git a/lib/util.php b/lib/util.php
index 833695ba87..49349a72f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -570,8 +570,8 @@ function common_fancy_url($action, $args=NULL) {
 		} else {
 			return common_path($args['nickname']);
 		}
-	 case 'confirmemail':
-		return common_path('main/confirmemail/'.$args['code']);
+	 case 'confirmaddress':
+		return common_path('main/confirmaddress/'.$args['code']);
 	 case 'userbyid':
 	 	return common_path('user/'.$args['id']);
 	 default: