diff --git a/river/Output.zig b/river/Output.zig
index a32c000..2dae989 100644
--- a/river/Output.zig
+++ b/river/Output.zig
@@ -76,11 +76,11 @@ const LayoutName = struct {
 
 // zig fmt: off
 const layout_names = [_]LayoutName {
-    .{ .name = "TopMaster",    .layout = Layout.TopMaster, },
-    .{ .name = "RightMaster",  .layout = Layout.RightMaster, },
-    .{ .name = "BottomMaster", .layout = Layout.BottomMaster, },
-    .{ .name = "LeftMaster",   .layout = Layout.LeftMaster, },
-    .{ .name = "Full",         .layout = Layout.Full, },
+    .{ .name = "top-master",    .layout = Layout.TopMaster, },
+    .{ .name = "right-master",  .layout = Layout.RightMaster, },
+    .{ .name = "bottom-master", .layout = Layout.BottomMaster, },
+    .{ .name = "left-master",   .layout = Layout.LeftMaster, },
+    .{ .name = "full",          .layout = Layout.Full, },
 };
 // zig fmt: on
 
diff --git a/river/command.zig b/river/command.zig
index c1db559..2435dee 100644
--- a/river/command.zig
+++ b/river/command.zig
@@ -65,24 +65,24 @@ const Definition = struct {
 // zig fmt: off
 const str_to_impl_fn = [_]Definition{
     .{ .name = "close",             .impl = impl.close },
-    .{ .name = "declare_mode",      .impl = impl.declareMode},
-    .{ .name = "enter_mode",        .impl = impl.enterMode },
+    .{ .name = "declare-mode",      .impl = impl.declareMode},
+    .{ .name = "enter-mode",        .impl = impl.enterMode },
     .{ .name = "exit",              .impl = impl.exit },
     .{ .name = "focus",             .impl = impl.focus },
-    .{ .name = "focus_all_tags",    .impl = impl.focusAllTags },
-    .{ .name = "focus_output",      .impl = impl.focusOutput },
-    .{ .name = "focus_tag",         .impl = impl.focusTag },
+    .{ .name = "focus-all-tags",    .impl = impl.focusAllTags },
+    .{ .name = "focus-output",      .impl = impl.focusOutput },
+    .{ .name = "focus-tag",         .impl = impl.focusTag },
     .{ .name = "layout",            .impl = impl.layout },
-    .{ .name = "mod_master_count",  .impl = impl.modMasterCount },
-    .{ .name = "mod_master_factor", .impl = impl.modMasterFactor },
-    .{ .name = "send_to_output",    .impl = impl.sendToOutput },
+    .{ .name = "mod-master-count",  .impl = impl.modMasterCount },
+    .{ .name = "mod-master-factor", .impl = impl.modMasterFactor },
+    .{ .name = "send-to-output",    .impl = impl.sendToOutput },
     .{ .name = "spawn",             .impl = impl.spawn },
     .{ .name = "map",               .impl = impl.map },
-    .{ .name = "tag_view",          .impl = impl.tagView },
-    .{ .name = "tag_view_all_tags", .impl = impl.tagViewAllTags },
-    .{ .name = "toggle_float",      .impl = impl.toggleFloat },
-    .{ .name = "toggle_tag_focus",  .impl = impl.toggleTagFocus },
-    .{ .name = "toggle_view_tag",   .impl = impl.toggleViewTag },
+    .{ .name = "tag-view",          .impl = impl.tagView },
+    .{ .name = "tag-view-all-tags", .impl = impl.tagViewAllTags },
+    .{ .name = "toggle-float",      .impl = impl.toggleFloat },
+    .{ .name = "toggle-tag-focus",  .impl = impl.toggleTagFocus },
+    .{ .name = "toggle-view-tag",   .impl = impl.toggleViewTag },
     .{ .name = "zoom",              .impl = impl.zoom },
 };
 // zig fmt: on