Client and server connection names standardized. Furthermore, code structure edited.