fix incorrect names after device saving