Reverted a few changes and names; fixed a server error (not in code, but rather in usage of it)