Updated naming to be device