diff --git a/bin/update-metadata.in b/bin/update-metadata.in
index 840e48680f7a689c0f370c0f13b325efa0b61ebc..ca4a6e0d2edfb5db45b40fac0efb3896fe890f2d 100755
--- a/bin/update-metadata.in
+++ b/bin/update-metadata.in
@@ -105,7 +105,7 @@ foreach my $id (split(/, */, $configuration->{groups}->{list})) {
                 db               => $db,
                 type             => $entry->{type},
                 entityid         => $entry->{entityid},
-                displayname      => $entry->{display_name},
+                display_name     => $entry->{display_name},
                 information_url  => $entry->{information_url},
                 organization_url => $entry->{organization_url},
             );
diff --git a/conf/manager.sql b/conf/manager.sql
index 44a7dad1da46c0cf6459fa21fdded27c10996fb5..892eadeb1392ccc23516567a5815001b96dd8562 100644
--- a/conf/manager.sql
+++ b/conf/manager.sql
@@ -15,7 +15,7 @@ CREATE TABLE entities (
     entityid varchar(200) NOT NULL,
     information_url varchar(200) DEFAULT NULL,
     organization_url varchar(200) DEFAULT NULL,
-    displayname varchar(500) DEFAULT NULL,
+    display_name varchar(500) DEFAULT NULL,
     contacts varchar(2000) DEFAULT NULL,
     federations varchar(50) DEFAULT NULL,
     PRIMARY KEY (id),
diff --git a/lib/AccountManager/Entity.pm b/lib/AccountManager/Entity.pm
index 6e219f1310766cb785eec92e8c0d443bc6fde745..7b70996f63b434e9251329b8fe8c4a62323efd0e 100644
--- a/lib/AccountManager/Entity.pm
+++ b/lib/AccountManager/Entity.pm
@@ -15,7 +15,7 @@ __PACKAGE__->meta->setup(
         id               => { type => 'bigserial', not_null => 1 },
         entityid         => { type => 'varchar', length => 200, not_null => 1 },
         type             => { type => 'varchar', length => 3 },
-        displayname      => { type => 'varchar', length => 500 },
+        display_name     => { type => 'varchar', length => 500 },
         information_url  => { type => 'varchar', length => 200 },
         organization_url => { type => 'varchar', length => 200 },
         contacts         => { type => 'array' },
@@ -37,7 +37,7 @@ sub print {
         "Entity ID=%s; entityid=%s; displayname=%s; contacts=%s\n",
         $self->id(),
         $self->entityid(),
-        $self->displayname() || '',
+        $self->display_name() || '',
         join(',', $self->contacts());
 }
 
diff --git a/templates/web/edugain/select_email.tt2.html b/templates/web/edugain/select_email.tt2.html
index 73260ca023e95bdd1b650168ddb513f3a66a7808..7ccc2245b6b6f1271ed133696ba0bc51f11fdc0c 100644
--- a/templates/web/edugain/select_email.tt2.html
+++ b/templates/web/edugain/select_email.tt2.html
@@ -10,7 +10,7 @@
 
     <div class="content clearfix">
         <h2>[% lh.maketext("Select your email address") %]</h2>
-        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.displayname) %]</p>
+        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p>
 
     [% IF sp.contacts.defined %]
         <fieldset>
diff --git a/templates/web/renater/select_email.tt2.html b/templates/web/renater/select_email.tt2.html
index 4f426e74a926b606ffaf3842db2578eaa220c574..fb32d1cb9fea5b5d7b0c27d1eb611ae698322146 100644
--- a/templates/web/renater/select_email.tt2.html
+++ b/templates/web/renater/select_email.tt2.html
@@ -10,7 +10,7 @@
 
     <div class="content clearfix">
         <h2>[% lh.maketext("Select your email address") %]</h2>
-        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.displayname) %]</p>
+        <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p>
 
     [% IF sp.contacts.defined %]
         <fieldset>