replaced refs from Device Address to Device ID