Make the naming of TcpState variables consistent