Replacing entity with device

Change-Id: I5b91a09a82c49b47c2efdd7d51c9a7e91fb683af