diff --git a/.editorconfig b/.editorconfig
index a204010ef..e4d5f441c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -252,6 +252,13 @@ ij_java_wrap_comments = false
 ij_java_wrap_first_method_in_call_chain = false
 ij_java_wrap_long_lines = false
 
+[*{kt,kts}]
+indent_style = space
+indent_size = 4
+ij_kotlin_name_count_to_use_star_import = 100
+ij_kotlin_name_count_to_use_star_import_for_members = 100
+ij_kotlin_keep_line_breaks = true
+
 [.editorconfig]
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
diff --git a/spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryExtensions.kt b/spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryFactory.kt
similarity index 84%
rename from spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryExtensions.kt
rename to spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryFactory.kt
index fc050ca3d..4b2508317 100644
--- a/spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryExtensions.kt
+++ b/spring-data-neo4j/src/main/kotlin/org/neo4j/springframework/data/core/PreparedQueryFactory.kt
@@ -27,6 +27,6 @@ import kotlin.reflect.KClass
  * @since 1.0
  */
 class PreparedQueryFactory<T : Any>(val c: KClass<T>) {
-	fun withCypherQuery(cypherQuery: String): PreparedQuery.OptionalBuildSteps<T> = c.javaObjectType.let { PreparedQuery.queryFor(it) }
-			.withCypherQuery(cypherQuery)
+    fun withCypherQuery(cypherQuery: String): PreparedQuery.OptionalBuildSteps<T> = c.javaObjectType.let { PreparedQuery.queryFor(it) }
+            .withCypherQuery(cypherQuery)
 }