Fixing device name problem