Merge "Renaming Ethernet Network Management Classes"