3 files changed, 10 insertions, 10 deletions
diff --git a/ui/include/turns/ui/tracker.hpp b/ui/include/turns/ui/tracker.hpp
index 58ed84a..2e3adf5 100644
--- a/ui/include/turns/ui/tracker.hpp
+++ b/ui/include/turns/ui/tracker.hpp
@@ -1,7 +1,7 @@
 #ifndef TURNS_UI_TRACKER_HPP
 #define TURNS_UI_TRACKER_HPP
 
-#include "turns/core/turn_order.hpp"
+#include "turns/core/turn_order_model.hpp"
 #include "turns/ui/template_widget.hpp"
 #include "turns/ui/turn_order_view.hpp"
 
@@ -87,7 +87,7 @@ namespace turns::ui
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
     Adwaita::WindowTitle * m_title;
-    Glib::RefPtr<core::turn_order> m_turn_order;
+    Glib::RefPtr<core::TurnOderModel> m_turn_order;
     TurnOrderView * m_turn_order_view;
     Glib::RefPtr<Gio::Settings> m_settings{};
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
diff --git a/ui/include/turns/ui/turn_order_view.hpp b/ui/include/turns/ui/turn_order_view.hpp
index f026854..8dae4e4 100644
--- a/ui/include/turns/ui/turn_order_view.hpp
+++ b/ui/include/turns/ui/turn_order_view.hpp
@@ -2,7 +2,7 @@
 #define TURNS_UI_TURN_ORDER_VIEW_HPP
 
 #include "turns/core/fwd.hpp"
-#include "turns/core/turn_order.hpp"
+#include "turns/core/turn_order_model.hpp"
 #include "turns/ui/template_widget.hpp"
 
 #include <glibmm/object.h>
@@ -19,7 +19,7 @@ namespace turns::ui
 {
   struct TurnOrderView : template_widget<TurnOrderView, Gtk::Box>
   {
-    using model_type = core::turn_order;
+    using model_type = core::TurnOderModel;
 
     auto constexpr inline static children = std::array{
         "progress",
diff --git a/ui/src/tracker.cpp b/ui/src/tracker.cpp
index cb4d79c..d67a6e0 100644
--- a/ui/src/tracker.cpp
+++ b/ui/src/tracker.cpp
@@ -1,7 +1,7 @@
 #include "turns/ui/tracker.hpp"
 
 #include "turns/core/settings.hpp"
-#include "turns/core/turn_order.hpp"
+#include "turns/core/turn_order_model.hpp"
 #include "turns/lang/messages.hpp"
 #include "turns/ui/template_widget.hpp"
 #include "turns/ui/turn_order_view.hpp"
@@ -71,7 +71,7 @@ namespace turns::ui
       , m_stack{get_widget<Gtk::Stack>("stack")}
       , m_start{get_widget<Gtk::Button>("start")}
       , m_title{get_widget<Adwaita::WindowTitle>("title")}
-      , m_turn_order{core::turn_order::create()}
+      , m_turn_order{core::TurnOderModel::create()}
       , m_turn_order_view{Gtk::make_managed<TurnOrderView>(m_turn_order)}
       , m_settings{std::move(settings)}
       , m_subtitle{m_title->property_subtitle()}
@@ -115,7 +115,7 @@ namespace turns::ui
     // win.clear
     // depends-on: turn_order:is_empty == false
     {
-      auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::turn_order::clear));
+      auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::TurnOderModel::clear));
 
       Glib::Binding::bind_property(m_turn_order->is_empty(),
                                    action->property_enabled(),
@@ -125,7 +125,7 @@ namespace turns::ui
     // win.next
     // depends-on: turn_order:state == running
     {
-      auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::turn_order::next));
+      auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::TurnOderModel::next));
 
       Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE);
     }
@@ -133,7 +133,7 @@ namespace turns::ui
     // win.previous
     // depends-on: turn_order:has_previous == true
     {
-      auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::turn_order::previous));
+      auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::TurnOderModel::previous));
 
       Glib::Binding::bind_property(m_turn_order->has_previous(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE);
     }
@@ -141,7 +141,7 @@ namespace turns::ui
     // win.start
     // depends-on: turn_order:is_empty == false
     {
-      auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::turn_order::start));
+      auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::TurnOderModel::start));
 
       Glib::Binding::bind_property(m_turn_order->is_empty(),
                                    action->property_enabled(),