(refactor) Change Device/Client heading