Beter method/class naming for More device settings

Change-Id: I45a01a158d019cef9dfe70bd681f25995a41e7e0