evitareul: fix device name

Change-Id: Ie4f2d7500d6c45cd72e59a613b82ac5d776871d0
evitareul: early clean-up

Change-Id: Iebf1ee5a8d605d3d2862378bfa0bd40e2cb13b77