diff --git a/go/packages/loadmode_string.go b/go/packages/loadmode_string.go
index 7ea37e7eea..5c080d21b5 100644
--- a/go/packages/loadmode_string.go
+++ b/go/packages/loadmode_string.go
@@ -15,7 +15,7 @@ var allModes = []LoadMode{
 	NeedCompiledGoFiles,
 	NeedImports,
 	NeedDeps,
-	NeedExportsFile,
+	NeedExportFile,
 	NeedTypes,
 	NeedSyntax,
 	NeedTypesInfo,
@@ -28,7 +28,7 @@ var modeStrings = []string{
 	"NeedCompiledGoFiles",
 	"NeedImports",
 	"NeedDeps",
-	"NeedExportsFile",
+	"NeedExportFile",
 	"NeedTypes",
 	"NeedSyntax",
 	"NeedTypesInfo",
diff --git a/go/packages/packages.go b/go/packages/packages.go
index 4dfebc0f6e..8649e7fb4e 100644
--- a/go/packages/packages.go
+++ b/go/packages/packages.go
@@ -39,9 +39,6 @@ import (
 // Load may return more information than requested.
 type LoadMode int
 
-// TODO(matloob): When a V2 of go/packages is released, rename NeedExportsFile to
-// NeedExportFile to make it consistent with the Package field it's adding.
-
 const (
 	// NeedName adds Name and PkgPath.
 	NeedName LoadMode = 1 << iota
@@ -59,8 +56,8 @@ const (
 	// NeedDeps adds the fields requested by the LoadMode in the packages in Imports.
 	NeedDeps
 
-	// NeedExportsFile adds ExportFile.
-	NeedExportsFile
+	// NeedExportFile adds ExportFile.
+	NeedExportFile
 
 	// NeedTypes adds Types, Fset, and IllTyped.
 	NeedTypes
@@ -108,6 +105,9 @@ const (
 	// Deprecated: LoadAllSyntax exists for historical compatibility
 	// and should not be used. Please directly specify the needed fields using the Need values.
 	LoadAllSyntax = LoadSyntax | NeedDeps
+
+	// Deprecated: NeedExportsFile is a historical misspelling of NeedExportFile.
+	NeedExportsFile = NeedExportFile
 )
 
 // A Config specifies details about how packages should be loaded.
@@ -784,7 +784,7 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
 		if ld.requestedMode&NeedImports == 0 {
 			ld.pkgs[i].Imports = nil
 		}
-		if ld.requestedMode&NeedExportsFile == 0 {
+		if ld.requestedMode&NeedExportFile == 0 {
 			ld.pkgs[i].ExportFile = ""
 		}
 		if ld.requestedMode&NeedTypes == 0 {
@@ -1266,5 +1266,5 @@ func impliedLoadMode(loadMode LoadMode) LoadMode {
 }
 
 func usesExportData(cfg *Config) bool {
-	return cfg.Mode&NeedExportsFile != 0 || cfg.Mode&NeedTypes != 0 && cfg.Mode&NeedDeps == 0
+	return cfg.Mode&NeedExportFile != 0 || cfg.Mode&NeedTypes != 0 && cfg.Mode&NeedDeps == 0
 }
diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go
index df95d6adfb..ef0a3285f0 100644
--- a/go/packages/packages_test.go
+++ b/go/packages/packages_test.go
@@ -2244,8 +2244,8 @@ func TestLoadModeStrings(t *testing.T) {
 			"LoadMode(NeedDeps)",
 		},
 		{
-			packages.NeedExportsFile,
-			"LoadMode(NeedExportsFile)",
+			packages.NeedExportFile,
+			"LoadMode(NeedExportFile)",
 		},
 		{
 			packages.NeedTypes,
@@ -2264,12 +2264,12 @@ func TestLoadModeStrings(t *testing.T) {
 			"LoadMode(NeedTypesSizes)",
 		},
 		{
-			packages.NeedName | packages.NeedExportsFile,
-			"LoadMode(NeedName|NeedExportsFile)",
+			packages.NeedName | packages.NeedExportFile,
+			"LoadMode(NeedName|NeedExportFile)",
 		},
 		{
-			packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedImports | packages.NeedDeps | packages.NeedExportsFile | packages.NeedTypes | packages.NeedSyntax | packages.NeedTypesInfo | packages.NeedTypesSizes,
-			"LoadMode(NeedName|NeedFiles|NeedCompiledGoFiles|NeedImports|NeedDeps|NeedExportsFile|NeedTypes|NeedSyntax|NeedTypesInfo|NeedTypesSizes)",
+			packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedImports | packages.NeedDeps | packages.NeedExportFile | packages.NeedTypes | packages.NeedSyntax | packages.NeedTypesInfo | packages.NeedTypesSizes,
+			"LoadMode(NeedName|NeedFiles|NeedCompiledGoFiles|NeedImports|NeedDeps|NeedExportFile|NeedTypes|NeedSyntax|NeedTypesInfo|NeedTypesSizes)",
 		},
 		{
 			packages.NeedName | 8192,