Fix device name problem