diff --git a/include/ocpp/v201/charge_point.hpp b/include/ocpp/v201/charge_point.hpp
index a82587bdd..81b712309 100644
--- a/include/ocpp/v201/charge_point.hpp
+++ b/include/ocpp/v201/charge_point.hpp
@@ -531,11 +531,11 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
     void init_certificate_expiration_check_timers();
     void scheduled_check_client_certificate_expiration();
     void scheduled_check_v2g_certificate_expiration();
-    void on_websocket_connected(const int configuration_slot,
+    void websocket_connected_callback(const int configuration_slot,
                                 const NetworkConnectionProfile& network_connection_profile);
-    void on_websocket_disconnected(const int configuration_slot,
+    void websocket_disconnected_callback(const int configuration_slot,
                                    const NetworkConnectionProfile& network_connection_profile);
-    void on_websocket_connection_failed(ConnectionFailedReason reason);
+    void websocket_connection_failed(ConnectionFailedReason reason);
     void update_dm_availability_state(const int32_t evse_id, const int32_t connector_id,
                                       const ConnectorStatusEnum status);
     void update_dm_evse_power(const int32_t evse_id, const MeterValue& meter_value);
diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
index 8ffce4f47..7c488e077 100644
--- a/lib/ocpp/v201/charge_point.cpp
+++ b/lib/ocpp/v201/charge_point.cpp
@@ -163,11 +163,11 @@ ChargePoint::ChargePoint(const std::map<int32_t, int32_t>& evse_connector_struct
                                               std::bind(&ChargePoint::message_callback, this, std::placeholders::_1));
 
     this->connectivity_manager->set_websocket_connected_callback(
-        std::bind(&ChargePoint::on_websocket_connected, this, std::placeholders::_1, std::placeholders::_2));
+        std::bind(&ChargePoint::websocket_connected_callback, this, std::placeholders::_1, std::placeholders::_2));
     this->connectivity_manager->set_websocket_disconnected_callback(
-        std::bind(&ChargePoint::on_websocket_disconnected, this, std::placeholders::_1, std::placeholders::_2));
+        std::bind(&ChargePoint::websocket_disconnected_callback, this, std::placeholders::_1, std::placeholders::_2));
     this->connectivity_manager->set_websocket_connection_failed_callback(
-        std::bind(&ChargePoint::on_websocket_connection_failed, this, std::placeholders::_1));
+        std::bind(&ChargePoint::websocket_connection_failed, this, std::placeholders::_1));
 
     if (this->callbacks.configure_network_connection_profile_callback.has_value()) {
         this->connectivity_manager->set_configure_network_connection_profile_callback(
@@ -3726,7 +3726,7 @@ void ChargePoint::scheduled_check_v2g_certificate_expiration() {
             .value_or(12 * 60 * 60)));
 }
 
-void ChargePoint::on_websocket_connected(const int configuration_slot,
+void ChargePoint::websocket_connected_callback(const int configuration_slot,
                                          const NetworkConnectionProfile& network_connection_profile) {
     this->message_queue->resume(this->message_queue_resume_delay);
 
@@ -3768,7 +3768,7 @@ void ChargePoint::on_websocket_connected(const int configuration_slot,
     }
 }
 
-void ChargePoint::on_websocket_disconnected(const int configuration_slot,
+void ChargePoint::websocket_disconnected_callback(const int configuration_slot,
                                             const NetworkConnectionProfile& network_connection_profile) {
     this->message_queue->pause();
 
@@ -3786,7 +3786,7 @@ void ChargePoint::on_websocket_disconnected(const int configuration_slot,
     }
 }
 
-void ChargePoint::on_websocket_connection_failed(ConnectionFailedReason reason) {
+void ChargePoint::websocket_connection_failed(ConnectionFailedReason reason) {
     switch (reason) {
     case ConnectionFailedReason::InvalidCSMSCertificate:
         if (!this->skip_invalid_csms_certificate_notifications) {