Device side refactored to use model object.
Renaming of device completed to make more clear distinction between device representation on device and index sides.