name changes

better names! yay!
Partially refactored server.py