diff --git a/contrib/msggen/msggen/gen/grpc.py b/contrib/msggen/msggen/gen/grpc.py
index 1acb7a152..7e66afc68 100644
--- a/contrib/msggen/msggen/gen/grpc.py
+++ b/contrib/msggen/msggen/gen/grpc.py
@@ -559,6 +559,8 @@ class GrpcServerGenerator(GrpcConverterGenerator):
             mname = method_name_overrides.get(method.name, method.name)
             # Tonic will convert to snake-case, so we have to do it here too
             name = re.sub(r'(?<!^)(?=[A-Z])', '_', mname).lower()
+            name = name.replace("-", "")
+            method.name = method.name.replace("-", "")
             self.write(f"""\
             async fn {name}(
                 &self,
diff --git a/doc/schemas/bkpr-listincome.request.json b/doc/schemas/bkpr-listincome.request.json
new file mode 100644
index 000000000..40bc91940
--- /dev/null
+++ b/doc/schemas/bkpr-listincome.request.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "added": "pre-v0.10.1",
+  "required": [],
+  "additionalProperties": false,
+  "properties": {
+    "consolidate_fees": {
+      "type": "boolean",
+      "description": "A brief description about consolidate_fees"
+    },
+    "start_time": {
+      "type": "u32",
+      "description": "Filters the events after the time"
+    },
+    "end_time": {
+      "type": "u32",
+      "description": "Filters the events up to the timestamp"
+    }
+  }
+}