diff --git a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
index 618a11a..74af91e 100644
--- a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
+++ b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
@@ -100,7 +100,7 @@ public abstract class AbstractR2dbcConfiguration implements ApplicationContextAw
 	 * @return must not be {@literal null}.
 	 * @throws IllegalArgumentException if any of the required args is {@literal null}.
 	 */
-	@Bean
+	@Bean({ "r2dbcDatabaseClient", "databaseClient" })
 	public DatabaseClient databaseClient(ReactiveDataAccessStrategy dataAccessStrategy,
 			R2dbcExceptionTranslator exceptionTranslator) {
 
diff --git a/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java b/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java
index cf6ec56..fb49706 100644
--- a/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java
+++ b/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java
@@ -122,7 +122,7 @@ public @interface EnableR2dbcRepositories {
 	 *
 	 * @return
 	 */
-	String databaseClientRef() default "databaseClient";
+	String databaseClientRef() default "r2dbcDatabaseClient";
 
 	/**
 	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
diff --git a/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java b/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java
index 4524c65..9fd5feb 100644
--- a/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java
@@ -45,7 +45,7 @@ public class R2dbcRepositoriesRegistrarTests {
 	static class Config {
 
 		@Bean
-		public DatabaseClient databaseClient() {
+		public DatabaseClient r2dbcDatabaseClient() {
 			return mock(DatabaseClient.class);
 		}