Fix wrong subtype assignment within network devices