Refactoring of action names