Merge "rename device"