server code renaming for clarity