Bug 1316235: Change of terminology from Instance to Server