Fixed Server naming issue