Fix device name bug