jf: unify devices

Change-Id: I22026b5241b2a667fcd016049d01fae59d5c8a