Updated all references to one unified class.
Rework of the broken NIC