diff --git a/README.md b/README.md
index 3b0b9d1..0ebfbb3 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ the full configuration details in the [Zuul manual](http://docs.openstack.org/in
 
 1. Change 'myvendor' in the 'recheck' command to your CI's name.
 
-2. Configure the e-mail addresses for merge-failures and job notification.
+2. Configure the e-mail addresses for merge-conflicts and job notification.
 
 3. By default, the project zuul triggers on is `openstack-dev/ci-sandbox`.
    After testing your CI system update this section to include other projects.
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e166fa7..039869f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -22,12 +22,12 @@ pipelines:
     failure:
       gerrit:
         verified: -1
-    merge-failure:
+    merge-conflict:
       smtp:
         #TODO: Update these to real e-mail addresses
         to: third_party_ci@example.com
         from: zuul@example.com
-        subject: Upstream change {change} has a merge failure
+        subject: Upstream change {change} has a merge conflict
 
 
   - name: silent