diff --git a/apiserver/events/params.go b/apiserver/events/params.go
index 7ecabaa8..a5760d7f 100644
--- a/apiserver/events/params.go
+++ b/apiserver/events/params.go
@@ -6,7 +6,7 @@ import (
 
 type Filter struct {
 	Operations []common.OperationType    `json:"operations"`
-	EntityType common.DatabaseEntityType `json:"entity_type"`
+	EntityType common.DatabaseEntityType `json:"entity-type"`
 }
 
 func (f Filter) Validate() error {
@@ -30,7 +30,7 @@ func (f Filter) Validate() error {
 }
 
 type Options struct {
-	SendEverything bool     `json:"send_everything"`
+	SendEverything bool     `json:"send-everything"`
 	Filters        []Filter `json:"filters"`
 }
 
diff --git a/database/common/watcher.go b/database/common/watcher.go
index 73af32bd..d8700189 100644
--- a/database/common/watcher.go
+++ b/database/common/watcher.go
@@ -28,9 +28,9 @@ const (
 )
 
 type ChangePayload struct {
-	EntityType DatabaseEntityType
-	Operation  OperationType
-	Payload    interface{}
+	EntityType DatabaseEntityType `json:"entity-type"`
+	Operation  OperationType      `json:"operation"`
+	Payload    interface{}        `json:"payload"`
 }
 
 type Consumer interface {