more naming changes.
cleanup from socket -> connection.
refactoring.