@Tim 'mithro' Ansell Could you please approve the following pull requests? They all related to 1 change but we can't make them in one pull request as there are too many changes. This is the device naming change as we have agreed.