Base Device Type Off Commonalities

**Problem description**
Base our Device off the commonalities device.

**Expected behavior**
N/A

**Alternative solution**
N/A

**Additional context**
Alignment, in the future may need other enhancements to device.
