Better device naming
Update documentation