Refactor device naming