consistent renaming in server classes