Mass refactor of convergence to identity and for existing identity names to be renamed to device.