added consistent naming scheme for socket events