renamed Service to Server