diff --git a/github/messages.go b/github/messages.go
index 2b5cce7504a..4a30d69fc66 100644
--- a/github/messages.go
+++ b/github/messages.go
@@ -38,9 +38,9 @@ const (
 	// SHA256SignatureHeader is the GitHub header key used to pass the HMAC-SHA256 hexdigest.
 	SHA256SignatureHeader = "X-Hub-Signature-256"
 	// EventTypeHeader is the GitHub header key used to pass the event type.
-	EventTypeHeader = "X-Github-Event"
+	EventTypeHeader = "X-GitHub-Event"
 	// DeliveryIDHeader is the GitHub header key used to pass the unique ID for the webhook event.
-	DeliveryIDHeader = "X-Github-Delivery"
+	DeliveryIDHeader = "X-GitHub-Delivery"
 )
 
 var (
@@ -321,7 +321,7 @@ func DeliveryID(r *http.Request) string {
 func ParseWebHook(messageType string, payload []byte) (interface{}, error) {
 	eventType, ok := messageToTypeName[messageType]
 	if !ok {
-		return nil, fmt.Errorf("unknown X-Github-Event in message: %v", messageType)
+		return nil, fmt.Errorf("unknown X-GitHub-Event in message: %v", messageType)
 	}
 
 	event := Event{
diff --git a/github/messages_test.go b/github/messages_test.go
index a2b9feac92b..e6508310f17 100644
--- a/github/messages_test.go
+++ b/github/messages_test.go
@@ -607,7 +607,7 @@ func TestDeliveryID(t *testing.T) {
 	if err != nil {
 		t.Fatalf("DeliveryID: %v", err)
 	}
-	req.Header.Set("X-Github-Delivery", id)
+	req.Header.Set("X-GitHub-Delivery", id)
 
 	got := DeliveryID(req)
 	if got != id {