rename some fields from device to system as it entered by mistake