Merge "Rename NIC feature"