diff --git a/docs/api.md b/docs/api.md
index 5ce24de..c43f2e3 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -12,7 +12,7 @@ opcua is used as enclosing namespace for all parts of the Arduino_OPC_UA library
 
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
-`public time_t ` [`cvt_time`](#namespaceopcua_1ac8a236e4356144a3ee7ebede7d49cfa7)`(char const * time)`            | Converts a date/time string as generated by **DATE** into a time_t value. 
+`public time_t ` [`timeToStr`](#namespaceopcua_1a5eab7edc9a71d850d6b47ae50e214c08)`(char const * time)`            | Converts a date/time string as generated by **DATE** into a time_t value. 
 `class ` [`opcua::AnalogExpansion`](#classopcua_1_1_analog_expansion) | Provides an OPC UA object node abstraction for an Analog [Expansion](#classopcua_1_1_expansion) board.
 `class ` [`opcua::DigitalExpansion`](#classopcua_1_1_digital_expansion) | Provides an OPC UA object node abstraction for both Digital [Expansion](#classopcua_1_1_expansion) board.
 `class ` [`opcua::DigitalMechExpansion`](#classopcua_1_1_digital_mech_expansion) | Provides an OPC UA object node abstraction for a Digital [Expansion](#classopcua_1_1_expansion) board with mechanical relays.
@@ -39,7 +39,7 @@ opcua is used as enclosing namespace for all parts of the Arduino_OPC_UA library
 
 ## Members
 
-#### `public time_t ` [`cvt_time`](#namespaceopcua_1ac8a236e4356144a3ee7ebede7d49cfa7)`(char const * time)` <a id="namespaceopcua_1ac8a236e4356144a3ee7ebede7d49cfa7" class="anchor"></a>
+#### `public time_t ` [`timeToStr`](#namespaceopcua_1a5eab7edc9a71d850d6b47ae50e214c08)`(char const * time)` <a id="namespaceopcua_1a5eab7edc9a71d850d6b47ae50e214c08" class="anchor"></a>
 
 Converts a date/time string as generated by **DATE** into a time_t value. 
 #### Parameters
@@ -66,10 +66,10 @@ This class creates an OPC UA object node which is representing an Arduino [Opta]
 | [`AnalogExpansion`](#classopcua_1_1_analog_expansion_1a8922c1b320139757c7200ec568d25324) | Constructor of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. Note: Objects should not be instantiated directly, but by using [AnalogExpansion::create](#classopcua_1_1_analog_expansion_1a13a953b2d732d52f0c6772957b45abe8).  |
 | [`~AnalogExpansion`](#classopcua_1_1_analog_expansion_1ad9a18c730a6451d543e48a91bf7eeff1) | Destructor of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. |
 | [`toSKUString`](#classopcua_1_1_analog_expansion_1a37b9a4657d1e8c0cf2e1d0322adfa27c) | Returns the SKU number of the Analog [Expansion](#classopcua_1_1_expansion) board as std::string.  |
-| [`add_analog_input`](#classopcua_1_1_analog_expansion_1a831c9c4d6f443ebd8d0924ca7eb00faa) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
-| [`add_analog_output`](#classopcua_1_1_analog_expansion_1a06151fa00414888bba4dfcd65f1da081) | This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
-| [`add_pwm_output`](#classopcua_1_1_analog_expansion_1a3a0997c332767761b4d96cac2e9f0963) | This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
-| [`add_led_output`](#classopcua_1_1_analog_expansion_1a748779b79841cfa4329e318450be9be9) | This function creates a new opcua::LED and adds it to the opcua::LEDManager belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
+| [`addAnalogInput`](#classopcua_1_1_analog_expansion_1afcb118a0a514b13fbc01167bca6f118d) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
+| [`addAnalogOutput`](#classopcua_1_1_analog_expansion_1a5b671c357e09846ad1a74ef2df641545) | This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
+| [`addPwmOutput`](#classopcua_1_1_analog_expansion_1ab0f7267b0b2eb714ce87e234df6f2985) | This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
+| [`addLedOutput`](#classopcua_1_1_analog_expansion_1ad7b7fdcc0c27bdd2671a1b90be26d38c) | This function creates a new opcua::LED and adds it to the opcua::LEDManager belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
 | [`SharedPtr`](#classopcua_1_1_analog_expansion_1a3a99cadc0594891e0ce7ee9acc06d1f3) | SharedPtr is std::shared_ptr of an [AnalogExpansion](#classopcua_1_1_analog_expansion) class. |
 | [`create`](#classopcua_1_1_analog_expansion_1a13a953b2d732d52f0c6772957b45abe8) | Creates a new instance of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -112,10 +112,10 @@ Returns the SKU number of the Analog [Expansion](#classopcua_1_1_expansion) boar
 SKU number of Analog [Expansion](#classopcua_1_1_expansion) board
 <hr />
 
-### `add_analog_input` <a id="classopcua_1_1_analog_expansion_1a831c9c4d6f443ebd8d0924ca7eb00faa" class="anchor"></a>
+### `addAnalogInput` <a id="classopcua_1_1_analog_expansion_1afcb118a0a514b13fbc01167bca6f118d" class="anchor"></a>
 
 ```cpp
-void add_analog_input(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
+void addAnalogInput(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
 ```
 
 This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. 
@@ -127,10 +127,10 @@ This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) a
 * `on_read_request` Function pointer which is called during a read-access on the variable node representing the analog input.
 <hr />
 
-### `add_analog_output` <a id="classopcua_1_1_analog_expansion_1a06151fa00414888bba4dfcd65f1da081" class="anchor"></a>
+### `addAnalogOutput` <a id="classopcua_1_1_analog_expansion_1a5b671c357e09846ad1a74ef2df641545" class="anchor"></a>
 
 ```cpp
-void add_analog_output(UA_Server * server, const char * display_name, AnalogOutput::OnReadRequestFunc const on_read_request, AnalogOutput::OnWriteRequestFunc const on_write_request)
+void addAnalogOutput(UA_Server * server, const char * display_name, AnalogOutput::OnReadRequestFunc const on_read_request, AnalogOutput::OnWriteRequestFunc const on_write_request)
 ```
 
 This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. 
@@ -144,10 +144,10 @@ This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output)
 * `on_write_request` Function pointer which is called during a write-access on the variable node representing the analog output.
 <hr />
 
-### `add_pwm_output` <a id="classopcua_1_1_analog_expansion_1a3a0997c332767761b4d96cac2e9f0963" class="anchor"></a>
+### `addPwmOutput` <a id="classopcua_1_1_analog_expansion_1ab0f7267b0b2eb714ce87e234df6f2985" class="anchor"></a>
 
 ```cpp
-void add_pwm_output(UA_Server * server, const char * display_name, PwmOutput::SetPwmFunc const set_pwm_func, PwmOutput::GetPwmPeriodFunc const get_pwm_period_func, PwmOutput::GetPwmPulseWidthFunc const get_pwm_pulse_width_func)
+void addPwmOutput(UA_Server * server, const char * display_name, PwmOutput::SetPwmFunc const set_pwm_func, PwmOutput::GetPwmPeriodFunc const get_pwm_period_func, PwmOutput::GetPwmPulseWidthFunc const get_pwm_pulse_width_func)
 ```
 
 This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager) belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. 
@@ -163,10 +163,10 @@ This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and a
 * `get_pwm_pulse_width_func` Function pointer which is called during a read-access on the variable node representing the PWM output's pulse width.
 <hr />
 
-### `add_led_output` <a id="classopcua_1_1_analog_expansion_1a748779b79841cfa4329e318450be9be9" class="anchor"></a>
+### `addLedOutput` <a id="classopcua_1_1_analog_expansion_1ad7b7fdcc0c27bdd2671a1b90be26d38c" class="anchor"></a>
 
 ```cpp
-void add_led_output(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
+void addLedOutput(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
 ```
 
 This function creates a new opcua::LED and adds it to the opcua::LEDManager belonging to the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. 
@@ -222,9 +222,9 @@ This class creates an OPC UA object node which is representing an Arduino [Opta]
 --------------------------------|---------------------------------------------
 | [`DigitalExpansion`](#classopcua_1_1_digital_expansion_1a83aace406ca80bde86e563dcf4ea12fe) | Constructor of the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
 | [`~DigitalExpansion`](#classopcua_1_1_digital_expansion_1ab446f1129440aa88fe7d3fd133fc8bb1) | Destructor of the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class. |
-| [`add_analog_input`](#classopcua_1_1_digital_expansion_1a12d63f7fe7baa14af8f27cd8f45c7e23) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
-| [`add_digital_input`](#classopcua_1_1_digital_expansion_1a534310d78a1ce1a46ec7e92c064a61a0) | This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
-| [`add_relay_output`](#classopcua_1_1_digital_expansion_1a1ec45c5da3b0d3427a63a9cd30f775d0) | This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
+| [`addAnalogInput`](#classopcua_1_1_digital_expansion_1a501296ef972bfe1a802af37ecdae0cc3) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
+| [`addDigitalInput`](#classopcua_1_1_digital_expansion_1a652a659e22a40ebf9bc371efc8b97475) | This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
+| [`addRelayOutput`](#classopcua_1_1_digital_expansion_1a05f43725e0d6b0f3b613e44cd340bd7d) | This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.  |
 | [`SharedPtr`](#classopcua_1_1_digital_expansion_1a808388135d0335260aed3725a4ca8eb9) | SharedPtr is std::shared_ptr of an [DigitalExpansion](#classopcua_1_1_digital_expansion) class. |
 
 ## Members
@@ -257,10 +257,10 @@ virtual ~DigitalExpansion() = default
 Destructor of the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class.
 <hr />
 
-### `add_analog_input` <a id="classopcua_1_1_digital_expansion_1a12d63f7fe7baa14af8f27cd8f45c7e23" class="anchor"></a>
+### `addAnalogInput` <a id="classopcua_1_1_digital_expansion_1a501296ef972bfe1a802af37ecdae0cc3" class="anchor"></a>
 
 ```cpp
-void add_analog_input(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
+void addAnalogInput(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
 ```
 
 This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class. 
@@ -272,10 +272,10 @@ This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) a
 * `on_read_request` Function pointer which is called during a read-access on the variable node representing the analog input.
 <hr />
 
-### `add_digital_input` <a id="classopcua_1_1_digital_expansion_1a534310d78a1ce1a46ec7e92c064a61a0" class="anchor"></a>
+### `addDigitalInput` <a id="classopcua_1_1_digital_expansion_1a652a659e22a40ebf9bc371efc8b97475" class="anchor"></a>
 
 ```cpp
-void add_digital_input(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
+void addDigitalInput(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
 ```
 
 This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class. 
@@ -287,10 +287,10 @@ This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input)
 * `on_read_request` Function pointer which is called during a read-access on the variable node representing the digital input.
 <hr />
 
-### `add_relay_output` <a id="classopcua_1_1_digital_expansion_1a1ec45c5da3b0d3427a63a9cd30f775d0" class="anchor"></a>
+### `addRelayOutput` <a id="classopcua_1_1_digital_expansion_1a05f43725e0d6b0f3b613e44cd340bd7d" class="anchor"></a>
 
 ```cpp
-void add_relay_output(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
+void addRelayOutput(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
 ```
 
 This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager) belonging to the [opcua::DigitalExpansion](#classopcua_1_1_digital_expansion) class. 
@@ -641,7 +641,7 @@ This class creates an OPC UA object node which is representing all analog inputs
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`AnalogInputManager`](#classopcua_1_1_analog_input_manager_1a4acded183249c128a0577d592434667a) | Constructor of the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) class. Note: Objects should not be instantiated directly, but by using [AnalogInputManager::create](#classopcua_1_1_analog_input_manager_1a68d99b738809b67b102ce91fbfbfaf4c).  |
-| [`add_analog_input`](#classopcua_1_1_analog_input_manager_1adf465923265cb510b716854460a3439d) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager).  |
+| [`addAnalogInput`](#classopcua_1_1_analog_input_manager_1a988569b7fbfc49f7288e044e60e19d41) | This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager).  |
 | [`SharedPtr`](#classopcua_1_1_analog_input_manager_1aaf63f82d26fae9a89478d568acdbd390) | SharedPtr is std::shared_ptr of an [AnalogInputManager](#classopcua_1_1_analog_input_manager) class. |
 | [`create`](#classopcua_1_1_analog_input_manager_1a68d99b738809b67b102ce91fbfbfaf4c) | Creates a new instance of the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -658,10 +658,10 @@ Constructor of the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_mana
 * `node_id` OPC UA node id of the object node representing all analog inputs.
 <hr />
 
-### `add_analog_input` <a id="classopcua_1_1_analog_input_manager_1adf465923265cb510b716854460a3439d" class="anchor"></a>
+### `addAnalogInput` <a id="classopcua_1_1_analog_input_manager_1a988569b7fbfc49f7288e044e60e19d41" class="anchor"></a>
 
 ```cpp
-void add_analog_input(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
+void addAnalogInput(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
 ```
 
 This function creates a new [opcua::AnalogInput](#classopcua_1_1_analog_input) and adds it to the [opcua::AnalogInputManager](#classopcua_1_1_analog_input_manager). 
@@ -821,7 +821,7 @@ This class creates an OPC UA object node which is representing all analog output
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`AnalogOutputManager`](#classopcua_1_1_analog_output_manager_1af41a1bda2ad81560a6e9d4c005df0cff) | Constructor of the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager) class. Note: Objects should not be instantiated directly, but by using [AnalogOutputManager::create](#classopcua_1_1_analog_output_manager_1ae70361c7213c9ddb274b607eb0dda289).  |
-| [`add_analog_output`](#classopcua_1_1_analog_output_manager_1af1cf7248e9a02c420d3d8deb8d21ffe8) | This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager).  |
+| [`addAnalogOutput`](#classopcua_1_1_analog_output_manager_1a4b2c54ec74b7ebacad77119df4850ec9) | This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager).  |
 | [`SharedPtr`](#classopcua_1_1_analog_output_manager_1a019101cbb84c3458e510153db559be63) | SharedPtr is std::shared_ptr of an [AnalogOutputManager](#classopcua_1_1_analog_output_manager) class. |
 | [`create`](#classopcua_1_1_analog_output_manager_1ae70361c7213c9ddb274b607eb0dda289) | Creates a new instance of the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -838,10 +838,10 @@ Constructor of the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_ma
 * `node_id` OPC UA node id of the object node representing all analog outputs.
 <hr />
 
-### `add_analog_output` <a id="classopcua_1_1_analog_output_manager_1af1cf7248e9a02c420d3d8deb8d21ffe8" class="anchor"></a>
+### `addAnalogOutput` <a id="classopcua_1_1_analog_output_manager_1a4b2c54ec74b7ebacad77119df4850ec9" class="anchor"></a>
 
 ```cpp
-void add_analog_output(UA_Server * server, const char * display_name, AnalogOutput::OnReadRequestFunc const on_read_request, AnalogOutput::OnWriteRequestFunc const on_write_request)
+void addAnalogOutput(UA_Server * server, const char * display_name, AnalogOutput::OnReadRequestFunc const on_read_request, AnalogOutput::OnWriteRequestFunc const on_write_request)
 ```
 
 This function creates a new [opcua::AnalogOutput](#classopcua_1_1_analog_output) and adds it to the [opcua::AnalogOutputManager](#classopcua_1_1_analog_output_manager). 
@@ -1039,7 +1039,7 @@ This class creates an OPC UA object node which is representing all digital input
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`DigitalInputManager`](#classopcua_1_1_digital_input_manager_1aa1a41ef9de849beb644a197c5d69c25e) | Constructor of the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager) class. Note: Objects should not be instantiated directly, but by using [DigitalInputManager::create](#classopcua_1_1_digital_input_manager_1aa4f8ec8ba017a9c51d5e8ce14f0d5775).  |
-| [`add_digital_input`](#classopcua_1_1_digital_input_manager_1afeae9bf1f9875db96a239a33e177928f) | This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager).  |
+| [`addDigitalInput`](#classopcua_1_1_digital_input_manager_1a75a40530489221d19a84ea88f63ae674) | This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager).  |
 | [`SharedPtr`](#classopcua_1_1_digital_input_manager_1a65c34fbf328ac93e94931922547e2bbf) | SharedPtr is std::shared_ptr of an [DigitalInputManager](#classopcua_1_1_digital_input_manager) class. |
 | [`create`](#classopcua_1_1_digital_input_manager_1aa4f8ec8ba017a9c51d5e8ce14f0d5775) | Creates a new instance of the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -1056,10 +1056,10 @@ Constructor of the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_ma
 * `node_id` OPC UA node id of the object node representing all digital inputs.
 <hr />
 
-### `add_digital_input` <a id="classopcua_1_1_digital_input_manager_1afeae9bf1f9875db96a239a33e177928f" class="anchor"></a>
+### `addDigitalInput` <a id="classopcua_1_1_digital_input_manager_1a75a40530489221d19a84ea88f63ae674" class="anchor"></a>
 
 ```cpp
-void add_digital_input(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
+void addDigitalInput(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
 ```
 
 This function creates a new [opcua::DigitalInput](#classopcua_1_1_digital_input) and adds it to the [opcua::DigitalInputManager](#classopcua_1_1_digital_input_manager). 
@@ -1191,7 +1191,7 @@ This class creates an OPC UA object node which is representing all LEDs of a giv
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`LedManager`](#classopcua_1_1_led_manager_1a1388f892d85f566acacca95b10b4c62a) | Constructor of the [opcua::LedManager](#classopcua_1_1_led_manager) class. Note: Objects should not be instantiated directly, but by using [LedManager::create](#classopcua_1_1_led_manager_1a34dfb842af941ecc7505050808885e0f).  |
-| [`add_led_output`](#classopcua_1_1_led_manager_1ab8b5aaba9ad51d96e4e6d4167973ce9f) | This function creates a new opcua::LED and adds it to the opcua::LEDManager.  |
+| [`addLedOutput`](#classopcua_1_1_led_manager_1a70587aeb79078f2039790d595974bb3d) | This function creates a new opcua::LED and adds it to the opcua::LEDManager.  |
 | [`SharedPtr`](#classopcua_1_1_led_manager_1add9494665b55716dcdb70b9ce1e0e1e2) | SharedPtr is std::shared_ptr of an [LedManager](#classopcua_1_1_led_manager) class. |
 | [`create`](#classopcua_1_1_led_manager_1a34dfb842af941ecc7505050808885e0f) | Creates a new instance of the [opcua::LedManager](#classopcua_1_1_led_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -1208,10 +1208,10 @@ Constructor of the [opcua::LedManager](#classopcua_1_1_led_manager) class. Note:
 * `node_id` OPC UA node id of the object node representing all LEDs.
 <hr />
 
-### `add_led_output` <a id="classopcua_1_1_led_manager_1ab8b5aaba9ad51d96e4e6d4167973ce9f" class="anchor"></a>
+### `addLedOutput` <a id="classopcua_1_1_led_manager_1a70587aeb79078f2039790d595974bb3d" class="anchor"></a>
 
 ```cpp
-void add_led_output(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
+void addLedOutput(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
 ```
 
 This function creates a new opcua::LED and adds it to the opcua::LEDManager. 
@@ -1417,7 +1417,7 @@ This class creates an OPC UA object node which is representing all PWM outputs o
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`PwmOutputManager`](#classopcua_1_1_pwm_output_manager_1ae682f02d81ae9cdd8234e670e5140380) | Constructor of the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager) class. Note: Objects should not be instantiated directly, but by using [PwmOutputManager::create](#classopcua_1_1_pwm_output_manager_1a032bb88f9e5a54a6d68adc37a685374c).  |
-| [`add_pwm_output`](#classopcua_1_1_pwm_output_manager_1aaad206b4639e87595bf60f9154a9e0a4) | This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager).  |
+| [`addPwmOutput`](#classopcua_1_1_pwm_output_manager_1a58a16587c5ea5b35d183031483d78009) | This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager).  |
 | [`SharedPtr`](#classopcua_1_1_pwm_output_manager_1ae595b9016fec91f1e5caa1a74df4bcd5) | SharedPtr is std::shared_ptr of an [PwmOutputManager](#classopcua_1_1_pwm_output_manager) class. |
 | [`create`](#classopcua_1_1_pwm_output_manager_1a032bb88f9e5a54a6d68adc37a685374c) | Creates a new instance of the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -1434,10 +1434,10 @@ Constructor of the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager)
 * `node_id` OPC UA node id of the object node representing all PWM outputs.
 <hr />
 
-### `add_pwm_output` <a id="classopcua_1_1_pwm_output_manager_1aaad206b4639e87595bf60f9154a9e0a4" class="anchor"></a>
+### `addPwmOutput` <a id="classopcua_1_1_pwm_output_manager_1a58a16587c5ea5b35d183031483d78009" class="anchor"></a>
 
 ```cpp
-void add_pwm_output(UA_Server * server, const char * display_name, PwmOutput::SetPwmFunc const set_pwm_func, PwmOutput::GetPwmPeriodFunc const get_pwm_period_func, PwmOutput::GetPwmPulseWidthFunc const get_pwm_pulse_width_func)
+void addPwmOutput(UA_Server * server, const char * display_name, PwmOutput::SetPwmFunc const set_pwm_func, PwmOutput::GetPwmPeriodFunc const get_pwm_period_func, PwmOutput::GetPwmPulseWidthFunc const get_pwm_pulse_width_func)
 ```
 
 This function creates a new [opcua::PwmOutput](#classopcua_1_1_pwm_output) and adds it to the [opcua::PwmOutputManager](#classopcua_1_1_pwm_output_manager). 
@@ -1573,7 +1573,7 @@ This class creates an OPC UA object node which is representing all relays of a g
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`RelayManager`](#classopcua_1_1_relay_manager_1a9d4e2106b768a1f1fa0afd4a5056b962) | Constructor of the [opcua::RelayManager](#classopcua_1_1_relay_manager) class. Note: Objects should not be instantiated directly, but by using [RelayManager::create](#classopcua_1_1_relay_manager_1ae292144fb50a7f4b05e05f2520e41c21).  |
-| [`add_relay_output`](#classopcua_1_1_relay_manager_1ae014ed047413e04ff3e72a924a2569d1) | This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager).  |
+| [`addRelayOutput`](#classopcua_1_1_relay_manager_1a6dcce2b16d8f7f95ce6033b01e578297) | This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager).  |
 | [`SharedPtr`](#classopcua_1_1_relay_manager_1a5ed69275e13c134f54d16ba27eabc34c) | SharedPtr is std::shared_ptr of an [RelayManager](#classopcua_1_1_relay_manager) class. |
 | [`create`](#classopcua_1_1_relay_manager_1ae292144fb50a7f4b05e05f2520e41c21) | Creates a new instance of the [opcua::RelayManager](#classopcua_1_1_relay_manager) class, creating an OPC UA object node abstraction in the process.  |
 
@@ -1590,10 +1590,10 @@ Constructor of the [opcua::RelayManager](#classopcua_1_1_relay_manager) class. N
 * `node_id` OPC UA node id of the object node representing all relays.
 <hr />
 
-### `add_relay_output` <a id="classopcua_1_1_relay_manager_1ae014ed047413e04ff3e72a924a2569d1" class="anchor"></a>
+### `addRelayOutput` <a id="classopcua_1_1_relay_manager_1a6dcce2b16d8f7f95ce6033b01e578297" class="anchor"></a>
 
 ```cpp
-void add_relay_output(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
+void addRelayOutput(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
 ```
 
 This function creates a new [opcua::Relay](#classopcua_1_1_relay) and adds it to the [opcua::RelayManager](#classopcua_1_1_relay_manager). 
@@ -1641,10 +1641,10 @@ This class allows the user to expose analog and digital inputs, as well as relay
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`Opta`](#classopcua_1_1_opta_1a283e8bca4e4044cce2e85d86bb95cd55) | Constructor of the [opcua::Opta](#classopcua_1_1_opta) class.  |
-| [`add_analog_input`](#classopcua_1_1_opta_1aaf38cbd09a99553fe731aac437ecd299) | Adds an analog input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
-| [`add_digital_input`](#classopcua_1_1_opta_1a6749313fcf2a31e00c0777eb03904767) | Adds a digital input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
-| [`add_relay_output`](#classopcua_1_1_opta_1ae015db2b74d47771632648d97508bc9c) | Adds a relay output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
-| [`add_led_output`](#classopcua_1_1_opta_1a0ca04bd872b6c67fc8e0a01ec7b60773) | Adds a LED output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
+| [`addAnalogInput`](#classopcua_1_1_opta_1ae315b43f05cb1e93bf93f5c8372b2d9b) | Adds an analog input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
+| [`addDigitalInput`](#classopcua_1_1_opta_1a423a610eaf81a7a216471b74494b8b6a) | Adds a digital input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
+| [`addRelayOutput`](#classopcua_1_1_opta_1aa291d0f49cd9ecdedd21ae589fa7b3ce) | Adds a relay output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
+| [`addLedOutput`](#classopcua_1_1_opta_1ad02dbe76b766e9e3cc037acd40659c19) | Adds a LED output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node.  |
 | [`SharedPtr`](#classopcua_1_1_opta_1a75b2e05ac5b273859709490686dfa165) | SharedPtr is std::shared_ptr of an [Opta](#classopcua_1_1_opta) class. |
 | [`create`](#classopcua_1_1_opta_1a01f8da6cd187c6237c903dc6d004828a) | Creates a new instance of the [opcua::Opta](#classopcua_1_1_opta) class, creating an OPC UA object abstraction in the process.  |
 
@@ -1665,10 +1665,10 @@ Constructor of the [opcua::Opta](#classopcua_1_1_opta) class.
 * `opta_type` Enumerated type describing which [Opta](#classopcua_1_1_opta) (WiFi, RS485, Lite) variant is being created.
 <hr />
 
-### `add_analog_input` <a id="classopcua_1_1_opta_1aaf38cbd09a99553fe731aac437ecd299" class="anchor"></a>
+### `addAnalogInput` <a id="classopcua_1_1_opta_1ae315b43f05cb1e93bf93f5c8372b2d9b" class="anchor"></a>
 
 ```cpp
-void add_analog_input(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
+void addAnalogInput(UA_Server * server, const char * display_name, AnalogInput::OnReadRequestFunc const on_read_request)
 ```
 
 Adds an analog input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node. 
@@ -1680,10 +1680,10 @@ Adds an analog input to the [opcua::Opta](#classopcua_1_1_opta) object node and
 * `on_read_request` Function pointer which is called during a read-access on the variable node representing the analog input.
 <hr />
 
-### `add_digital_input` <a id="classopcua_1_1_opta_1a6749313fcf2a31e00c0777eb03904767" class="anchor"></a>
+### `addDigitalInput` <a id="classopcua_1_1_opta_1a423a610eaf81a7a216471b74494b8b6a" class="anchor"></a>
 
 ```cpp
-void add_digital_input(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
+void addDigitalInput(UA_Server * server, const char * display_name, DigitalInput::OnReadRequestFunc const on_read_request)
 ```
 
 Adds a digital input to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node. 
@@ -1695,10 +1695,10 @@ Adds a digital input to the [opcua::Opta](#classopcua_1_1_opta) object node and
 * `on_read_request` Function pointer which is called during a read-access on the variable node representing the digital input.
 <hr />
 
-### `add_relay_output` <a id="classopcua_1_1_opta_1ae015db2b74d47771632648d97508bc9c" class="anchor"></a>
+### `addRelayOutput` <a id="classopcua_1_1_opta_1aa291d0f49cd9ecdedd21ae589fa7b3ce" class="anchor"></a>
 
 ```cpp
-void add_relay_output(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
+void addRelayOutput(UA_Server * server, const char * display_name, Relay::OnSetRelayStateFunc const on_set_relay_state)
 ```
 
 Adds a relay output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node. 
@@ -1710,10 +1710,10 @@ Adds a relay output to the [opcua::Opta](#classopcua_1_1_opta) object node and e
 * `on_set_relay_state` Function pointer which is called during a write-access on the variable node representing the relay output.
 <hr />
 
-### `add_led_output` <a id="classopcua_1_1_opta_1a0ca04bd872b6c67fc8e0a01ec7b60773" class="anchor"></a>
+### `addLedOutput` <a id="classopcua_1_1_opta_1ad02dbe76b766e9e3cc037acd40659c19" class="anchor"></a>
 
 ```cpp
-void add_led_output(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
+void addLedOutput(UA_Server * server, const char * display_name, Led::OnSetLedStateFunc const on_set_led_state)
 ```
 
 Adds a LED output to the [opcua::Opta](#classopcua_1_1_opta) object node and exposes it as an OPC UA variable node. 
@@ -1761,9 +1761,9 @@ This class allows the user to create OPC UA representations of digital (mechanic
  Members                        | Descriptions                                
 --------------------------------|---------------------------------------------
 | [`OptaExpansionManager`](#classopcua_1_1_opta_expansion_manager_1a50f8f17012161470f0c80efa83f8aba8) | Constructor of the [opcua::OptaExpansionManager](#classopcua_1_1_opta_expansion_manager) class.  |
-| [`create_digital_mechanical_expansion`](#classopcua_1_1_opta_expansion_manager_1a4ccb3789aab33df7df7d92a1a741bd84) | Creates a new instance of the [opcua::DigitalMechExpansion](#classopcua_1_1_digital_mech_expansion) (digital expansion with mechanical relays) class.  |
-| [`create_digital_solid_state_expansion`](#classopcua_1_1_opta_expansion_manager_1adf13057818a23b761898b7f263f7811b) | Creates a new instance of the [opcua::DigitalStSolidExpansion](#classopcua_1_1_digital_st_solid_expansion) (digital expansion with solid-state relays) class.  |
-| [`create_analog_expansion`](#classopcua_1_1_opta_expansion_manager_1ab7d5c5d2d1a35f97be82ae45ce36dafd) | Creates a new instance of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
+| [`createDigitalMechanicalExpansion`](#classopcua_1_1_opta_expansion_manager_1a9a67371ac51ab2b1d13850576345096f) | Creates a new instance of the [opcua::DigitalMechExpansion](#classopcua_1_1_digital_mech_expansion) (digital expansion with mechanical relays) class.  |
+| [`createDigitalSolidStateExpansion`](#classopcua_1_1_opta_expansion_manager_1ab13e39fc5dbfe377d1a8c7a0f4dc2169) | Creates a new instance of the [opcua::DigitalStSolidExpansion](#classopcua_1_1_digital_st_solid_expansion) (digital expansion with solid-state relays) class.  |
+| [`createAnalogExpansion`](#classopcua_1_1_opta_expansion_manager_1a25cb57fd1d37dc0c08f89a9eb5a70b14) | Creates a new instance of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class.  |
 | [`SharedPtr`](#classopcua_1_1_opta_expansion_manager_1abd9459852a863117520d564b018779dd) | SharedPtr is std::shared_ptr of an [OptaExpansionManager](#classopcua_1_1_opta_expansion_manager) class. |
 | [`create`](#classopcua_1_1_opta_expansion_manager_1a1fe5f600c6a428877e5c3fc2529a1db6) | Creates a new instance of the [opcua::OptaExpansionManager](#classopcua_1_1_opta_expansion_manager) class.  |
 
@@ -1780,10 +1780,10 @@ Constructor of the [opcua::OptaExpansionManager](#classopcua_1_1_opta_expansion_
 * `server` Pointer to the OPC UA server implementation of the open62541 library.
 <hr />
 
-### `create_digital_mechanical_expansion` <a id="classopcua_1_1_opta_expansion_manager_1a4ccb3789aab33df7df7d92a1a741bd84" class="anchor"></a>
+### `createDigitalMechanicalExpansion` <a id="classopcua_1_1_opta_expansion_manager_1a9a67371ac51ab2b1d13850576345096f" class="anchor"></a>
 
 ```cpp
-DigitalMechExpansion::SharedPtr create_digital_mechanical_expansion(uint8_t const exp_num)
+DigitalMechExpansion::SharedPtr createDigitalMechanicalExpansion(uint8_t const exp_num)
 ```
 
 Creates a new instance of the [opcua::DigitalMechExpansion](#classopcua_1_1_digital_mech_expansion) (digital expansion with mechanical relays) class. 
@@ -1794,10 +1794,10 @@ Creates a new instance of the [opcua::DigitalMechExpansion](#classopcua_1_1_digi
 std::shared_ptr holding the newly allocated instance of [opcua::DigitalMechExpansion](#classopcua_1_1_digital_mech_expansion).
 <hr />
 
-### `create_digital_solid_state_expansion` <a id="classopcua_1_1_opta_expansion_manager_1adf13057818a23b761898b7f263f7811b" class="anchor"></a>
+### `createDigitalSolidStateExpansion` <a id="classopcua_1_1_opta_expansion_manager_1ab13e39fc5dbfe377d1a8c7a0f4dc2169" class="anchor"></a>
 
 ```cpp
-DigitalStSolidExpansion::SharedPtr create_digital_solid_state_expansion(uint8_t const exp_num)
+DigitalStSolidExpansion::SharedPtr createDigitalSolidStateExpansion(uint8_t const exp_num)
 ```
 
 Creates a new instance of the [opcua::DigitalStSolidExpansion](#classopcua_1_1_digital_st_solid_expansion) (digital expansion with solid-state relays) class. 
@@ -1808,10 +1808,10 @@ Creates a new instance of the [opcua::DigitalStSolidExpansion](#classopcua_1_1_d
 std::shared_ptr holding the newly allocated instance of [opcua::DigitalStSolidExpansion](#classopcua_1_1_digital_st_solid_expansion).
 <hr />
 
-### `create_analog_expansion` <a id="classopcua_1_1_opta_expansion_manager_1ab7d5c5d2d1a35f97be82ae45ce36dafd" class="anchor"></a>
+### `createAnalogExpansion` <a id="classopcua_1_1_opta_expansion_manager_1a25cb57fd1d37dc0c08f89a9eb5a70b14" class="anchor"></a>
 
 ```cpp
-AnalogExpansion::SharedPtr create_analog_expansion(uint8_t const exp_num)
+AnalogExpansion::SharedPtr createAnalogExpansion(uint8_t const exp_num)
 ```
 
 Creates a new instance of the [opcua::AnalogExpansion](#classopcua_1_1_analog_expansion) class. 
@@ -1858,7 +1858,7 @@ This class allows the user to determine the concrete [Opta](#classopcua_1_1_opta
 | [`OptaVariant`](#classopcua_1_1_opta_variant_1acaaa63b7b37af5fab4f3df0080669d76) | The constructor of [OptaVariant](#classopcua_1_1_opta_variant) is deleted because this object shall not be instantiated. |
 | [`OptaVariant`](#classopcua_1_1_opta_variant_1a82a5e186512309818c5a4922e18097b6) | The copy constructor of [OptaVariant](#classopcua_1_1_opta_variant) is deleted because this object shall not be copied. |
 | [`Type`](#classopcua_1_1_opta_variant_1abd647955f6c174916e3c0e25ed240ea8) | Type is an enumeration type to describe the various different Arduino [Opta](#classopcua_1_1_opta) variants. |
-| [`get_opta_variant`](#classopcua_1_1_opta_variant_1a0b7ae42903e8beabeaf6962db7504d35) | Determines the current [Opta](#classopcua_1_1_opta) variant by reading information provided by the bootloader.  |
+| [`getOptaVariant`](#classopcua_1_1_opta_variant_1ae3b4401cb74c9cc418b9a225cd611afd) | Determines the current [Opta](#classopcua_1_1_opta) variant by reading information provided by the bootloader.  |
 | [`toString`](#classopcua_1_1_opta_variant_1aa2b41d503d530c8f135f420b54d94068) | Convert enumerated variant type to variant product name.  |
 | [`toSKUString`](#classopcua_1_1_opta_variant_1aba13996161689f6feb65753daa4e796e) | Convert enumerated variant type to variant product SKU number.  |
 
@@ -1897,10 +1897,10 @@ WiFi            | Arduino [Opta](#classopcua_1_1_opta) WiFi
 Type is an enumeration type to describe the various different Arduino [Opta](#classopcua_1_1_opta) variants.
 <hr />
 
-### `get_opta_variant` <a id="classopcua_1_1_opta_variant_1a0b7ae42903e8beabeaf6962db7504d35" class="anchor"></a>
+### `getOptaVariant` <a id="classopcua_1_1_opta_variant_1ae3b4401cb74c9cc418b9a225cd611afd" class="anchor"></a>
 
 ```cpp
-static bool get_opta_variant( Type & type)
+static bool getOptaVariant( Type & type)
 ```
 
 Determines the current [Opta](#classopcua_1_1_opta) variant by reading information provided by the bootloader. 
diff --git a/examples/opta_opcua_server/opta_opcua_server.ino b/examples/opta_opcua_server/opta_opcua_server.ino
index 451a466..0185e54 100644
--- a/examples/opta_opcua_server/opta_opcua_server.ino
+++ b/examples/opta_opcua_server/opta_opcua_server.ino
@@ -135,7 +135,7 @@ void setup()
   if (epoch > 0) {
     set_time(epoch); /* Directly set RTC of Arduino Opta. */
   } else {
-    set_time(opcua::cvt_time(__DATE__)); /* Configure Arduino Opta with time at compile time as last time of defense. */
+    set_time(opcua::timeToStr(__DATE__)); /* Configure Arduino Opta with time at compile time as last time of defense. */
   }
 
   /* Initialize Opta Expansion module controller. */
@@ -165,8 +165,8 @@ void setup()
 
       /* Determine the Arduino OPC UA hardware variant. */
       opcua::OptaVariant::Type opta_type;
-      if (!opcua::OptaVariant::get_opta_variant(opta_type)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "opcua::OptaVariant::get_opta_variant(...) failed");
+      if (!opcua::OptaVariant::getOptaVariant(opta_type)) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "opcua::OptaVariant::getOptaVariant(...) failed");
         return;
       }
       UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Arduino Opta Variant: %s", opcua::OptaVariant::toString(opta_type).c_str());
@@ -186,34 +186,34 @@ void setup()
       }
 
       /* Add the various digital input pins. */
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I1", []() { return arduino_opta_analog_read(A0); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I2", []() { return arduino_opta_analog_read(A1); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I3", []() { return arduino_opta_analog_read(A2); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I4", []() { return arduino_opta_analog_read(A3); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I5", []() { return arduino_opta_analog_read(A4); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I6", []() { return arduino_opta_analog_read(A5); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I7", []() { return arduino_opta_analog_read(A6); });
-      opta_opcua->add_analog_input(opc_ua_server, "Analog Input I8", []() { return arduino_opta_analog_read(A7); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I1", []() { return arduino_opta_analog_read(A0); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I2", []() { return arduino_opta_analog_read(A1); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I3", []() { return arduino_opta_analog_read(A2); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I4", []() { return arduino_opta_analog_read(A3); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I5", []() { return arduino_opta_analog_read(A4); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I6", []() { return arduino_opta_analog_read(A5); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I7", []() { return arduino_opta_analog_read(A6); });
+      opta_opcua->addAnalogInput(opc_ua_server, "Analog Input I8", []() { return arduino_opta_analog_read(A7); });
 
       /* Add the various digital input pins. */
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I1", []() { return arduino_opta_digital_read(A0); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I2", []() { return arduino_opta_digital_read(A1); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I3", []() { return arduino_opta_digital_read(A2); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I4", []() { return arduino_opta_digital_read(A3); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I5", []() { return arduino_opta_digital_read(A4); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I6", []() { return arduino_opta_digital_read(A5); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I7", []() { return arduino_opta_digital_read(A6); });
-      opta_opcua->add_digital_input(opc_ua_server, "Digital Input I8", []() { return arduino_opta_digital_read(A7); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I1", []() { return arduino_opta_digital_read(A0); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I2", []() { return arduino_opta_digital_read(A1); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I3", []() { return arduino_opta_digital_read(A2); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I4", []() { return arduino_opta_digital_read(A3); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I5", []() { return arduino_opta_digital_read(A4); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I6", []() { return arduino_opta_digital_read(A5); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I7", []() { return arduino_opta_digital_read(A6); });
+      opta_opcua->addDigitalInput(opc_ua_server, "Digital Input I8", []() { return arduino_opta_digital_read(A7); });
 
       /* Add the various relay outputs. */
-      opta_opcua->add_relay_output(opc_ua_server, "Relay 1", [](bool const value) { pinMode(RELAY1, OUTPUT); digitalWrite(RELAY1, value); pinMode(LED_D0, OUTPUT); digitalWrite(LED_D0, value); });
-      opta_opcua->add_relay_output(opc_ua_server, "Relay 2", [](bool const value) { pinMode(RELAY2, OUTPUT); digitalWrite(RELAY2, value); pinMode(LED_D1, OUTPUT); digitalWrite(LED_D1, value);});
-      opta_opcua->add_relay_output(opc_ua_server, "Relay 3", [](bool const value) { pinMode(RELAY3, OUTPUT); digitalWrite(RELAY3, value); pinMode(LED_D2, OUTPUT); digitalWrite(LED_D2, value);});
-      opta_opcua->add_relay_output(opc_ua_server, "Relay 4", [](bool const value) { pinMode(RELAY4, OUTPUT); digitalWrite(RELAY4, value); pinMode(LED_D3, OUTPUT); digitalWrite(LED_D3, value);});
+      opta_opcua->addRelayOutput(opc_ua_server, "Relay 1", [](bool const value) { pinMode(RELAY1, OUTPUT); digitalWrite(RELAY1, value); pinMode(LED_D0, OUTPUT); digitalWrite(LED_D0, value); });
+      opta_opcua->addRelayOutput(opc_ua_server, "Relay 2", [](bool const value) { pinMode(RELAY2, OUTPUT); digitalWrite(RELAY2, value); pinMode(LED_D1, OUTPUT); digitalWrite(LED_D1, value);});
+      opta_opcua->addRelayOutput(opc_ua_server, "Relay 3", [](bool const value) { pinMode(RELAY3, OUTPUT); digitalWrite(RELAY3, value); pinMode(LED_D2, OUTPUT); digitalWrite(LED_D2, value);});
+      opta_opcua->addRelayOutput(opc_ua_server, "Relay 4", [](bool const value) { pinMode(RELAY4, OUTPUT); digitalWrite(RELAY4, value); pinMode(LED_D3, OUTPUT); digitalWrite(LED_D3, value);});
 
       /* Add the various LED outputs. */
       if (opta_type == opcua::OptaVariant::Type::WiFi) {
-        opta_opcua->add_led_output(opc_ua_server, "User LED", [](bool const value) { pinMode(LEDB, OUTPUT); digitalWrite(LEDB, value); });
+        opta_opcua->addLedOutput(opc_ua_server, "User LED", [](bool const value) { pinMode(LEDB, OUTPUT); digitalWrite(LEDB, value); });
       }
 
       /* Check availability of expansion modules. */
@@ -251,16 +251,16 @@ void setup()
         {
           opcua::DigitalExpansion::SharedPtr exp_dig = nullptr;
           if (exp_type == EXPANSION_OPTA_DIGITAL_MEC)
-            exp_dig = opta_expansion_manager_opcua->create_digital_mechanical_expansion(i);
+            exp_dig = opta_expansion_manager_opcua->createDigitalMechanicalExpansion(i);
           else
-            exp_dig = opta_expansion_manager_opcua->create_digital_solid_state_expansion(i);
+            exp_dig = opta_expansion_manager_opcua->createDigitalSolidStateExpansion(i);
 
           /* Expose digital/analog pins via OPC UA. */
           for (uint8_t d = 0; d < OPTA_DIGITAL_IN_NUM; d++)
           {
             char analog_in_name[32] = {0};
             snprintf(analog_in_name, sizeof(analog_in_name), "Analog Input I%d", d + 1);
-            exp_dig->add_analog_input(
+            exp_dig->addAnalogInput(
               opc_ua_server,
               analog_in_name,
               [i, d]()
@@ -270,7 +270,7 @@ void setup()
 
             char digital_in_name[32] = {0};
             snprintf(digital_in_name, sizeof(digital_in_name), "Digital Input I%d", d + 1);
-            exp_dig->add_digital_input(
+            exp_dig->addDigitalInput(
               opc_ua_server,
               digital_in_name,
               [i, d]()
@@ -284,7 +284,7 @@ void setup()
           {
             char mech_relay_name[32] = {0};
             snprintf(mech_relay_name, sizeof(mech_relay_name), "Relay %d", r + 1);
-            exp_dig->add_relay_output(
+            exp_dig->addRelayOutput(
               opc_ua_server,
               mech_relay_name,
               [i, r](bool const value)
@@ -295,7 +295,7 @@ void setup()
         }
         else if (exp_type == EXPANSION_OPTA_ANALOG)
         {
-          auto const exp_analog = opta_expansion_manager_opcua->create_analog_expansion(i);
+          auto const exp_analog = opta_expansion_manager_opcua->createAnalogExpansion(i);
 
           std::list<int> ANALOG_EXPANSION_MODULE_ANALOG_INPUT_LIST = {OA_CH_0, OA_CH_1, OA_CH_2, OA_CH_3, OA_CH_5, OA_CH_6};
 
@@ -315,7 +315,7 @@ void setup()
             /* Expose analog inputs as readable OPC UA properties. */
             char analog_in_name[32] = {0};
             snprintf(analog_in_name, sizeof(analog_in_name), "Analog Input I%d", input_num);
-            exp_analog->add_analog_input(
+            exp_analog->addAnalogInput(
               opc_ua_server,
               analog_in_name,
               [i, a]()
@@ -342,7 +342,7 @@ void setup()
             /* Expose analog inputs as readable OPC UA properties. */
             char analog_out_name[32] = {0};
             snprintf(analog_out_name, sizeof(analog_out_name), "Analog Output O%d", output_num);
-            exp_analog->add_analog_output(
+            exp_analog->addAnalogOutput(
               opc_ua_server,
               analog_out_name,
               [i, a]()
@@ -362,7 +362,7 @@ void setup()
           {
             char pwm_out_name[32] = {0};
             snprintf(pwm_out_name, sizeof(pwm_out_name), "PWM%d", pwm_output_num);
-            exp_analog->add_pwm_output(
+            exp_analog->addPwmOutput(
               opc_ua_server,
               pwm_out_name,
               [i, p](uint32_t const pwm_period_us, uint32_t const pwm_pulse_width_us)
@@ -385,7 +385,7 @@ void setup()
           {
             char led_name[32] = {0};
             snprintf(led_name, sizeof(led_name), "LED%d", l + 1);
-            exp_analog->add_led_output(
+            exp_analog->addLedOutput(
               opc_ua_server,
               led_name,
               [i, l](bool const value)
diff --git a/keywords.txt b/keywords.txt
index 51e6812..7c3abb3 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -47,25 +47,25 @@ NTPUtils	KEYWORD1
 
 create	KEYWORD2
 
-create_digital_mechanical_expansion	KEYWORD2
-create_digital_solid_state_expansion	KEYWORD2
-create_analog_expansion	KEYWORD2
-
-add_analog_input	KEYWORD2
-add_analog_output	KEYWORD2
-add_digital_input	KEYWORD2
-add_relay_output	KEYWORD2
-add_led_output	KEYWORD2
-add_pwm_output	KEYWORD2
-add_led_output	KEYWORD2
-
-get_opta_variant	KEYWORD2
+createDigitalMechanicalExpansion	KEYWORD2
+createDigitalSolidStateExpansion	KEYWORD2
+createAnalogExpansion	KEYWORD2
+
+addAnalogInput	KEYWORD2
+addAnalogOutput	KEYWORD2
+addDigitalInput	KEYWORD2
+addRelayOutput	KEYWORD2
+addLedOutput	KEYWORD2
+addPwmOutput	KEYWORD2
+addLedOutput	KEYWORD2
+
+getOptaVariant	KEYWORD2
 toString	KEYWORD2
 toStr	KEYWORD2
 toSKUString	KEYWORD2
 
 getTime	KEYWORD2
-cvt_time	KEYWORD2
+timeToStr	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
diff --git a/src/Arduino_OPC_UA.h b/src/Arduino_OPC_UA.h
index 1d0f020..a0b1531 100644
--- a/src/Arduino_OPC_UA.h
+++ b/src/Arduino_OPC_UA.h
@@ -17,7 +17,7 @@
 
 #include "util/o1heap/o1heap.h"
 #include "util/o1heap/o1heap_wrapper.h"
-#include "util/time/cvt_time.h"
+#include "util/time/timeToStr.h"
 #include "util/time/NTPUtils.h"
 #include "util/toStr/ExpansionType.h"
 
diff --git a/src/Opta.cpp b/src/Opta.cpp
index 068c7d4..810460e 100644
--- a/src/Opta.cpp
+++ b/src/Opta.cpp
@@ -143,40 +143,40 @@ Opta::create(
 }
 
 void
-Opta::add_analog_input(
+Opta::addAnalogInput(
   UA_Server * server,
   const char * display_name,
   AnalogInput::OnReadRequestFunc const on_read_request)
 {
-  _analog_input_mgr->add_analog_input(server, display_name, on_read_request);
+  _analog_input_mgr->addAnalogInput(server, display_name, on_read_request);
 }
 
 void
-Opta::add_digital_input(
+Opta::addDigitalInput(
   UA_Server * server,
   const char * display_name,
   DigitalInput::OnReadRequestFunc const on_read_request)
 {
-  _digital_input_mgr->add_digital_input(server, display_name, on_read_request);
+  _digital_input_mgr->addDigitalInput(server, display_name, on_read_request);
 }
 
 void
-Opta::add_relay_output(
+Opta::addRelayOutput(
   UA_Server * server,
   const char * display_name,
   Relay::OnSetRelayStateFunc const on_set_relay_state)
 {
-  _relay_mgr->add_relay_output(server, display_name, on_set_relay_state);
+  _relay_mgr->addRelayOutput(server, display_name, on_set_relay_state);
 }
 
 void
-Opta::add_led_output(
+Opta::addLedOutput(
   UA_Server * server,
   const char * display_name,
   Led::OnSetLedStateFunc const on_set_led_state)
 {
   if (_led_mgr) /* Only available for Arduino Opta WiFi. */
-    _led_mgr->add_led_output(server, display_name, on_set_led_state);
+    _led_mgr->addLedOutput(server, display_name, on_set_led_state);
 }
 
 /**************************************************************************************
diff --git a/src/Opta.h b/src/Opta.h
index d842105..3ff6cf9 100644
--- a/src/Opta.h
+++ b/src/Opta.h
@@ -88,7 +88,7 @@ class Opta
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the analog input.
    */
   void
-  add_analog_input(
+  addAnalogInput(
     UA_Server * server,
     const char * display_name,
     AnalogInput::OnReadRequestFunc const on_read_request);
@@ -100,7 +100,7 @@ class Opta
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the digital input.
    */
   void
-  add_digital_input(
+  addDigitalInput(
     UA_Server * server,
     const char * display_name,
     DigitalInput::OnReadRequestFunc const on_read_request);
@@ -112,7 +112,7 @@ class Opta
    * @param on_set_relay_state Function pointer which is called during a write-access on the variable node representing the relay output.
    */
   void
-  add_relay_output(
+  addRelayOutput(
     UA_Server * server,
     const char * display_name,
     Relay::OnSetRelayStateFunc const on_set_relay_state);
@@ -124,7 +124,7 @@ class Opta
    * @param on_set_led_state Function pointer which is called during a write-access on the variable node representing the LED output.
    */
   void
-  add_led_output(
+  addLedOutput(
     UA_Server * server,
     const char * display_name,
     Led::OnSetLedStateFunc const on_set_led_state);
diff --git a/src/OptaExpansionManager.cpp b/src/OptaExpansionManager.cpp
index e78911b..41eee87 100644
--- a/src/OptaExpansionManager.cpp
+++ b/src/OptaExpansionManager.cpp
@@ -25,7 +25,7 @@ namespace opcua
  **************************************************************************************/
 
 DigitalMechExpansion::SharedPtr
-OptaExpansionManager::create_digital_mechanical_expansion(
+OptaExpansionManager::createDigitalMechanicalExpansion(
   uint8_t const exp_num)
 {
   auto const exp_mech_opcua = opcua::DigitalMechExpansion::create(
@@ -38,7 +38,7 @@ OptaExpansionManager::create_digital_mechanical_expansion(
 }
 
 DigitalStSolidExpansion::SharedPtr
-OptaExpansionManager::create_digital_solid_state_expansion(
+OptaExpansionManager::createDigitalSolidStateExpansion(
   uint8_t const exp_num)
 {
   auto const exp_solid_state_opcua = opcua::DigitalStSolidExpansion::create(
@@ -51,7 +51,7 @@ OptaExpansionManager::create_digital_solid_state_expansion(
 }
 
 AnalogExpansion::SharedPtr
-OptaExpansionManager::create_analog_expansion(
+OptaExpansionManager::createAnalogExpansion(
   uint8_t const exp_num)
 {
   auto const exp_analog_opcua = opcua::AnalogExpansion::create(
diff --git a/src/OptaExpansionManager.h b/src/OptaExpansionManager.h
index 2ef7b60..4ea2d55 100644
--- a/src/OptaExpansionManager.h
+++ b/src/OptaExpansionManager.h
@@ -76,7 +76,7 @@ class OptaExpansionManager
    * @return std::shared_ptr holding the newly allocated instance of opcua::DigitalMechExpansion.
    */
   DigitalMechExpansion::SharedPtr
-  create_digital_mechanical_expansion(
+  createDigitalMechanicalExpansion(
     uint8_t const exp_num);
 
   /**
@@ -85,7 +85,7 @@ class OptaExpansionManager
    * @return std::shared_ptr holding the newly allocated instance of opcua::DigitalStSolidExpansion.
    */
   DigitalStSolidExpansion::SharedPtr
-  create_digital_solid_state_expansion(
+  createDigitalSolidStateExpansion(
     uint8_t const exp_num);
 
   /**
@@ -94,7 +94,7 @@ class OptaExpansionManager
    * @return std::shared_ptr holding the newly allocated instance of opcua::AnalogExpansion.
    */
   AnalogExpansion::SharedPtr
-  create_analog_expansion(
+  createAnalogExpansion(
     uint8_t const exp_num);
 
 
diff --git a/src/OptaVariant.cpp b/src/OptaVariant.cpp
index 8c1b521..174b0ae 100644
--- a/src/OptaVariant.cpp
+++ b/src/OptaVariant.cpp
@@ -33,7 +33,7 @@ namespace opcua
  **************************************************************************************/
 
 bool
-OptaVariant::get_opta_variant(
+OptaVariant::getOptaVariant(
   Type & type)
 {
   OptaBoardInfo * info = boardInfo();
diff --git a/src/OptaVariant.h b/src/OptaVariant.h
index 04bde8e..d988f05 100644
--- a/src/OptaVariant.h
+++ b/src/OptaVariant.h
@@ -66,7 +66,7 @@ class OptaVariant
    * @return True if the Opta variant could be obtained successfully.
    */
   static bool
-  get_opta_variant(
+  getOptaVariant(
     Type & type);
 
   /**
diff --git a/src/expansion/AnalogExpansion.cpp b/src/expansion/AnalogExpansion.cpp
index 16daea8..3da2fe5 100644
--- a/src/expansion/AnalogExpansion.cpp
+++ b/src/expansion/AnalogExpansion.cpp
@@ -66,42 +66,42 @@ AnalogExpansion::create(
 }
 
 void
-AnalogExpansion::add_analog_input(
+AnalogExpansion::addAnalogInput(
   UA_Server * server,
   const char * display_name,
   AnalogInput::OnReadRequestFunc const on_read_request)
 {
-  _analog_input_mgr->add_analog_input(server, display_name, on_read_request);
+  _analog_input_mgr->addAnalogInput(server, display_name, on_read_request);
 }
 
 void
-AnalogExpansion::add_analog_output(
+AnalogExpansion::addAnalogOutput(
   UA_Server * server,
   const char * display_name,
   AnalogOutput::OnReadRequestFunc const on_read_request,
   AnalogOutput::OnWriteRequestFunc const on_write_request)
 {
-  _analog_output_mgr->add_analog_output(server, display_name, on_read_request, on_write_request);
+  _analog_output_mgr->addAnalogOutput(server, display_name, on_read_request, on_write_request);
 }
 
 void
-AnalogExpansion::add_pwm_output(
+AnalogExpansion::addPwmOutput(
   UA_Server * server,
   const char * display_name,
   PwmOutput::SetPwmFunc const set_pwm_func,
   PwmOutput::GetPwmPeriodFunc const get_pwm_period_func,
   PwmOutput::GetPwmPulseWidthFunc const get_pwm_pulse_width_func)
 {
-  _pwm_output_mgr->add_pwm_output(server, display_name, set_pwm_func, get_pwm_period_func, get_pwm_pulse_width_func);
+  _pwm_output_mgr->addPwmOutput(server, display_name, set_pwm_func, get_pwm_period_func, get_pwm_pulse_width_func);
 }
 
 void
-AnalogExpansion::add_led_output(
+AnalogExpansion::addLedOutput(
   UA_Server * server,
   const char * display_name,
   Led::OnSetLedStateFunc const on_set_led_state)
 {
-  _led_mgr->add_led_output(server, display_name, on_set_led_state);
+  _led_mgr->addLedOutput(server, display_name, on_set_led_state);
 }
 
 /**************************************************************************************
diff --git a/src/expansion/AnalogExpansion.h b/src/expansion/AnalogExpansion.h
index 5ce3a1f..369a066 100644
--- a/src/expansion/AnalogExpansion.h
+++ b/src/expansion/AnalogExpansion.h
@@ -101,7 +101,7 @@ class AnalogExpansion : public Expansion
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the analog input.
    */
   void
-  add_analog_input(
+  addAnalogInput(
     UA_Server * server,
     const char * display_name,
     AnalogInput::OnReadRequestFunc const on_read_request);
@@ -114,7 +114,7 @@ class AnalogExpansion : public Expansion
    * @param on_write_request Function pointer which is called during a write-access on the variable node representing the analog output.
    */
   void
-  add_analog_output(
+  addAnalogOutput(
     UA_Server * server,
     const char * display_name,
     AnalogOutput::OnReadRequestFunc const on_read_request,
@@ -129,7 +129,7 @@ class AnalogExpansion : public Expansion
    * @param get_pwm_pulse_width_func Function pointer which is called during a read-access on the variable node representing the PWM output's pulse width.
    */
   void
-  add_pwm_output(
+  addPwmOutput(
     UA_Server * server,
     const char * display_name,
     PwmOutput::SetPwmFunc const set_pwm_func,
@@ -143,7 +143,7 @@ class AnalogExpansion : public Expansion
    * @param on_set_led_state Function pointer which is called during a write-access on the variable node representing the LED.
    */
   void
-  add_led_output(
+  addLedOutput(
     UA_Server * server,
     const char * display_name,
     Led::OnSetLedStateFunc const on_set_led_state);
diff --git a/src/expansion/DigitalExpansion.cpp b/src/expansion/DigitalExpansion.cpp
index 90c11d7..238f019 100644
--- a/src/expansion/DigitalExpansion.cpp
+++ b/src/expansion/DigitalExpansion.cpp
@@ -50,30 +50,30 @@ DigitalExpansion::DigitalExpansion(
  **************************************************************************************/
 
 void
-DigitalExpansion::add_analog_input(
+DigitalExpansion::addAnalogInput(
   UA_Server * server,
   const char * display_name,
   AnalogInput::OnReadRequestFunc const on_read_request)
 {
-  _analog_input_mgr->add_analog_input(server, display_name, on_read_request);
+  _analog_input_mgr->addAnalogInput(server, display_name, on_read_request);
 }
 
 void
-DigitalExpansion::add_digital_input(
+DigitalExpansion::addDigitalInput(
   UA_Server * server,
   const char * display_name,
   DigitalInput::OnReadRequestFunc const on_read_request)
 {
-  _digital_input_mgr->add_digital_input(server, display_name, on_read_request);
+  _digital_input_mgr->addDigitalInput(server, display_name, on_read_request);
 }
 
 void
-DigitalExpansion::add_relay_output(
+DigitalExpansion::addRelayOutput(
   UA_Server * server,
   const char * display_name,
   Relay::OnSetRelayStateFunc const on_set_relay_state)
 {
-  _relay_mgr->add_relay_output(server, display_name, on_set_relay_state);
+  _relay_mgr->addRelayOutput(server, display_name, on_set_relay_state);
 }
 
 /**************************************************************************************
diff --git a/src/expansion/DigitalExpansion.h b/src/expansion/DigitalExpansion.h
index 1e24e65..f0644e6 100644
--- a/src/expansion/DigitalExpansion.h
+++ b/src/expansion/DigitalExpansion.h
@@ -76,7 +76,7 @@ class DigitalExpansion : public Expansion
  * @param on_read_request Function pointer which is called during a read-access on the variable node representing the analog input.
  */
   void
-  add_analog_input(
+  addAnalogInput(
     UA_Server * server,
     const char * display_name,
     AnalogInput::OnReadRequestFunc const on_read_request);
@@ -88,7 +88,7 @@ class DigitalExpansion : public Expansion
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the digital input.
    */
   void
-  add_digital_input(
+  addDigitalInput(
     UA_Server * server,
     const char * display_name,
     DigitalInput::OnReadRequestFunc const on_read_request);
@@ -100,7 +100,7 @@ class DigitalExpansion : public Expansion
    * @param on_set_relay_state Function pointer which is called during a write-access on the variable node representing a relay.
    */
   void
-  add_relay_output(
+  addRelayOutput(
     UA_Server * server,
     const char * display_name,
     Relay::OnSetRelayStateFunc const on_set_relay_state);
diff --git a/src/io/analog/AnalogInputManager.cpp b/src/io/analog/AnalogInputManager.cpp
index cba2cb8..e853000 100644
--- a/src/io/analog/AnalogInputManager.cpp
+++ b/src/io/analog/AnalogInputManager.cpp
@@ -70,7 +70,7 @@ AnalogInputManager::create(
  **************************************************************************************/
 
 void
-AnalogInputManager::add_analog_input(
+AnalogInputManager::addAnalogInput(
   UA_Server * server,
   const char * display_name,
   AnalogInput::OnReadRequestFunc const on_read_request)
diff --git a/src/io/analog/AnalogInputManager.h b/src/io/analog/AnalogInputManager.h
index c95cd24..32b2e5c 100644
--- a/src/io/analog/AnalogInputManager.h
+++ b/src/io/analog/AnalogInputManager.h
@@ -76,7 +76,7 @@ class AnalogInputManager
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the analog input.
    */
   void
-  add_analog_input(
+  addAnalogInput(
     UA_Server * server,
     const char * display_name,
     AnalogInput::OnReadRequestFunc const on_read_request);
diff --git a/src/io/analog/AnalogOutputManager.cpp b/src/io/analog/AnalogOutputManager.cpp
index e6fcdd1..663fad2 100644
--- a/src/io/analog/AnalogOutputManager.cpp
+++ b/src/io/analog/AnalogOutputManager.cpp
@@ -70,7 +70,7 @@ AnalogOutputManager::create(
  **************************************************************************************/
 
 void
-AnalogOutputManager::add_analog_output(
+AnalogOutputManager::addAnalogOutput(
   UA_Server * server,
   const char * display_name,
   AnalogOutput::OnReadRequestFunc const on_read_request,
diff --git a/src/io/analog/AnalogOutputManager.h b/src/io/analog/AnalogOutputManager.h
index 9208b47..bbfb178 100644
--- a/src/io/analog/AnalogOutputManager.h
+++ b/src/io/analog/AnalogOutputManager.h
@@ -77,7 +77,7 @@ class AnalogOutputManager
    * @param on_write_request Function pointer which is called during a write-access on the variable node representing the analog output.
    */
   void
-  add_analog_output(
+  addAnalogOutput(
     UA_Server * server,
     const char * display_name,
     AnalogOutput::OnReadRequestFunc const on_read_request,
diff --git a/src/io/digital/DigitalInputManager.cpp b/src/io/digital/DigitalInputManager.cpp
index f15d5bd..e48abf9 100644
--- a/src/io/digital/DigitalInputManager.cpp
+++ b/src/io/digital/DigitalInputManager.cpp
@@ -70,7 +70,7 @@ DigitalInputManager::create(
  **************************************************************************************/
 
 void
-DigitalInputManager::add_digital_input(
+DigitalInputManager::addDigitalInput(
   UA_Server * server,
   const char * display_name,
   DigitalInput::OnReadRequestFunc const on_read_request)
diff --git a/src/io/digital/DigitalInputManager.h b/src/io/digital/DigitalInputManager.h
index 714c93d..7770b92 100644
--- a/src/io/digital/DigitalInputManager.h
+++ b/src/io/digital/DigitalInputManager.h
@@ -76,7 +76,7 @@ class DigitalInputManager
    * @param on_read_request Function pointer which is called during a read-access on the variable node representing the digital input.
    */
   void
-  add_digital_input(
+  addDigitalInput(
     UA_Server * server,
     const char * display_name,
     DigitalInput::OnReadRequestFunc const on_read_request);
diff --git a/src/io/led/LedManager.cpp b/src/io/led/LedManager.cpp
index 715c901..9fe4bbd 100644
--- a/src/io/led/LedManager.cpp
+++ b/src/io/led/LedManager.cpp
@@ -70,7 +70,7 @@ LedManager::create(
  **************************************************************************************/
 
 void
-LedManager::add_led_output(
+LedManager::addLedOutput(
   UA_Server * server,
   const char * display_name,
   Led::OnSetLedStateFunc const on_set_led_state)
diff --git a/src/io/led/LedManager.h b/src/io/led/LedManager.h
index 2867d25..b8f10d8 100644
--- a/src/io/led/LedManager.h
+++ b/src/io/led/LedManager.h
@@ -75,7 +75,7 @@ class LedManager
    * @param on_set_led_state Function pointer which is called during a write-access on the variable node representing the LED.
    */
   void
-  add_led_output(
+  addLedOutput(
     UA_Server * server,
     const char * display_name,
     Led::OnSetLedStateFunc const on_set_led_state);
diff --git a/src/io/pwm/PwmOutputManager.cpp b/src/io/pwm/PwmOutputManager.cpp
index 0ada80b..1613ccf 100644
--- a/src/io/pwm/PwmOutputManager.cpp
+++ b/src/io/pwm/PwmOutputManager.cpp
@@ -70,7 +70,7 @@ PwmOutputManager::create(
  **************************************************************************************/
 
 void
-PwmOutputManager::add_pwm_output(
+PwmOutputManager::addPwmOutput(
   UA_Server * server,
   const char * display_name,
   PwmOutput::SetPwmFunc const set_pwm_func,
diff --git a/src/io/pwm/PwmOutputManager.h b/src/io/pwm/PwmOutputManager.h
index d3c2ad2..ef5254c 100644
--- a/src/io/pwm/PwmOutputManager.h
+++ b/src/io/pwm/PwmOutputManager.h
@@ -78,7 +78,7 @@ class PwmOutputManager
    * @param get_pwm_pulse_width_func Function pointer which is called during a read-access on the variable node representing the PWM output's pulse width.
    */
   void
-  add_pwm_output(
+  addPwmOutput(
     UA_Server * server,
     const char * display_name,
     PwmOutput::SetPwmFunc const set_pwm_func,
diff --git a/src/io/relay/RelayManager.cpp b/src/io/relay/RelayManager.cpp
index fb9511e..eb6faa0 100644
--- a/src/io/relay/RelayManager.cpp
+++ b/src/io/relay/RelayManager.cpp
@@ -70,7 +70,7 @@ RelayManager::create(
  **************************************************************************************/
 
 void
-RelayManager::add_relay_output(
+RelayManager::addRelayOutput(
   UA_Server * server,
   const char * display_name,
   Relay::OnSetRelayStateFunc const on_set_relay_state)
diff --git a/src/io/relay/RelayManager.h b/src/io/relay/RelayManager.h
index 97ac8c3..5f62a12 100644
--- a/src/io/relay/RelayManager.h
+++ b/src/io/relay/RelayManager.h
@@ -76,7 +76,7 @@ class RelayManager
    * @param on_set_relay_state Function pointer which is called during a write-access on the variable node representing a relay.
    */
   void
-  add_relay_output(
+  addRelayOutput(
     UA_Server * server,
     const char * display_name,
     Relay::OnSetRelayStateFunc const on_set_relay_state);
diff --git a/src/util/time/cvt_time.cpp b/src/util/time/timeToStr.cpp
similarity index 96%
rename from src/util/time/cvt_time.cpp
rename to src/util/time/timeToStr.cpp
index 46e6d6a..72c980e 100644
--- a/src/util/time/cvt_time.cpp
+++ b/src/util/time/timeToStr.cpp
@@ -11,7 +11,7 @@
  * INCLUDE
  **************************************************************************************/
 
-#include "cvt_time.h"
+#include "timeToStr.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -27,7 +27,7 @@ namespace opcua
  * FUNCTION DEFINITION
  **************************************************************************************/
 
-time_t cvt_time(char const * time)
+time_t timeToStr(char const * time)
 {
   static time_t build_time = 0;
 
diff --git a/src/util/time/cvt_time.h b/src/util/time/timeToStr.h
similarity index 97%
rename from src/util/time/cvt_time.h
rename to src/util/time/timeToStr.h
index 7771819..8039bc7 100644
--- a/src/util/time/cvt_time.h
+++ b/src/util/time/timeToStr.h
@@ -31,7 +31,7 @@ namespace opcua
  * @param time current time as generated by __DATE__.
  * @return String converted into Unix Time (seconds since Epoch)
  */
-time_t cvt_time(char const * time);
+time_t timeToStr(char const * time);
 
 /**************************************************************************************
  * NAMESPACE