cleanup of network level function names and parameters