Modified and renamed several socket classes.