Refactor: renamed signals to intents