diff --git a/logger.go b/logger.go
index e1a9ff78a..dc2f062b4 100644
--- a/logger.go
+++ b/logger.go
@@ -298,7 +298,7 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
 	// Set up any required terminal behavior.
 	switch ent.Level {
 	case zapcore.PanicLevel:
-		ce = ce.Should(ent, zapcore.WriteThenPanic)
+		ce = ce.After(ent, zapcore.WriteThenPanic)
 	case zapcore.FatalLevel:
 		onFatal := log.onFatal
 		// nil or WriteThenNoop will lead to continued execution after
@@ -318,7 +318,7 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
 		ce = ce.After(ent, onFatal)
 	case zapcore.DPanicLevel:
 		if log.development {
-			ce = ce.Should(ent, zapcore.WriteThenPanic)
+			ce = ce.After(ent, zapcore.WriteThenPanic)
 		}
 	}
 
diff --git a/zapcore/entry.go b/zapcore/entry.go
index d91efe831..216a86d93 100644
--- a/zapcore/entry.go
+++ b/zapcore/entry.go
@@ -206,7 +206,7 @@ var _ CheckWriteHook = CheckWriteAction(0)
 // CheckedEntry is an Entry together with a collection of Cores that have
 // already agreed to log it.
 //
-// CheckedEntry references should be created by calling AddCore or Should on a
+// CheckedEntry references should be created by calling AddCore or After on a
 // nil *CheckedEntry. References are returned to a pool after Write, and MUST
 // NOT be retained after calling their Write method.
 type CheckedEntry struct {
diff --git a/zapcore/entry_test.go b/zapcore/entry_test.go
index d04cad9e7..6555ab6d0 100644
--- a/zapcore/entry_test.go
+++ b/zapcore/entry_test.go
@@ -111,19 +111,19 @@ func TestCheckedEntryWrite(t *testing.T) {
 
 	t.Run("WriteThenPanic", func(t *testing.T) {
 		var ce *CheckedEntry
-		ce = ce.Should(Entry{}, WriteThenPanic)
+		ce = ce.After(Entry{}, WriteThenPanic)
 		assert.Panics(t, func() { ce.Write() }, "Expected to panic when WriteThenPanic is set.")
 	})
 
 	t.Run("WriteThenGoexit", func(t *testing.T) {
 		var ce *CheckedEntry
-		ce = ce.Should(Entry{}, WriteThenGoexit)
+		ce = ce.After(Entry{}, WriteThenGoexit)
 		assertGoexit(t, func() { ce.Write() })
 	})
 
 	t.Run("WriteThenFatal", func(t *testing.T) {
 		var ce *CheckedEntry
-		ce = ce.Should(Entry{}, WriteThenFatal)
+		ce = ce.After(Entry{}, WriteThenFatal)
 		stub := exit.WithStub(func() {
 			ce.Write()
 		})