diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index ddc2771dfa..9fc98e8866 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1020,12 +1020,12 @@
   description: A python client implementing the Ironic API.
 - project: openstack/python-keystoneclient
   description: OpenStack Identity (Keystone) Client
-- project: openstack/python-keystoneclient-federation
-  description: Federation authentication plugins for OpenStack clients.
-  acl-config: /home/gerrit2/acls/openstack/python-keystoneclient.config
 - project: openstack/python-keystoneclient-kerberos
   description: Kerberos authentication plugins for OpenStack clients.
   acl-config: /home/gerrit2/acls/openstack/python-keystoneclient.config
+- project: openstack/python-keystoneclient-saml2
+  description: Saml2 authentication plugins for OpenStack clients.
+  acl-config: /home/gerrit2/acls/openstack/python-keystoneclient.config
 - project: openstack/python-kiteclient
   description: Python bindings to Kite.
 - project: openstack/python-magnumclient
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index d1ae23bfda..b81dfcedc8 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -610,8 +610,8 @@ openstack-keystone:
       - openstack/keystone-specs
       - openstack/pycadf
       - openstack/python-keystoneclient
-      - openstack/python-keystoneclient-federation
       - openstack/python-keystoneclient-kerberos
+      - openstack/python-keystoneclient-saml2
       - openstack/keystonemiddleware
       - openstack/oslo.policy
     branches:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index ebaffdd069..7bb24c9d6c 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -865,7 +865,7 @@
           branch-override: default
 
 - project:
-    name: python-keystoneclient-federation
+    name: python-keystoneclient-kerberos
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -876,7 +876,7 @@
 
 
 - project:
-    name: python-keystoneclient-kerberos
+    name: python-keystoneclient-saml2
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e673f736f0..1a1f9abb5c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -999,10 +999,10 @@ jobs:
     branch: ^(?!master).*$
   - name: gate-python-keystoneclient-requirements
     branch: ^(?!master).*$
-  - name: gate-python-keystoneclient-federation-requirements
-    branch: ^(?!master).*$
   - name: gate-python-keystoneclient-kerberos-requirements
     branch: ^(?!master).*$
+  - name: gate-python-keystoneclient-saml2-requirements
+    branch: ^(?!master).*$
   - name: gate-python-manilaclient-requirements
     branch: ^(?!master).*$
   - name: gate-python-neutronclient-requirements
@@ -2077,15 +2077,6 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
 
-  - name: openstack/python-keystoneclient-federation
-    template:
-      - name: merge-check
-      - name: python26-jobs
-      - name: python-jobs
-      - name: python3-jobs
-      - name: check-requirements
-      - name: publish-to-pypi
-
   - name: openstack/python-keystoneclient-kerberos
     template:
       - name: merge-check
@@ -2096,6 +2087,15 @@ projects:
     experimental:
       - gate-python-keystoneclient-kerberos-python34
 
+  - name: openstack/python-keystoneclient-saml2
+    template:
+      - name: merge-check
+      - name: python26-jobs
+      - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+
   - name: openstack/python-kiteclient
     template:
       - name: merge-check