diff --git a/framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc b/framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc
index 1c3913bd4c..ddd2103ec6 100644
--- a/framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc
+++ b/framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc
@@ -48,7 +48,7 @@ To configure a `DriverManagerDataSource`:
 
 The following example shows how to configure a `DriverManagerDataSource`:
 
-include-code::./DriverManagerDataSourceConfiguration[tag=dataSourceBean,indent=0]
+include-code::./DriverManagerDataSourceConfiguration[tag=snippet,indent=0]
 
 The next two examples show the basic connectivity and configuration for DBCP and C3P0.
 To learn about more options that help control the pooling features, see the product
@@ -56,11 +56,11 @@ documentation for the respective connection pooling implementations.
 
 The following example shows DBCP configuration:
 
-include-code::./BasicDataSourceConfiguration[tag=dataSourceBean,indent=0]
+include-code::./BasicDataSourceConfiguration[tag=snippet,indent=0]
 
 The following example shows C3P0 configuration:
 
-include-code::./ComboPooledDataSourceConfiguration[tag=dataSourceBean,indent=0]
+include-code::./ComboPooledDataSourceConfiguration[tag=snippet,indent=0]
 
 [[jdbc-DataSourceUtils]]
 == Using `DataSourceUtils`
diff --git a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.java
index 56edfda55b..2fd9109fc7 100644
--- a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.java
+++ b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 class BasicDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean(destroyMethod = "close")
 	BasicDataSource dataSource() {
 		BasicDataSource dataSource = new BasicDataSource();
@@ -34,6 +34,6 @@ class BasicDataSourceConfiguration {
 		dataSource.setPassword("");
 		return dataSource;
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 
 }
diff --git a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.java
index ece4a521fa..45e842fdbf 100644
--- a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.java
+++ b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 class ComboPooledDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean(destroyMethod = "close")
 	ComboPooledDataSource dataSource() throws PropertyVetoException {
 		ComboPooledDataSource dataSource = new ComboPooledDataSource();
@@ -35,6 +35,6 @@ class ComboPooledDataSourceConfiguration {
 		dataSource.setPassword("");
 		return dataSource;
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 
 }
diff --git a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.java b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.java
index d93e00bd22..0783c92289 100644
--- a/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.java
+++ b/framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.java
@@ -23,7 +23,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 @Configuration
 class DriverManagerDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean
 	DriverManagerDataSource dataSource() {
 		DriverManagerDataSource dataSource = new DriverManagerDataSource();
@@ -33,6 +33,6 @@ class DriverManagerDataSourceConfiguration {
 		dataSource.setPassword("");
 		return dataSource;
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 
 }
diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
index 1bd66d676d..1f29d0e8fe 100644
--- a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
+++ b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 class BasicDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean(destroyMethod = "close")
 	fun dataSource() = BasicDataSource().apply {
 		driverClassName = "org.hsqldb.jdbcDriver"
@@ -15,5 +15,5 @@ class BasicDataSourceConfiguration {
 		username = "sa"
 		password = ""
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 }
diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
index 34d1f6518d..0c290c9ebd 100644
--- a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
+++ b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 internal class ComboPooledDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean(destroyMethod = "close")
 	fun dataSource() = ComboPooledDataSource().apply {
 		driverClass = "org.hsqldb.jdbcDriver"
@@ -15,6 +15,6 @@ internal class ComboPooledDataSourceConfiguration {
 		user = "sa"
 		password = ""
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 
 }
diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.kt b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.kt
index 08959feeac..87692df00b 100644
--- a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.kt
+++ b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.kt
@@ -23,7 +23,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource
 @Configuration
 class DriverManagerDataSourceConfiguration {
 
-	// tag::dataSourceBean[]
+	// tag::snippet[]
 	@Bean
 	fun dataSource() = DriverManagerDataSource().apply {
 		setDriverClassName("org.hsqldb.jdbcDriver")
@@ -31,6 +31,6 @@ class DriverManagerDataSourceConfiguration {
 		username = "sa"
 		password = ""
 	}
-	// end::dataSourceBean[]
+	// end::snippet[]
 
 }
diff --git a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.xml b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.xml
index 01d9d5e2b5..a859292df7 100644
--- a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.xml
+++ b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:context="http://www.springframework.org/schema/context">
 
-	<!-- tag::dataSourceBean[] -->
+	<!-- tag::snippet[] -->
 	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
 		<property name="driverClassName" value="${jdbc.driverClassName}"/>
 		<property name="url" value="${jdbc.url}"/>
@@ -11,5 +11,5 @@
 	</bean>
 
 	<context:property-placeholder location="jdbc.properties"/>
-	<!-- end::dataSourceBean[] -->
+	<!-- end::snippet[] -->
 </beans>
diff --git a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.xml b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.xml
index c931cd3383..cf0e6c58a2 100644
--- a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.xml
+++ b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:context="http://www.springframework.org/schema/context">
 
-	<!-- tag::dataSourceBean[] -->
+	<!-- tag::snippet[] -->
 	<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
 		<property name="driverClass" value="${jdbc.driverClassName}"/>
 		<property name="jdbcUrl" value="${jdbc.url}"/>
@@ -11,5 +11,5 @@
 	</bean>
 
 	<context:property-placeholder location="jdbc.properties"/>
-	<!-- end::dataSourceBean[] -->
+	<!-- end::snippet[] -->
 </beans>
diff --git a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.xml b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.xml
index 5adf709547..c385240d73 100644
--- a/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.xml
+++ b/framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:context="http://www.springframework.org/schema/context">
 
-	<!-- tag::dataSourceBean[] -->
+	<!-- tag::snippet[] -->
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
 		<property name="driverClassName" value="${jdbc.driverClassName}"/>
 		<property name="url" value="${jdbc.url}"/>
@@ -11,5 +11,5 @@
 	</bean>
 
 	<context:property-placeholder location="jdbc.properties"/>
-	<!-- end::dataSourceBean[] -->
+	<!-- end::snippet[] -->
 </beans>