diff --git a/page-logic/manage.php b/page-logic/manage.php
index 545f90237fa1ad2d0f414300541b79dbda85499f..27f054711b404bd78f6142fc9abe79f47254b4a3 100644
--- a/page-logic/manage.php
+++ b/page-logic/manage.php
@@ -227,8 +227,8 @@ $rows[] = $edugainGUI->row('eduGAIN declaration', 'EDECL', 'edecl');
 $rows[] = $edugainGUI->row('Federation URL', 'I', 'url', '', 0, 0, 4);
 $rows[] = $edugainGUI->row('Registration practice', 'POL', 'registration');
 $rows[] = $edugainGUI->row('Contact email', 'I', 'contact_email', '', 0, 0, 4);
-$rows[] = $edugainGUI->row('TSG delegate', 'PERS', 'tsg_delegate');
-$rows[] = $edugainGUI->row('TSG deputy', 'PERS', 'tsg_deputy');
+$rows[] = $edugainGUI->row('Delegate', 'PERS', 'tsg_delegate');
+$rows[] = $edugainGUI->row('Deputy', 'PERS', 'tsg_deputy');
 $rows[] = $edugainGUI->row('Security contact', 'SIRTFI', 'security_contact');
 $rows[] = $edugainGUI->row('Policy', 'POL', 'policy');
 $rows[] = $edugainGUI->row('Policy in English', 'C', 'policy_english');
diff --git a/templates/governance.html b/templates/governance.html
index 3dec049961ec93bb432a9f65de400ce111a0cc42..88ff41ca1186b2994f3fae6b021d3f16f16520f3 100644
--- a/templates/governance.html
+++ b/templates/governance.html
@@ -1,5 +1,5 @@
 {% extends 'common/master.html' %}
-{% set breadcrumb = ['Participants', 'Steering Group'] %}
+{% set breadcrumb = ['Participants', 'Assembly'] %}
 {% set half_of_feds = (tsg.FEDS | length)/2 | round %}
 
 {% block title %}eduGAIN Steering Group{% endblock title %}
@@ -7,7 +7,7 @@
 {% block main_body %}
 
 <div class="central-section">
-<p>eduGAIN is governed by the Steering Group (SG) formed by delegates from all participant federations. The <a href="documents">eduGAIN Constitution</a> outlines the governance of the service. The names and contact details of SG members and their deputies are given in the list below.</p>
+<p>eduGAIN is governed by the Assembly formed by delegates from all participant federations. The <a href="documents">eduGAIN Constitution</a> outlines the governance of the service. The names and contact details of Assembly members and their deputies are given in the list below.</p>
 </div>
 
 <div class="central-section">
diff --git a/templates/joining_checklist.html b/templates/joining_checklist.html
index 599b97d291e0ac499bf86dc1cf34973d39ae3d13..98a127cd104a15216df66872581d5aab7ff349ec 100644
--- a/templates/joining_checklist.html
+++ b/templates/joining_checklist.html
@@ -79,7 +79,7 @@ the primary channel being signed mail.
 <h3>Governance delegate and deputy</h3>
 <div>
 <p>
-eduGAIN is governed by the Steering Group.
+eduGAIN is governed by the Assembly.
 Each partcipating federation must delegate two members - a delegate and a deputy.
 Please send names and e-mail addresses to the <a href="mailto:{{ constant('SUPPORT_EMAIL') }}"><span>{{ constant('SUPPORT_EMAIL') }}</span></a>.
 </p>
diff --git a/templates/operations.html b/templates/operations.html
index 768696b00f3bc56c11f7dde49c58ebeb32dae58d..4a0514917957109b410b52e984405a396a9715e0 100644
--- a/templates/operations.html
+++ b/templates/operations.html
@@ -12,7 +12,7 @@
 <dt>Metadata Aggregation Practice Statement</dt>
 <dd>Describes details of metadata validation and aggregation. It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Metadata+Aggregation+Practice+Statement" target="_blank">here</a>.</dd>
 <dt>Best Current Practice document</dt><!-- comment -->
-<dd>Lists conditions which are additionally checked by the validator, failure to comply with these will result in a validator warning It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Best+Current+Practice" target="_blank">here</a>.
+<dd>Lists conditions which are additionally checked by the validator, failure to comply with these will result in a validator warning. It is a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Best+Current+Practice" target="_blank">here</a>.
     See also <a href="https://technical.edugain.org/api.php?action=validator_warnings&format=print_r">https://technical.edugain.org/api.php?action=validator_warnings&format=print_r</a>.</dd>
 <dt>Alerts</dt>
 <dd>Whenever the aggregator finds a problem it issues a warning which is delivered by email to the federation contact address. Details are described in a WIKI document available <a href="https://wiki.geant.org/display/eduGAIN/Metadata+aggregation+-+alerts" target="_blank">here</a>.