Fixed menu key & device name

Change-Id: I1ed5f5db7b51e89c120856fd029f81408b9a8688