diff --git a/core/src/main/scala/tamer/Setup.scala b/core/src/main/scala/tamer/Setup.scala
index 05b77f04..7594cc94 100644
--- a/core/src/main/scala/tamer/Setup.scala
+++ b/core/src/main/scala/tamer/Setup.scala
@@ -8,5 +8,5 @@ abstract class Setup[-K, -V, S](
     val valueSerializer: Serializer[Registry with Topic, V],
     val stateSerde: ZSerde[Registry with Topic, S],
     val defaultState: S,
-    val queryHash: Int
+    val stateKey: Int
 )
diff --git a/core/src/main/scala/tamer/kafka/Kafka.scala b/core/src/main/scala/tamer/kafka/Kafka.scala
index 733ee9a8..e50b9358 100644
--- a/core/src/main/scala/tamer/kafka/Kafka.scala
+++ b/core/src/main/scala/tamer/kafka/Kafka.scala
@@ -77,7 +77,7 @@ object Kafka {
             sp: Producer.Service[Registry with Topic, StateKey, State],
             layer: ULayer[Registry with Topic]
         ) =
-          ZStream.fromEffect(logTask <*> UIO(StateKey(setup.queryHash.toHexString, cfg.state.groupId))).flatMap { // TODO: no need for UIO, it's pure
+          ZStream.fromEffect(logTask <*> UIO(StateKey(setup.stateKey.toHexString, cfg.state.groupId))).flatMap { // TODO: no need for UIO, it's pure
             case (log, stateKey) =>
               ZStream
                 .fromEffect(subscribe(sc))
diff --git a/doobie/src/main/scala/tamer/db/Db.scala b/doobie/src/main/scala/tamer/db/Db.scala
index 34b74808..5d2b90c1 100644
--- a/doobie/src/main/scala/tamer/db/Db.scala
+++ b/doobie/src/main/scala/tamer/db/Db.scala
@@ -10,7 +10,7 @@ object Db {
 
   /** By specifying a field here, tamer will order database records according
     * to this date. Usually you want your latest update timestamp here.
-    * @param timestamp the value tamer will use to order the record by.
+    * @param timestamp the value tamer will use to order the records by.
     */
   abstract class Timestamped(val timestamp: Instant)
   object Timestamped {