diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index 0752a9531e..04237ad3ea 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -35,220 +35,220 @@
 
 /* Translation tables */
 struct skinny_table SKINNY_MESSAGE_TYPES[] = {
-	{"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
-	{"RegisterMessage", REGISTER_MESSAGE},
-	{"PortMessage", PORT_MESSAGE},
-	{"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
-	{"EnblocCallMessage", ENBLOC_CALL_MESSAGE},
-	{"StimulusMessage", STIMULUS_MESSAGE},
-	{"OffHookMessage", OFF_HOOK_MESSAGE},
-	{"OnHookMessage", ON_HOOK_MESSAGE},
-	{"ForwardStatReqMessage",  FORWARD_STAT_REQ_MESSAGE},
-	{"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
-	{"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
-	{"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
-	{"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
-	{"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
-	{"VersionReqMessage", VERSION_REQ_MESSAGE},
-	{"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
-	{"AlarmMessage", ALARM_MESSAGE},
-	{"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
-	{"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
-	{"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
-	{"UnregisterMessage", UNREGISTER_MESSAGE},
-	{"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
-	{"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
-	{"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
-	{"DeviceToUserDataMessage", DEVICE_TO_USER_DATA_MESSAGE},
-	{"DeviceToUserDataResponseMessage", DEVICE_TO_USER_DATA_RESPONSE_MESSAGE},
-	{"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
-	{"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
-	{"DeviceToUserDataVersion1Message", DEVICE_TO_USER_DATA_VERSION1_MESSAGE},
-	{"DeviceToUserDataResponseVersion1Message", DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE},
-	{"RegisterAckMessage", REGISTER_ACK_MESSAGE},
-	{"StartToneMessage", START_TONE_MESSAGE},
-	{"StopToneMessage", STOP_TONE_MESSAGE},
-	{"SetRingerMessage", SET_RINGER_MESSAGE},
-	{"SetLampMessage", SET_LAMP_MESSAGE},
-	{"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
-	{"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
-	{"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
-	{"CallInfoMessage", CALL_INFO_MESSAGE},
-	{"ForwardStatMessage", FORWARD_STAT_MESSAGE},
-	{"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
-	{"LineStatResMessage", LINE_STAT_RES_MESSAGE},
-	{"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
-	{"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
-	{"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
-	{"VersionMessage", VERSION_MESSAGE},
-	{"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
-	{"RegisterRejectMessage", REGISTER_REJECT_MESSAGE},
-	{"ResetMessage", RESET_MESSAGE},
-	{"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
-	{"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
-	{"CloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
-	{"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
-	{"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
-	{"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
-	{"CallStateMessage", CALL_STATE_MESSAGE},
-	{"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
-	{"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
-	{"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
-	{"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
-	{"BackSpaceReqMessage", BACK_SPACE_REQ_MESSAGE},
-	{"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
-	{"UserToDeviceDataMessage", USER_TO_DEVICE_DATA_MESSAGE},
-	{"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
-	{"DisplayPriNotifyMessage", DISPLAY_PRI_NOTIFY_MESSAGE},
-	{"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
-	{"UserToDeviceDataVersion1Message", USER_TO_DEVICE_DATA_VERSION1_MESSAGE},
-	{"XMLAlarmMessage", XML_ALARM_MESSAGE},
-	{NULL, 0}
+	{KEEP_ALIVE_MESSAGE, "KeepAliveMessage"},
+	{REGISTER_MESSAGE, "RegisterMessage"},
+	{PORT_MESSAGE, "PortMessage"},
+	{KEYPAD_BUTTON_MESSAGE, "KeypadButtonMessage"},
+	{ENBLOC_CALL_MESSAGE, "EnblocCallMessage"},
+	{STIMULUS_MESSAGE, "StimulusMessage"},
+	{OFF_HOOK_MESSAGE, "OffHookMessage"},
+	{ON_HOOK_MESSAGE, "OnHookMessage"},
+	{ FORWARD_STAT_REQ_MESSAGE, "ForwardStatReqMessage"},
+	{SPEED_DIAL_STAT_REQ_MESSAGE, "SpeedDialStatReqMessage"},
+	{LINE_STAT_REQ_MESSAGE, "LineStatReqMessage"},
+	{CONFIG_STAT_REQ_MESSAGE, "ConfigStatReqMessage"},
+	{TIME_DATE_REQ_MESSAGE, "TimeDateReqMessage"},
+	{BUTTON_TEMPLATE_REQ_MESSAGE, "ButtonTemplateReqMessage"},
+	{VERSION_REQ_MESSAGE, "VersionReqMessage"},
+	{CAPABILITIES_RES_MESSAGE, "CapabilitiesReqMessage"},
+	{ALARM_MESSAGE, "AlarmMessage"},
+	{OPEN_RECEIVE_CHANNEL_ACK_MESSAGE, "OpenReceiveChannelAckMessage"},
+	{SOFT_KEY_SET_REQ_MESSAGE, "SoftKeySetReqMessage"},
+	{SOFT_KEY_EVENT_MESSAGE, "SoftKeyEventMessage"},
+	{UNREGISTER_MESSAGE, "UnregisterMessage"},
+	{SOFT_KEY_TEMPLATE_REQ_MESSAGE, "SoftKeyTemplateReqMessage"},
+	{HEADSET_STATUS_MESSAGE, "HeadsetStatusMessage"},
+	{REGISTER_AVAILABLE_LINES_MESSAGE, "RegisterAvailableLinesMessage"},
+	{DEVICE_TO_USER_DATA_MESSAGE, "DeviceToUserDataMessage"},
+	{DEVICE_TO_USER_DATA_RESPONSE_MESSAGE, "DeviceToUserDataResponseMessage"},
+	{SERVICE_URL_STAT_REQ_MESSAGE, "ServiceUrlStatReqMessage"},
+	{FEATURE_STAT_REQ_MESSAGE, "FeatureStatReqMessage"},
+	{DEVICE_TO_USER_DATA_VERSION1_MESSAGE, "DeviceToUserDataVersion1Message"},
+	{DEVICE_TO_USER_DATA_RESPONSE_VERSION1_MESSAGE, "DeviceToUserDataResponseVersion1Message"},
+	{REGISTER_ACK_MESSAGE, "RegisterAckMessage"},
+	{START_TONE_MESSAGE, "StartToneMessage"},
+	{STOP_TONE_MESSAGE, "StopToneMessage"},
+	{SET_RINGER_MESSAGE, "SetRingerMessage"},
+	{SET_LAMP_MESSAGE, "SetLampMessage"},
+	{SET_SPEAKER_MODE_MESSAGE, "SetSpeakerModeMessage"},
+	{START_MEDIA_TRANSMISSION_MESSAGE, "StartMediaTransmissionMessage"},
+	{STOP_MEDIA_TRANSMISSION_MESSAGE, "StopMediaTransmissionMessage"},
+	{CALL_INFO_MESSAGE, "CallInfoMessage"},
+	{FORWARD_STAT_MESSAGE, "ForwardStatMessage"},
+	{SPEED_DIAL_STAT_RES_MESSAGE, "SpeedDialStatResMessage"},
+	{LINE_STAT_RES_MESSAGE, "LineStatResMessage"},
+	{CONFIG_STAT_RES_MESSAGE, "ConfigStatResMessage"},
+	{DEFINE_TIME_DATE_MESSAGE, "DefineTimeDateMessage"},
+	{BUTTON_TEMPLATE_RES_MESSAGE, "ButtonTemplateResMessage"},
+	{VERSION_MESSAGE, "VersionMessage"},
+	{CAPABILITIES_REQ_MESSAGE, "CapabilitiesReqMessage"},
+	{REGISTER_REJECT_MESSAGE, "RegisterRejectMessage"},
+	{RESET_MESSAGE, "ResetMessage"},
+	{KEEP_ALIVE_ACK_MESSAGE, "KeepAliveAckMessage"},
+	{OPEN_RECEIVE_CHANNEL_MESSAGE, "OpenReceiveChannelMessage"},
+	{CLOSE_RECEIVE_CHANNEL_MESSAGE, "CloseReceiveChannelMessage"},
+	{SOFT_KEY_TEMPLATE_RES_MESSAGE, "SoftKeyTemplateResMessage"},
+	{SOFT_KEY_SET_RES_MESSAGE, "SoftKeySetResMessage"},
+	{SELECT_SOFT_KEYS_MESSAGE, "SelectSoftKeysMessage"},
+	{CALL_STATE_MESSAGE, "CallStateMessage"},
+	{DISPLAY_PROMPT_STATUS_MESSAGE, "DisplayPromptStatusMessage"},
+	{CLEAR_PROMPT_STATUS_MESSAGE, "ClearPromptStatusMessage"},
+	{ACTIVATE_CALL_PLANE_MESSAGE, "ActivateCallPlaneMessage"},
+	{UNREGISTER_ACK_MESSAGE, "UnregisterAckMessage"},
+	{BACK_SPACE_REQ_MESSAGE, "BackSpaceReqMessage"},
+	{DIALED_NUMBER_MESSAGE, "DialedNumberMessage"},
+	{USER_TO_DEVICE_DATA_MESSAGE, "UserToDeviceDataMessage"},
+	{FEATURE_STAT_RES_MESSAGE, "FeatureResMessage"},
+	{DISPLAY_PRI_NOTIFY_MESSAGE, "DisplayPriNotifyMessage"},
+	{SERVICE_URL_STAT_RES_MESSAGE, "ServiceUrlStatMessage"},
+	{USER_TO_DEVICE_DATA_VERSION1_MESSAGE, "UserToDeviceDataVersion1Message"},
+	{XML_ALARM_MESSAGE, "XMLAlarmMessage"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
 SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
 
 struct skinny_table SKINNY_DEVICE_TYPES[] = {
-	{"Cisco 30 SP+", 1},
-	{"Cisco 12 SP+", 2},
-	{"Cisco 12 SP", 3},
-	{"Cisco 12", 4},
-	{"Cisco 30 VIP", 5},
-	{"Cisco IP Phone 7910", 6},
-	{"Cisco IP Phone 7960", 7},
-	{"Cisco IP Phone 7940", 8},
-	{"Cisco IP Phone 7935", 9},
-	{"Cisco ATA 186", 12},
-	{"Cisco IP Phone CP-7921G", 365},
-	{"Cisco IP Phone CP-7962G", 404},
-	{"Cisco IP Phone CP-7965G", 436},
-	{"Cisco IP Phone CP-7961G", 30018},
-	{"Cisco IP Phone 7936", 30019},
-	{NULL, 0}
+	{1, "Cisco 30 SP+"},
+	{2, "Cisco 12 SP+"},
+	{3, "Cisco 12 SP"},
+	{4, "Cisco 12"},
+	{5, "Cisco 30 VIP"},
+	{6, "Cisco IP Phone 7910"},
+	{7, "Cisco IP Phone 7960"},
+	{8, "Cisco IP Phone 7940"},
+	{9, "Cisco IP Phone 7935"},
+	{12, "Cisco ATA 186"},
+	{365, "Cisco IP Phone CP-7921G"},
+	{404, "Cisco IP Phone CP-7962G"},
+	{436, "Cisco IP Phone CP-7965G"},
+	{30018, "Cisco IP Phone CP-7961G"},
+	{30019, "Cisco IP Phone 7936"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_device_type2str, SKINNY_DEVICE_TYPES, "UnknownDeviceType")
 SKINNY_DECLARE_STR2ID(skinny_str2device_type, SKINNY_DEVICE_TYPES, -1)
 
 struct skinny_table SKINNY_RING_TYPES[] = {
-	{"RingOff", SKINNY_RING_OFF},
-	{"RingInside", SKINNY_RING_INSIDE},
-	{"RingOutside", SKINNY_RING_OUTSIDE},
-	{"RingFeature", SKINNY_RING_FEATURE},
-	{NULL, 0}
+	{SKINNY_RING_OFF, "RingOff"},
+	{SKINNY_RING_INSIDE, "RingInside"},
+	{SKINNY_RING_OUTSIDE, "RingOutside"},
+	{SKINNY_RING_FEATURE, "RingFeature"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2ring_type, SKINNY_RING_TYPES, -1)
 
 struct skinny_table SKINNY_RING_MODES[] = {
-	{"RingForever", SKINNY_RING_FOREVER},
-	{"RingOnce", SKINNY_RING_ONCE},
-	{NULL, 0}
+	{SKINNY_RING_FOREVER, "RingForever"},
+	{SKINNY_RING_ONCE, "RingOnce"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1)
 
 struct skinny_table SKINNY_BUTTONS[] = {
-	{"Unknown", SKINNY_BUTTON_UNKNOWN},
-	{"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
-	{"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
-	{"Hold", SKINNY_BUTTON_HOLD},
-	{"Transfer", SKINNY_BUTTON_TRANSFER},
-	{"Line", SKINNY_BUTTON_LINE},
-	{"Voicemail", SKINNY_BUTTON_VOICEMAIL},
-	{"Privacy", SKINNY_BUTTON_PRIVACY},
-	{"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
-	{"Undefined", SKINNY_BUTTON_UNDEFINED},
-	{NULL, 0}
+	{SKINNY_BUTTON_UNKNOWN, "Unknown"},
+	{SKINNY_BUTTON_LAST_NUMBER_REDIAL, "LastNumberRedial"},
+	{SKINNY_BUTTON_SPEED_DIAL, "SpeedDial"},
+	{SKINNY_BUTTON_HOLD, "Hold"},
+	{SKINNY_BUTTON_TRANSFER, "Transfer"},
+	{SKINNY_BUTTON_LINE, "Line"},
+	{SKINNY_BUTTON_VOICEMAIL, "Voicemail"},
+	{SKINNY_BUTTON_PRIVACY, "Privacy"},
+	{SKINNY_BUTTON_SERVICE_URL, "ServiceUrl"},
+	{SKINNY_BUTTON_UNDEFINED, "Undefined"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_button2str, SKINNY_BUTTONS, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
 
 struct skinny_table SKINNY_SOFT_KEY_EVENTS[] = {
-	{"SoftkeyRedial", SOFTKEY_REDIAL},
-	{"SoftkeyNewcall", SOFTKEY_NEWCALL},
-	{"SoftkeyHold", SOFTKEY_HOLD},
-	{"SoftkeyTransfer", SOFTKEY_TRANSFER},
-	{"SoftkeyCfwdall", SOFTKEY_CFWDALL},
-	{"SoftkeyCfwdbusy", SOFTKEY_CFWDBUSY},
-	{"SoftkeyCfwdnoanswer", SOFTKEY_CFWDNOANSWER},
-	{"SoftkeyBackspace", SOFTKEY_BACKSPACE},
-	{"SoftkeyEndcall", SOFTKEY_ENDCALL},
-	{"SoftkeyResume", SOFTKEY_RESUME},
-	{"SoftkeyAnswer", SOFTKEY_ANSWER },
-	{"SoftkeyInfo", SOFTKEY_INFO},
-	{"SoftkeyConfrm", SOFTKEY_CONFRM},
-	{"SoftkeyPark", SOFTKEY_PARK},
-	{"SoftkeyJoin", SOFTKEY_JOIN},
-	{"SoftkeyMeetmeconfrm", SOFTKEY_MEETMECONFRM},
-	{"SoftkeyCallpickup", SOFTKEY_CALLPICKUP},
-	{"SoftkeyGrpcallpickup", SOFTKEY_GRPCALLPICKUP},
-	{"SoftkeyDnd", SOFTKEY_DND},
-	{"SoftkeyIdivert", SOFTKEY_IDIVERT},
-	{NULL, 0}
+	{SOFTKEY_REDIAL, "SoftkeyRedial"},
+	{SOFTKEY_NEWCALL, "SoftkeyNewcall"},
+	{SOFTKEY_HOLD, "SoftkeyHold"},
+	{SOFTKEY_TRANSFER, "SoftkeyTransfer"},
+	{SOFTKEY_CFWDALL, "SoftkeyCfwdall"},
+	{SOFTKEY_CFWDBUSY, "SoftkeyCfwdbusy"},
+	{SOFTKEY_CFWDNOANSWER, "SoftkeyCfwdnoanswer"},
+	{SOFTKEY_BACKSPACE, "SoftkeyBackspace"},
+	{SOFTKEY_ENDCALL, "SoftkeyEndcall"},
+	{SOFTKEY_RESUME, "SoftkeyResume"},
+	{SOFTKEY_ANSWER , "SoftkeyAnswer"},
+	{SOFTKEY_INFO, "SoftkeyInfo"},
+	{SOFTKEY_CONFRM, "SoftkeyConfrm"},
+	{SOFTKEY_PARK, "SoftkeyPark"},
+	{SOFTKEY_JOIN, "SoftkeyJoin"},
+	{SOFTKEY_MEETMECONFRM, "SoftkeyMeetmeconfrm"},
+	{SOFTKEY_CALLPICKUP, "SoftkeyCallpickup"},
+	{SOFTKEY_GRPCALLPICKUP, "SoftkeyGrpcallpickup"},
+	{SOFTKEY_DND, "SoftkeyDnd"},
+	{SOFTKEY_IDIVERT, "SoftkeyIdivert"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_soft_key_event2str, SKINNY_SOFT_KEY_EVENTS, "SoftkeyUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2soft_key_event, SKINNY_SOFT_KEY_EVENTS, 0)
 
 struct skinny_table SKINNY_LAMP_MODES[] = {
-	{"Off", SKINNY_LAMP_OFF},
-	{"On", SKINNY_LAMP_ON},
-	{"Wink", SKINNY_LAMP_WINK},
-	{"Flash", SKINNY_LAMP_FLASH},
-	{"Blink", SKINNY_LAMP_BLINK},
-	{NULL, 0}
+	{SKINNY_LAMP_OFF, "Off"},
+	{SKINNY_LAMP_ON, "On"},
+	{SKINNY_LAMP_WINK, "Wink"},
+	{SKINNY_LAMP_FLASH, "Flash"},
+	{SKINNY_LAMP_BLINK, "Blink"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_lamp_mode2str, SKINNY_LAMP_MODES, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2lamp_mode, SKINNY_LAMP_MODES, -1)
 
 struct skinny_table SKINNY_SPEAKER_MODES[] = {
-	{"SpeakerOn", SKINNY_SPEAKER_ON},
-	{"SpeakerOff", SKINNY_SPEAKER_OFF},
-	{NULL, 0}
+	{SKINNY_SPEAKER_ON, "SpeakerOn"},
+	{SKINNY_SPEAKER_OFF, "SpeakerOff"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_speaker_mode2str, SKINNY_SPEAKER_MODES, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2speaker_mode, SKINNY_SPEAKER_MODES, -1)
 
 struct skinny_table SKINNY_KEY_SETS[] = {
-	{"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
-	{"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
-	{"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
-	{"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
-	{"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
-	{"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
-	{"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
-	{"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
-	{"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
-	{"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
-	{"KeySetInUseHint", SKINNY_KEY_SET_IN_USE_HINT},
-	{NULL, 0}
+	{SKINNY_KEY_SET_ON_HOOK, "KeySetOnHook"},
+	{SKINNY_KEY_SET_CONNECTED, "KeySetConnected"},
+	{SKINNY_KEY_SET_ON_HOLD, "KeySetOnHold"},
+	{SKINNY_KEY_SET_RING_IN, "KeySetRingIn"},
+	{SKINNY_KEY_SET_OFF_HOOK, "KeySetOffHook"},
+	{SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER, "KeySetConnectedWithTransfer"},
+	{SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, "KeySetDigitsAfterDialingFirstDigit"},
+	{SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE, "KeySetConnectedWithConference"},
+	{SKINNY_KEY_SET_RING_OUT, "KeySetRingOut"},
+	{SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES, "KeySetOffHookWithFeatures"},
+	{SKINNY_KEY_SET_IN_USE_HINT, "KeySetInUseHint"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_soft_key_set2str, SKINNY_KEY_SETS, "UNKNOWN_SOFT_KEY_SET")
 SKINNY_DECLARE_STR2ID(skinny_str2soft_key_set, SKINNY_KEY_SETS, -1)
 
 struct skinny_table SKINNY_CALL_STATES[] = {
-	{"OffHook", SKINNY_OFF_HOOK},
-	{"OnHook", SKINNY_ON_HOOK},
-	{"RingOut", SKINNY_RING_OUT},
-	{"RingIn", SKINNY_RING_IN},
-	{"Connected", SKINNY_CONNECTED},
-	{"Busy", SKINNY_BUSY},
-	{"LineInUse", SKINNY_LINE_IN_USE},
-	{"Hold", SKINNY_HOLD},
-	{"CallWaiting", SKINNY_CALL_WAITING},
-	{"CallTransfer", SKINNY_CALL_TRANSFER},
-	{"CallPark", SKINNY_CALL_PARK},
-	{"Proceed", SKINNY_PROCEED},
-	{"InUseRemotely", SKINNY_IN_USE_REMOTELY},
-	{"InvalidNumber", SKINNY_INVALID_NUMBER},
-	{NULL, 0}
+	{SKINNY_OFF_HOOK, "OffHook"},
+	{SKINNY_ON_HOOK, "OnHook"},
+	{SKINNY_RING_OUT, "RingOut"},
+	{SKINNY_RING_IN, "RingIn"},
+	{SKINNY_CONNECTED, "Connected"},
+	{SKINNY_BUSY, "Busy"},
+	{SKINNY_LINE_IN_USE, "LineInUse"},
+	{SKINNY_HOLD, "Hold"},
+	{SKINNY_CALL_WAITING, "CallWaiting"},
+	{SKINNY_CALL_TRANSFER, "CallTransfer"},
+	{SKINNY_CALL_PARK, "CallPark"},
+	{SKINNY_PROCEED, "Proceed"},
+	{SKINNY_IN_USE_REMOTELY, "InUseRemotely"},
+	{SKINNY_INVALID_NUMBER, "InvalidNumber"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_call_state2str, SKINNY_CALL_STATES, "CallStateUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2call_state, SKINNY_CALL_STATES, -1)
 
 struct skinny_table SKINNY_DEVICE_RESET_TYPES[] = {
-	{"DeviceReset", SKINNY_DEVICE_RESET},
-	{"DeviceRestart", SKINNY_DEVICE_RESTART},
-	{NULL, 0}
+	{SKINNY_DEVICE_RESET, "DeviceReset"},
+	{SKINNY_DEVICE_RESTART, "DeviceRestart"},
+	{0, NULL}
 };
 SKINNY_DECLARE_ID2STR(skinny_device_reset_type2str, SKINNY_DEVICE_RESET_TYPES, "DeviceResetTypeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2device_reset_type, SKINNY_DEVICE_RESET_TYPES, -1)
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index 84f2b6c297..abfdfc2aa0 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -36,8 +36,8 @@
 /* SKINNY TABLES */
 /*****************************************************************************/
 struct skinny_table {
-    const char *name;
     uint32_t id;
+    const char *name;
 };
 
 #define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \