Renamed some references making more appropriate to server context.