Removed hardcoded Server name from source