server classes renamed