Refactoring over function names