rename oldDevice to oldDeviceType because it sounds better