diff --git a/UI/ui_can.cpp b/UI/ui_can.cpp
index a1ea12c..37c0c2f 100644
--- a/UI/ui_can.cpp
+++ b/UI/ui_can.cpp
@@ -108,5 +108,5 @@ void UI_can::can_send(uint32_t id, uint8_t dlc, std::array<uint8_t, 8> payload)
     frame.setFrameId(id);
     frame.setPayload(QByteArray::fromRawData((const char *)(payload.data()), dlc));
 
-    emit on_send(frame);
+    emit send(frame);
 }
diff --git a/UI/ui_can.hpp b/UI/ui_can.hpp
index 80edab6..c9a661c 100644
--- a/UI/ui_can.hpp
+++ b/UI/ui_can.hpp
@@ -33,7 +33,7 @@ class UI_can : public UI_item
     void can_send(uint32_t id, uint8_t dlc, std::array<uint8_t, 8> payload) override;
     void can_clear() override;
   signals:
-    void on_send(QCanBusFrame msg);
+    void send(QCanBusFrame msg);
 
   private:
     std::vector<CanFrame> m_can_send_messages;
diff --git a/UI/ui_checkbox.cpp b/UI/ui_checkbox.cpp
index 7f98359..20e2cd4 100644
--- a/UI/ui_checkbox.cpp
+++ b/UI/ui_checkbox.cpp
@@ -18,14 +18,14 @@ void UI_checkbox::click()
 {
     m_checked = !m_checked;
     emit ui_changed();
-    emit on_change(m_checked);
+    emit changed(m_checked);
 }
 
 void UI_checkbox::set_state(bool state)
 {
     m_checked = state;
     emit ui_changed();
-    emit on_change(m_checked);
+    emit changed(m_checked);
 }
 
 bool UI_checkbox::state() const
diff --git a/UI/ui_checkbox.hpp b/UI/ui_checkbox.hpp
index 7c462b4..6610338 100644
--- a/UI/ui_checkbox.hpp
+++ b/UI/ui_checkbox.hpp
@@ -19,7 +19,7 @@ class UI_checkbox : public UI_item
     json to_json(size_t id) const override;
 
   signals:
-    void on_change(bool);
+    void changed(bool);
 
   private:
     bool m_checked;
diff --git a/UI/ui_textbox.cpp b/UI/ui_textbox.cpp
index 8c7506d..9ccd2a3 100644
--- a/UI/ui_textbox.cpp
+++ b/UI/ui_textbox.cpp
@@ -16,7 +16,7 @@ void UI_textbox::set_text(std::string text)
         return;
     m_text = text;
     emit ui_changed();
-    emit on_change(m_text);
+    emit changed(m_text);
 }
 
 void UI_textbox::set_hint(std::string hint)
diff --git a/UI/ui_textbox.hpp b/UI/ui_textbox.hpp
index 86338d2..fcc5929 100644
--- a/UI/ui_textbox.hpp
+++ b/UI/ui_textbox.hpp
@@ -19,7 +19,7 @@ class UI_textbox : public UI_item
     void from_json(const json &j) override;
     json to_json(size_t id) const override;
   signals:
-    void on_change(std::string text);
+    void changed(std::string text);
 
   private:
     std::string m_hint;
diff --git a/server/simulators/can_debugger.cpp b/server/simulators/can_debugger.cpp
index 30f20a2..95ec5e0 100644
--- a/server/simulators/can_debugger.cpp
+++ b/server/simulators/can_debugger.cpp
@@ -8,7 +8,7 @@ Can_Debugger::Can_Debugger(Communication *com, QObject *parent)
 {
     PUSH_UI_ITEM(m_can_ui);
 
-    connect(&m_can_ui, &UI_can::on_send, this, [=, this](QCanBusFrame frame) { m_wrapper->send_can_message(frame); });
+    connect(&m_can_ui, &UI_can::send, this, [=, this](QCanBusFrame frame) { m_wrapper->send_can_message(frame); });
 }
 
 void Can_Debugger::timer()