Half refactoring subject -> target in activities.