Rename server classes