Device type renames

Hopefully this will make things easier to understand