Fixed add/remove-trigger to better reflect the action