diff --git a/src/main/kotlin/fr/postgresjson/connexion/Function.kt b/src/main/kotlin/fr/postgresjson/connexion/Function.kt
index a55a341..62255fc 100644
--- a/src/main/kotlin/fr/postgresjson/connexion/Function.kt
+++ b/src/main/kotlin/fr/postgresjson/connexion/Function.kt
@@ -195,11 +195,11 @@ class Function(val definition: Function, override val connection: Connection): E
         val parameters = definition.getParametersIndexedByName()
         val placeholders = values
             .filter { entry ->
-                val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist")
+                val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
                 parameter.default === null || entry.value !== null
             }
             .map { entry ->
-                val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist")
+                val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
                 """"${parameter.name}" := :${parameter.name}::${parameter.type}"""
             }
 
diff --git a/src/main/kotlin/fr/postgresjson/entity/Entity.kt b/src/main/kotlin/fr/postgresjson/entity/Entity.kt
index c70be4d..71e32d5 100644
--- a/src/main/kotlin/fr/postgresjson/entity/Entity.kt
+++ b/src/main/kotlin/fr/postgresjson/entity/Entity.kt
@@ -45,21 +45,21 @@ class EntityUpdatedAtImp: EntityUpdatedAt {
 }
 
 /* Author */
-interface CreatedBy<T: EntityI<*>> {
+interface EntityCreatedBy<T: EntityI<*>> {
     var createdBy: T?
 }
 
-interface UpdatedBy<T: EntityI<*>> {
+interface EntityUpdatedBy<T: EntityI<*>> {
     var updatedBy: T?
 }
 
 class EntityCreatedByImp<UserT: EntityI<*>>(
     override var createdBy: UserT?
-): CreatedBy<UserT>
+): EntityCreatedBy<UserT>
 
 class EntityUpdatedByImp<UserT: EntityI<*>>(
     override var updatedBy: UserT?
-): UpdatedBy<UserT>
+): EntityUpdatedBy<UserT>
 
 /* Published */
 interface Published<UserT: EntityI<*>> {
@@ -79,8 +79,8 @@ abstract class EntityImp<T, UserT: EntityI<*>>(
 ): Entity<T>(),
     EntityCreatedAt by EntityCreatedAtImp(),
     EntityUpdatedAt by EntityUpdatedAtImp(),
-    CreatedBy<UserT> by EntityCreatedByImp(updatedBy),
-    UpdatedBy<UserT> by EntityUpdatedByImp(updatedBy)
+    EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
+    EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy)
 
 abstract class UuidEntityExtended<T, UserT: EntityI<*>>(
     updatedBy: UserT?,
diff --git a/src/test/kotlin/fr/postgresjson/EntityTest.kt b/src/test/kotlin/fr/postgresjson/EntityTest.kt
index 87e812d..c57e77f 100644
--- a/src/test/kotlin/fr/postgresjson/EntityTest.kt
+++ b/src/test/kotlin/fr/postgresjson/EntityTest.kt
@@ -18,8 +18,8 @@ class EntityTest() {
         assertTrue(obj is EntityI<Int?>)
         assertTrue(obj is Entity<Int?>)
         assertTrue(obj is Published<User>)
-        assertTrue(obj is CreatedBy<User>)
-        assertTrue(obj is UpdatedBy<User>)
+        assertTrue(obj is EntityCreatedBy<User>)
+        assertTrue(obj is EntityUpdatedBy<User>)
         assertTrue(obj is EntityCreatedAt)
         assertTrue(obj is EntityUpdatedAt)
     }