Bug: Maker API inconsistency

The /devices and /devices/all API results are inconsistent in the name and label fields:

[
    {
        "name": "Kitchen",
        "label": "contact_win_01",

[
    {
        "name": "contact_win_01",
        "displayName": "Kitchen"
    }

Thanks for finding this. This will be changed in the next release to match the name and label of the top one.

This will be fixed where the name will match the device name and the label will be either the label if set, or the name if not set for both.