Fix rename
Fix server name