5 files changed, 9 insertions, 9 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index 358b3893..d84ce808 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -52,7 +52,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
 			return cmd_results_new(CMD_FAILURE, "bar",
 					"Can only be used in config file.");
 		}
-		return subcommand(argv, argc, bar_config_handlers,
+		return config_subcommand(argv, argc, bar_config_handlers,
 				sizeof(bar_config_handlers));
 	}
 
@@ -111,5 +111,5 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
 		wlr_log(L_DEBUG, "Creating bar %s", bar->id);
 	}
 
-	return subcommand(argv, argc, bar_handlers, sizeof(bar_handlers));
+	return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers));
 }
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 6d3c09b8..8c862ca9 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -52,7 +52,7 @@ static struct cmd_results *parse_three_colors(char ***colors,
 }
 
 struct cmd_results *bar_cmd_colors(int argc, char **argv) {
-	return subcommand(argv, argc, bar_colors_handlers,
+	return config_subcommand(argv, argc, bar_colors_handlers,
 			sizeof(bar_colors_handlers));
 }
 
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 972160e2..22a0bb7c 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -42,8 +42,8 @@ struct cmd_results *cmd_input(int argc, char **argv) {
 		return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
 	}
 
-	struct cmd_results *res = subcommand(argv + 1, argc - 1, input_handlers,
-			sizeof(input_handlers));
+	struct cmd_results *res = config_subcommand(argv + 1, argc - 1,
+			input_handlers, sizeof(input_handlers));
 
 	free_input_config(config->handler_context.input_config);
 	config->handler_context.input_config = NULL;
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index 31d0f251..00331ccc 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -65,8 +65,8 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
 	}
 
 	// Create binding
-	struct cmd_results *result = subcommand(argv + 1, argc - 1, mode_handlers,
-			sizeof(mode_handlers));
+	struct cmd_results *result = config_subcommand(argv + 1, argc - 1,
+			mode_handlers, sizeof(mode_handlers));
 	config->current_mode = config->modes->items[0];
 
 	return result;
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 6080bf64..5e3c0bd0 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -24,8 +24,8 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
 				"Couldn't allocate config");
 	}
 
-	struct cmd_results *res = subcommand(argv + 1, argc - 1, seat_handlers,
-			sizeof(seat_handlers));
+	struct cmd_results *res = config_subcommand(argv + 1, argc - 1,
+			seat_handlers, sizeof(seat_handlers));
 
 	free_seat_config(config->handler_context.seat_config);
 	config->handler_context.seat_config = NULL;