diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index 480e2446a8a8ceebda474929e59b55c5de050c35..24719b67859d3ca4f9152b838d22d2f617d731db 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -79,11 +79,6 @@ $config = array(
 	'papi' => array(
 		'authpapi:PAPI',
 	),
-	
-	'saml2' => array(
-		'saml2:SP',
-	),
-	
 
 	/*
 	 * An authentication source which can authenticate against both SAML 2.0
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 7331ebf8bf7a6dfcc7ab45990ca40ec42e3cf534..f1f77ef1b284cf0ff4477ee939731a61bf9f081c 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -101,8 +101,8 @@ The next step is to configure the way users authenticate on your IdP. Various mo
 `openid:OpenIDConsumer`
 : Authenticate against an OpenID provider.
 
-`saml2:SP`
-: Authenticate against a SAML 2.0 IdP. Can be used for bridging.
+`saml:SP`
+: Authenticate against a SAML 2.0. Can be used for bridging.
 
 `authYubiKey:YubiKey`
 : Authenticate with [an YubiKey](http://www.yubico.com/products/yubikey/).
diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index f822662225c1698f6b45fb89127ea875ff0058c1..6b1557d74740263ea172221434ed8d0cb5e74d95 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -51,8 +51,8 @@ The next step is to configure the way users authenticate on your IdP. Various mo
 `openid:OpenIDConsumer`
 : Authenticate against an OpenID provider.
 
-`saml2:SP`
-: Authenticate against a SAML 2.0 IdP. Can be used for bridging.
+`saml:SP`
+: Authenticate against a SAML IdP. Can be used for bridging.
 
 `authYubiKey:YubiKey`
 : Authenticate with [an YubiKey](http://www.yubico.com/products/yubikey/).
diff --git a/modules/saml2/lib/Auth/Source/SP.php b/modules/saml2/lib/Auth/Source/SP.php
index 530b1bd4f886a366243c4105600d249cbec8f7fd..c5320df1d06c8660d814969e411adb790f9d16a2 100644
--- a/modules/saml2/lib/Auth/Source/SP.php
+++ b/modules/saml2/lib/Auth/Source/SP.php
@@ -3,6 +3,9 @@
 /**
  * SAML 2.0 SP authentication client.
  *
+ * Note: This authentication source is depreceated. You should
+ * use saml:sp instead.
+ *
  * Example:
  * 'example-openidp' => array(
  *   'saml2:SP',