BIG refactoring: moving to new device api
fixed data source to device naming