consolidate device types