diff --git a/devapp/owners/table.go b/devapp/owners/table.go
index 6d5e54a..785bd1a 100644
--- a/devapp/owners/table.go
+++ b/devapp/owners/table.go
@@ -39,7 +39,7 @@
 	guodongli    = gh("guodongli-google")
 	gri          = gh("griesemer")
 	hanwen       = gh("hanwen")
-	heschik      = gh("heschik")
+	heschi       = gh("heschi")
 	hyangah      = gh("hyangah")
 	iant         = gh("ianlancetaylor")
 	iancottrell  = gh("ianthehat")
@@ -95,7 +95,7 @@
 	},
 
 	"build": {
-		Primary: []Owner{dmitshur, bradfitz, amedee},
+		Primary: []Owner{dmitshur, bradfitz, amedee, heschi},
 	},
 	"build/maintner/cmd/maintserve": {
 		Primary: []Owner{dmitshur},
@@ -669,7 +669,7 @@
 		Secondary: []Owner{agnivade, bradfitz, gri, kevinburke},
 	},
 	"tools/cmd/goimports": {
-		Primary:   []Owner{heschik},
+		Primary:   []Owner{heschi},
 		Secondary: []Owner{bradfitz},
 	},
 	"tools/cmd/present2md": {
@@ -754,7 +754,7 @@
 		Secondary: []Owner{iancottrell},
 	},
 	"tools/imports": {
-		Primary: []Owner{heschik},
+		Primary: []Owner{heschi},
 	},
 	"tools/internal/analysisinternal": {
 		Primary:   []Owner{rstambler},
@@ -765,16 +765,16 @@
 		Secondary: []Owner{jayconrod, matloob, bcmills},
 	},
 	"tools/internal/fastwalk": {
-		Primary: []Owner{heschik},
+		Primary: []Owner{heschi},
 	},
 	"tools/internal/gocommand": {
-		Primary: []Owner{heschik},
+		Primary: []Owner{heschi},
 	},
 	"tools/internal/gopathwalk": {
-		Primary: []Owner{heschik},
+		Primary: []Owner{heschi},
 	},
 	"tools/internal/imports": {
-		Primary: []Owner{heschik},
+		Primary: []Owner{heschi},
 	},
 	"tools/internal/jsonrpc2": {
 		Primary:   []Owner{iancottrell},
@@ -811,7 +811,7 @@
 	},
 	"tools/internal/span": {
 		Primary:   []Owner{iancottrell},
-		Secondary: []Owner{heschik},
+		Secondary: []Owner{heschi},
 	},
 	"tools/internal/telemetry": {
 		Primary:   []Owner{iancottrell},
diff --git a/internal/gophers/gophers.go b/internal/gophers/gophers.go
index 5dcffc2..31b2336 100644
--- a/internal/gophers/gophers.go
+++ b/internal/gophers/gophers.go
@@ -1174,7 +1174,7 @@
 	addPerson("Herbie Ong", "herbie@google.com", "17100@62eb7196-b449-3ce5-99f1-c037f21e1705")
 	addPerson("Herbie Ong", "herbie@google.com", "@cybrcodr")
 	addPerson("Heschi Kreinick", "heschi@google.com", "17090@62eb7196-b449-3ce5-99f1-c037f21e1705")
-	addPerson("Heschi Kreinick", "heschi@google.com", "@heschik")
+	addPerson("Heschi Kreinick", "heschi@google.com", "@heschi")
 	addPerson("Hidetatsu Yaginuma", "ygnmhdtt@gmail.com", "@yagi5")
 	addPerson("Hilko Bengen", "bengen@hilluzination.de")
 	addPerson("Hiroaki Nakamura", "hnakamur@gmail.com")