clarify and fix site specific device naming conventions