Fixed naming collision with server module