replaced references of Device with IDevice