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

This reverts commit 4639b05b16e88c20048f7addfe3c1640bd923907.
Merge origin/master
Modified and renamed several socket classes.