Align device naming conventions