refactor srp function names