Fixed name conflicts, and local bugs in server.c