Add to device class hierarchy. Class renaming.