3 files changed, 9 insertions, 9 deletions

diff --git a/sway/tree/output.c b/sway/tree/output.c
index c095dce0..242e6fac 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -56,8 +56,8 @@ static void restore_workspaces(struct sway_output *output) {
         }
 
         // Saved workspaces
-        while (root->noop_output->workspaces->length) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[0];
+        while (root->fallback_output->workspaces->length) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[0];
                 workspace_detach(ws);
                 output_add_workspace(output, ws);
 
@@ -192,7 +192,7 @@ static void output_evacuate(struct sway_output *output) {
                         new_output = fallback_output;
                 }
                 if (!new_output) {
-                        new_output = root->noop_output;
+                        new_output = root->fallback_output;
                 }
 
                 struct sway_workspace *new_output_ws =
diff --git a/sway/tree/root.c b/sway/tree/root.c
index dd4d8e33..73f3993c 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -374,8 +374,8 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data),
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 workspace_for_each_container(ws, f, data);
         }
 }
@@ -427,8 +427,8 @@ struct sway_container *root_find_container(
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 if ((result = workspace_find_container(ws, test, data))) {
                         return result;
                 }
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index e3ff1513..c84320bd 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -50,8 +50,8 @@ struct sway_output *workspace_get_initial_output(const char *name) {
         } else if (focus && focus->type == N_CONTAINER) {
                 return focus->sway_container->pending.workspace->output;
         }
-        // Fallback to the first output or noop output for headless
-        return root->outputs->length ? root->outputs->items[0] : root->noop_output;
+        // Fallback to the first output or the headless output
+        return root->outputs->length ? root->outputs->items[0] : root->fallback_output;
 }
 
 struct sway_workspace *workspace_create(struct sway_output *output,