Renaming of the Server classes