Modified and renamed several socket classes.
Revert "Modified and renamed several socket classes."

This reverts commit 07b0ea39aed94247e51528038ed3cc2b4a6e00fd.
Revert "Revert "Modified and renamed several socket classes.""

This reverts commit df184befcd73ce559e2e1fe0154777764db6c136.
Revert "Revert "Revert "Modified and renamed several socket classes."""

This reverts commit b8ada2917d98f9af8ec0b322ae04bb02d5daa891.
Merge origin/master