Minor Socket Name Changes, added variables