diff --git a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensions.kt b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensions.kt
index c0d3a8e02..c49ac3ec9 100644
--- a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensions.kt
+++ b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensions.kt
@@ -55,7 +55,7 @@ inline fun <reified T : Any> ReactiveSelectOperation.SelectWithProjection<*>.asT
 /**
  * Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.one].
  *
- * @author Mark Paluch
+ * @author Sebastien Deleuze
  * @since 2.2
  */
 suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOne(): T =
@@ -65,6 +65,7 @@ suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T
  * Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.one].
  *
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  * @since 2.2
  */
 suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitOneOrNull(): T? =
@@ -73,7 +74,7 @@ suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T
 /**
  * Non-nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
  *
- * @author Mark Paluch
+ * @author Sebastien Deleuze
  * @since 2.2
  */
 suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirst(): T =
@@ -83,6 +84,7 @@ suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T
  * Nullable Coroutines variant of [ReactiveSelectOperation.TerminatingSelect.first].
  *
  * @author Mark Paluch
+ * @author Sebastien Deleuze
  * @since 2.2
  */
 suspend inline fun <reified T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitFirstOrNull(): T? =
diff --git a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensionsUnitTests.kt b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensionsUnitTests.kt
index a63481ae8..204ba91dc 100644
--- a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensionsUnitTests.kt
+++ b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensionsUnitTests.kt
@@ -79,7 +79,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitOneWithNull() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
@@ -94,7 +94,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitOneOrNullWithValue() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
@@ -109,7 +109,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitOneOrNullWithNull() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
@@ -139,7 +139,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitFirstWithNull() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
@@ -154,7 +154,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitFirstOrNullWithValue() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
@@ -169,7 +169,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
 		}
 	}
 
-	@Test // DATACASS-632
+	@Test // DATACASS-647
 	fun terminatingFindAwaitFirstOrNullWithNull() {
 
 		val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()