diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
index a5f0486638e7..14105bd39bd3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
@@ -297,7 +297,7 @@ protected Set<String> mappedNames(PropertyDescriptor pd) {
 	 * @see #underscoreName
 	 */
 	protected String lowerCaseName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
+		if (!StringUtils.hasText(name)) {
 			return "";
 		}
 		return name.toLowerCase(Locale.US);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index 84a37f8bcf75..e13bb395e20f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -509,7 +509,7 @@ public static String lookupColumnName(ResultSetMetaData resultSetMetaData, int c
 	 * @see #convertUnderscoreNameToPropertyName
 	 */
 	public static String convertPropertyNameToUnderscoreName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
+		if (!StringUtils.hasText(name)) {
 			return "";
 		}
 
@@ -535,7 +535,7 @@ public static String convertPropertyNameToUnderscoreName(@Nullable String name)
 	 * @see #convertPropertyNameToUnderscoreName
 	 */
 	public static String convertUnderscoreNameToPropertyName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
+		if (!StringUtils.hasText(name)) {
 			return "";
 		}
 
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/BeanPropertyRowMapper.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/BeanPropertyRowMapper.java
index 6e31088d1eb6..516cb03c90d6 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/BeanPropertyRowMapper.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/BeanPropertyRowMapper.java
@@ -36,6 +36,7 @@
 import org.springframework.beans.TypeConverter;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -137,7 +138,7 @@ protected void suppressProperty(@Nullable String propertyName) {
 	 * @return the converted name
 	 */
 	protected String lowerCaseName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
+		if (!StringUtils.hasText(name)) {
 			return "";
 		}
 		return name.toLowerCase(Locale.US);
@@ -151,22 +152,7 @@ protected String lowerCaseName(@Nullable String name) {
 	 * @see #lowerCaseName
 	 */
 	protected String underscoreName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
-			return "";
-		}
-
-		StringBuilder result = new StringBuilder();
-		result.append(Character.toLowerCase(name.charAt(0)));
-		for (int i = 1; i < name.length(); i++) {
-			char c = name.charAt(i);
-			if (Character.isUpperCase(c)) {
-				result.append('_').append(Character.toLowerCase(c));
-			}
-			else {
-				result.append(c);
-			}
-		}
-		return result.toString();
+		return JdbcUtils.convertPropertyNameToUnderscoreName(name);
 	}
 
 	/**