2 files changed, 13 insertions, 13 deletions

diff --git a/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp
index 0b35c72..b31ad77 100644
--- a/app/src/windows/participant_editor.cpp
+++ b/app/src/windows/participant_editor.cpp
@@ -1,6 +1,6 @@
 #include "turns/app/windows/participant_editor.hpp"
 
-#include "turns/domain/disposition.hpp"
+#include "turns/core/disposition.hpp"
 #include "turns/lang/messages.hpp"
 
 #include <ranges>
@@ -14,7 +14,7 @@
 namespace turns::app::windows
 {
 
-  participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<domain::participant> obj)
+  participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj)
       : Gtk::Widget{base}
       , m_adw{ADW_DIALOG(gobj())}
       , m_disposition{ADW_COMBO_ROW(builder->get_widget<Gtk::ListBoxRow>("disposition")->gobj())}
@@ -29,9 +29,9 @@ namespace turns::app::windows
     adw_dialog_set_title(m_adw, _(obj ? lang::edit_participant : lang::add_participant));
     m_finish->signal_clicked().connect(sigc::mem_fun(*this, &participant_editor::handle_finish_clicked));
 
-    for (auto n : std::views::iota(std::uint8_t{}, static_cast<std::uint8_t>(domain::disposition::END)))
+    for (auto n : std::views::iota(std::uint8_t{}, static_cast<std::uint8_t>(core::disposition::END)))
     {
-      m_disposition_model->append(presentation_name_for(domain::disposition{n}));
+      m_disposition_model->append(presentation_name_for(core::disposition{n}));
     }
 
     m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &participant_editor::handle_item_bind));
@@ -62,7 +62,7 @@ namespace turns::app::windows
   {
     auto name = gtk_editable_get_text(GTK_EDITABLE(m_name));
     auto priority = adw_spin_row_get_value(m_priority);
-    auto disposition = static_cast<domain::disposition>(adw_combo_row_get_selected(m_disposition));
+    auto disposition = static_cast<core::disposition>(adw_combo_row_get_selected(m_disposition));
 
     if (m_participant)
     {
diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp
index 11f4642..7c4d2cd 100644
--- a/app/src/windows/tracker.cpp
+++ b/app/src/windows/tracker.cpp
@@ -16,13 +16,13 @@ namespace turns::app::windows
 
   namespace
   {
-    auto editor_for(Glib::RefPtr<domain::participant> participant)
+    auto editor_for(Glib::RefPtr<core::participant> participant)
     {
       auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
       return std::pair{builder, Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor", participant)};
     }
 
-    auto stop_dialog_callback(AdwAlertDialog * dialog, GAsyncResult * result, domain::turn_order * order)
+    auto stop_dialog_callback(AdwAlertDialog * dialog, GAsyncResult * result, core::turn_order * order)
     {
       auto response = adw_alert_dialog_choose_finish(dialog, result);
       if (response == Glib::ustring{"clear"})
@@ -42,7 +42,7 @@ namespace turns::app::windows
       , m_stack{builder->get_widget<Gtk::Stack>("stack")}
       , m_start{builder->get_widget<Gtk::Button>("start")}
       , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj()))
-      , m_turn_order{domain::turn_order::create()}
+      , m_turn_order{core::turn_order::create()}
       , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)}
       , m_subtitle{Glib::wrap(GTK_WIDGET(m_title)), "subtitle"}
   {
@@ -84,7 +84,7 @@ namespace turns::app::windows
   {
     static_cast<void>(param);
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-    auto participant = m_turn_order->get_typed_object<domain::participant>(index.get());
+    auto participant = m_turn_order->get_typed_object<core::participant>(index.get());
     auto [lifeline, dialog] = editor_for(participant);
     dialog->present(this);
   }
@@ -120,7 +120,7 @@ namespace turns::app::windows
     // win.clear
     // depends-on: turn_order:is_empty == false
     {
-      auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &domain::turn_order::clear));
+      auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::turn_order::clear));
 
       Glib::Binding::bind_property(m_turn_order->is_empty(),
                                    action->property_enabled(),
@@ -130,7 +130,7 @@ namespace turns::app::windows
     // win.next
     // depends-on: turn_order:state == running
     {
-      auto action = add_action("next", sigc::mem_fun(*m_turn_order, &domain::turn_order::next));
+      auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::turn_order::next));
 
       Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE);
     }
@@ -138,7 +138,7 @@ namespace turns::app::windows
     // win.previous
     // depends-on: turn_order:has_previous == true
     {
-      auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &domain::turn_order::previous));
+      auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::turn_order::previous));
 
       Glib::Binding::bind_property(m_turn_order->has_previous(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE);
     }
@@ -146,7 +146,7 @@ namespace turns::app::windows
     // win.start
     // depends-on: turn_order:is_empty == false
     {
-      auto action = add_action("start", sigc::mem_fun(*m_turn_order, &domain::turn_order::start));
+      auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::turn_order::start));
 
       Glib::Binding::bind_property(m_turn_order->is_running(),
                                    action->property_enabled(),