Updated device name accuracy

Closes #4
Merge branch 'feature/device_naming' into develop

* feature/device_naming:
  Updated device name accuracy