diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b8ebbe228..a12c83b8c 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,7 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
-	add_underlay("openid-selector");
+	add_underlay("login-selector");
 	add_underlay("jquery");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
@@ -68,7 +68,7 @@ sub openid_selector {
         my $q=shift;
         my $session=shift;
 
-	my $template=IkiWiki::template("openid-selector.tmpl");
+	my $template=IkiWiki::template("login-selector.tmpl");
 	my $openid_url=$q->param('openid_identifier');
 
 	if (! load_openid_module()) {
diff --git a/debian/copyright b/debian/copyright
index a73d1ccff..35fadf56b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -201,20 +201,20 @@ Comment:
  Republished with permission.
 License: GPL-2+
 
-Files: underlays/openid-selector/ikiwiki/openid/*
+Files: underlays/openid-selector/ikiwiki/login-selector/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 Comment: 
  From http://code.google.com/p/openid-selector/
 License: BSD-2-clause
 
-Files: underlays/openid-selector/ikiwiki/openid/goa-*
+Files: underlays/openid-selector/ikiwiki/login-selector/goa-*
 Copyright:
  © 2011 Red Hat, Inc.
 License: LGPL-2.1+
 Comment:
  taken from data/icons/16x16/ in gnome-online-accounts git
 
-Files: underlays/openid-selector/ikiwiki/openid/wordpress.png
+Files: underlays/openid-selector/ikiwiki/login-selector/wordpress.png
 Copyright:
  © 2003-2013 "the contributors"
 License: GPL-2+
@@ -226,9 +226,8 @@ Files:
  icons/aol.svg
  icons/livejournal.svg
  icons/verisign.svg
- underlays/openid-selector/ikiwiki/openid/aol.png
- underlays/openid-selector/ikiwiki/openid/livejournal.png
- underlays/openid-selector/ikiwiki/openid/verisign.png
+ underlays/openid-selector/ikiwiki/login-selector/aol.png
+ underlays/openid-selector/ikiwiki/login-selector/verisign.png
 Copyright:
  © 2014 Simon McVittie
 License: other
diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index 8392884eb..b4aa60c78 100644
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -10,7 +10,7 @@ It currently includes these pages:
 * [[templates]]
 * [[ikiwiki/formatting]]
 * [[ikiwiki/markdown]]
-* [[ikiwiki/openid]]
+* [[ikiwiki/login-selector]]
 * [[ikiwiki/pagespec]]
 * [[ikiwiki/directive]]
 * [[ikiwiki/subpage]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 80372fcb7..525b4f8fc 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -92,7 +92,7 @@ Here is a full list of the template files used:
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
+  `passwordmail.tmpl`, `login-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
   interface; do not normally need to be customised.
 
 
diff --git a/templates/openid-selector.tmpl b/templates/login-selector.tmpl
similarity index 95%
rename from templates/openid-selector.tmpl
rename to templates/login-selector.tmpl
index a055203a4..e3a91fef2 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/login-selector.tmpl
@@ -1,5 +1,5 @@
 <script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
-<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/login-selector/login-selector.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
 	selector.init(
diff --git a/underlays/openid-selector/ikiwiki/openid/aol.png b/underlays/login-selector/ikiwiki/login-selector/aol.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/aol.png
rename to underlays/login-selector/ikiwiki/login-selector/aol.png
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/goa-account-flickr.png
rename to underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png
diff --git a/underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/goa-account-yahoo.png
rename to underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
similarity index 96%
rename from underlays/openid-selector/ikiwiki/openid/openid-jquery.js
rename to underlays/login-selector/ikiwiki/login-selector/login-selector.js
index eaac50315..71ae0466e 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
@@ -24,30 +24,30 @@ var selections_openid_large = {
 var selections_openid_small = {
     verisign: {
         name: 'Verisign',
-        icon: 'ikiwiki/openid/verisign.png',
+        icon: 'ikiwiki/login-selector/verisign.png',
         label: 'Enter your Verisign username:',
         url: 'http://{username}.pip.verisignlabs.com/'
     },
     yahoo: {
         name: 'Yahoo',
-        icon: 'ikiwiki/openid/goa-account-yahoo.png',
+        icon: 'ikiwiki/login-selector/goa-account-yahoo.png',
         url: 'http://me.yahoo.com/'
     },
     flickr: {
        name: 'Flickr',        
-       icon: 'ikiwiki/openid/goa-account-flickr.png',
+       icon: 'ikiwiki/login-selector/goa-account-flickr.png',
        label: 'Enter your Flickr username:',
        url: 'http://flickr.com/photos/{username}/'
     },
     wordpress: {
         name: 'Wordpress',
-       icon: 'ikiwiki/openid/wordpress.png',
+       icon: 'ikiwiki/login-selector/wordpress.png',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
     aol: {
         name: 'AOL',     
-        icon: 'ikiwiki/openid/aol.png',
+        icon: 'ikiwiki/login-selector/aol.png',
         label: 'Enter your AOL username:',
         url: 'http://openid.aol.com/{username}'
     }
diff --git a/underlays/openid-selector/ikiwiki/openid/verisign.png b/underlays/login-selector/ikiwiki/login-selector/verisign.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/verisign.png
rename to underlays/login-selector/ikiwiki/login-selector/verisign.png
diff --git a/underlays/openid-selector/ikiwiki/openid/wordpress.png b/underlays/login-selector/ikiwiki/login-selector/wordpress.png
similarity index 100%
rename from underlays/openid-selector/ikiwiki/openid/wordpress.png
rename to underlays/login-selector/ikiwiki/login-selector/wordpress.png
diff --git a/underlays/openid-selector/ikiwiki/openid/livejournal.png b/underlays/openid-selector/ikiwiki/openid/livejournal.png
deleted file mode 100644
index d86ee5eac..000000000
Binary files a/underlays/openid-selector/ikiwiki/openid/livejournal.png and /dev/null differ