new naming in server file