Actually we're going with "identity server" afterall

scripts/gendoc.py

@@ -527,7 +527,7 @@ if __name__ == '__main__':
     )
     parser.add_argument(
         "--identity_release", "-i", action="store", default="unstable",
-        help="The identity service release tag to generate, e.g. r1.2"
+        help="The identity server release tag to generate, e.g. r1.2"
     )
     parser.add_argument(
         "--list_targets", action="store_true",
@@ -547,7 +547,7 @@ if __name__ == '__main__':
 
     substitutions = {
         "%CLIENT_RELEASE_LABEL%": args.client_release,
-        # we hardcode the major versions. This ends up in the example 
+        # we hardcode the major versions. This ends up in the example
         # API URLs. When we have released a new major version, we'll
         # have to bump them.
         "%CLIENT_MAJOR_VERSION%": "r0",

scripts/templating/matrix_templates/sections.py

@@ -31,15 +31,15 @@ class MatrixSections(Sections):
     def render_client_server_changelog(self):
         changelogs = self.units.get("changelogs")
         return changelogs["client_server"]
-    
+
     # TODO: We should make this a generic variable instead of having to add functions all the time.
     def render_push_gateway_changelog(self):
         changelogs = self.units.get("changelogs")
         return changelogs["push_gateway"]
 
-    def render_identity_service_changelog(self):
+    def render_identity_server_changelog(self):
         changelogs = self.units.get("changelogs")
-        return changelogs["identity_service"]
+        return changelogs["identity_server"]
 
     def render_server_server_changelog(self):
         changelogs = self.units.get("changelogs")
@@ -226,4 +226,4 @@ class MatrixSections(Sections):
                 definition=swagger_def['definition'],
                 examples=swagger_def['examples'],
                 title_kind=subtitle_title_char)
-        return rendered
+        return rendered

scripts/templating/matrix_templates/units.py

@@ -773,7 +773,7 @@ class MatrixUnits(Units):
                 as_ver,
                 "Privileged server plugins",
             ), TypeTableRow(
-                "`Identity Service API <identity_service/"+is_ver+".html>`_",
+                "`Identity Server API <identity_server/"+is_ver+".html>`_",
                 "unstable",
                 "Mapping of third party IDs to Matrix IDs",
             ), TypeTableRow(