Changed terminology from "site" to "device"