diff --git a/cmd/config/cmd/cat.go b/cmd/config/cmd/cat.go
index 2d2138416..4f994c8dd 100644
--- a/cmd/config/cmd/cat.go
+++ b/cmd/config/cmd/cat.go
@@ -111,7 +111,7 @@ func (r *CatRunner) runE(c *cobra.Command, args []string) error {
 		Writer:                c.OutOrStdout(),
 		KeepReaderAnnotations: r.KeepAnnotations,
 		WrappingKind:          r.WrapKind,
-		WrappingApiVersion:    r.WrapApiVersion,
+		WrappingAPIVersion:    r.WrapApiVersion,
 		FunctionConfig:        functionConfig,
 		Style:                 yaml.GetStyle(r.Styles...),
 	})
diff --git a/cmd/config/cmd/cmdwrap.go b/cmd/config/cmd/cmdwrap.go
index 389fbeaab..822a5e3c2 100644
--- a/cmd/config/cmd/cmdwrap.go
+++ b/cmd/config/cmd/cmdwrap.go
@@ -134,7 +134,7 @@ func (r *WrapRunner) runE(c *cobra.Command, args []string) error {
 			KeepReaderAnnotations: true,
 			Writer:                c.OutOrStdout(),
 			WrappingKind:          kio.ResourceListKind,
-			WrappingApiVersion:    kio.ResourceListApiVersion}}}.Execute()
+			WrappingAPIVersion:    kio.ResourceListAPIVersion}}}.Execute()
 	if err != nil {
 		return err
 	}
diff --git a/cmd/config/cmd/cmdxargs.go b/cmd/config/cmd/cmdxargs.go
index 9767d1549..c9e298f40 100644
--- a/cmd/config/cmd/cmdxargs.go
+++ b/cmd/config/cmd/cmdxargs.go
@@ -186,7 +186,7 @@ func (r *XArgsRunner) runE(c *cobra.Command, _ []string) error {
 			if version := rw.FunctionConfig.Field("apiVersion"); !yaml.IsFieldEmpty(version) {
 				version.Value.YNode().Value = r.WrapVersion
 			}
-			rw.WrappingApiVersion = r.WrapVersion
+			rw.WrappingAPIVersion = r.WrapVersion
 		}
 		return nil
 	}(); err != nil {
diff --git a/kyaml/kio/byteio_reader.go b/kyaml/kio/byteio_reader.go
index 0161172e0..80e52ef87 100644
--- a/kyaml/kio/byteio_reader.go
+++ b/kyaml/kio/byteio_reader.go
@@ -17,7 +17,7 @@ import (
 
 const (
 	ResourceListKind       = "ResourceList"
-	ResourceListApiVersion = "config.kubernetes.io/v1alpha1"
+	ResourceListAPIVersion = "config.kubernetes.io/v1alpha1"
 )
 
 // ByteReadWriter reads from an input and writes to an output.
@@ -41,7 +41,7 @@ type ByteReadWriter struct {
 
 	FunctionConfig *yaml.RNode
 
-	WrappingApiVersion string
+	WrappingAPIVersion string
 	WrappingKind       string
 }
 
@@ -52,7 +52,7 @@ func (rw *ByteReadWriter) Read() ([]*yaml.RNode, error) {
 	}
 	val, err := b.Read()
 	rw.FunctionConfig = b.FunctionConfig
-	rw.WrappingApiVersion = b.WrappingApiVersion
+	rw.WrappingAPIVersion = b.WrappingAPIVersion
 	rw.WrappingKind = b.WrappingKind
 	return val, errors.Wrap(err)
 }
@@ -63,7 +63,7 @@ func (rw *ByteReadWriter) Write(nodes []*yaml.RNode) error {
 		KeepReaderAnnotations: rw.KeepReaderAnnotations,
 		Style:                 rw.Style,
 		FunctionConfig:        rw.FunctionConfig,
-		WrappingApiVersion:    rw.WrappingApiVersion,
+		WrappingAPIVersion:    rw.WrappingAPIVersion,
 		WrappingKind:          rw.WrappingKind,
 	}.Write(nodes)
 }
@@ -88,9 +88,9 @@ type ByteReader struct {
 	// DisableUnwrapping prevents Resources in Lists and ResourceLists from being unwrapped
 	DisableUnwrapping bool
 
-	// WrappingApiVersion is set by Read(), and is the apiVersion of the object that
+	// WrappingAPIVersion is set by Read(), and is the apiVersion of the object that
 	// the read objects were originally wrapped in.
-	WrappingApiVersion string
+	WrappingAPIVersion string
 
 	// WrappingKind is set by Read(), and is the kind of the object that
 	// the read objects were originally wrapped in.
@@ -140,7 +140,7 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
 			node.Field("items") != nil {
 
 			r.WrappingKind = meta.Kind
-			r.WrappingApiVersion = meta.ApiVersion
+			r.WrappingAPIVersion = meta.APIVersion
 
 			// unwrap the list
 			fc := node.Field("functionConfig")
diff --git a/kyaml/kio/byteio_reader_test.go b/kyaml/kio/byteio_reader_test.go
index a8037bab4..7723ec94f 100644
--- a/kyaml/kio/byteio_reader_test.go
+++ b/kyaml/kio/byteio_reader_test.go
@@ -86,7 +86,7 @@ elems:
 `, r.FunctionConfig.MustString())
 
 	assert.Equal(t, ResourceListKind, r.WrappingKind)
-	assert.Equal(t, ResourceListApiVersion, r.WrappingApiVersion)
+	assert.Equal(t, ResourceListAPIVersion, r.WrappingAPIVersion)
 
 }
 
@@ -131,7 +131,7 @@ spec:
 	// verify the function config
 	assert.Nil(t, r.FunctionConfig)
 	assert.Equal(t, "List", r.WrappingKind)
-	assert.Equal(t, "v1", r.WrappingApiVersion)
+	assert.Equal(t, "v1", r.WrappingAPIVersion)
 }
 
 // TestByteReader_Read tests the default Read behavior
diff --git a/kyaml/kio/byteio_writer.go b/kyaml/kio/byteio_writer.go
index 0fe06173f..2a5498519 100644
--- a/kyaml/kio/byteio_writer.go
+++ b/kyaml/kio/byteio_writer.go
@@ -35,8 +35,8 @@ type ByteWriter struct {
 	// ByteWriter will wrap the Resources in a List .items field.
 	WrappingKind string
 
-	// WrappingApiVersion is the apiVersion for WrappingKind
-	WrappingApiVersion string
+	// WrappingAPIVersion is the apiVersion for WrappingKind
+	WrappingAPIVersion string
 
 	// Sort if set, will cause ByteWriter to sort the the nodes before writing them.
 	Sort bool
@@ -102,7 +102,7 @@ func (w ByteWriter) Write(nodes []*yaml.RNode) error {
 		Style: w.Style,
 		Content: []*yaml.Node{
 			{Kind: yaml.ScalarNode, Value: "apiVersion"},
-			{Kind: yaml.ScalarNode, Value: w.WrappingApiVersion},
+			{Kind: yaml.ScalarNode, Value: w.WrappingAPIVersion},
 			{Kind: yaml.ScalarNode, Value: "kind"},
 			{Kind: yaml.ScalarNode, Value: w.WrappingKind},
 			{Kind: yaml.ScalarNode, Value: "items"}, items,
diff --git a/kyaml/kio/byteio_writer_test.go b/kyaml/kio/byteio_writer_test.go
index 62bd3e1ed..27bcf685f 100644
--- a/kyaml/kio/byteio_writer_test.go
+++ b/kyaml/kio/byteio_writer_test.go
@@ -40,7 +40,7 @@ g:
 		Writer:             buff,
 		FunctionConfig:     node3,
 		WrappingKind:       ResourceListKind,
-		WrappingApiVersion: ResourceListApiVersion}.
+		WrappingAPIVersion: ResourceListAPIVersion}.
 		Write([]*yaml.RNode{node2, node1})
 	if !assert.NoError(t, err) {
 		return
diff --git a/kyaml/kio/filters/container.go b/kyaml/kio/filters/container.go
index a4ec6f156..a45e96a89 100644
--- a/kyaml/kio/filters/container.go
+++ b/kyaml/kio/filters/container.go
@@ -78,7 +78,7 @@ func (c *ContainerFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 
 	// write the input
 	err = kio.ByteWriter{
-		WrappingApiVersion: kio.ResourceListApiVersion,
+		WrappingAPIVersion: kio.ResourceListAPIVersion,
 		WrappingKind:       kio.ResourceListKind,
 		Writer:             in, KeepReaderAnnotations: true, FunctionConfig: c.Config}.Write(input)
 	if err != nil {
diff --git a/kyaml/kio/filters/fmtr_test.go b/kyaml/kio/filters/fmtr_test.go
index cbfe115b0..2521a7ab5 100644
--- a/kyaml/kio/filters/fmtr_test.go
+++ b/kyaml/kio/filters/fmtr_test.go
@@ -459,7 +459,7 @@ func TestFormatFileOrDirectory_YamlExtFileWithJson(t *testing.T) {
 	f, err := ioutil.TempFile("", "yamlfmt*.yaml")
 	assert.NoError(t, err)
 	defer os.Remove(f.Name())
-	err = ioutil.WriteFile(f.Name(), testyaml.UnformattedJson1, 0600)
+	err = ioutil.WriteFile(f.Name(), testyaml.UnformattedJSON1, 0600)
 	assert.NoError(t, err)
 
 	// format the file
diff --git a/kyaml/kio/filters/merge.go b/kyaml/kio/filters/merge.go
index 65726e2b2..c41164fee 100644
--- a/kyaml/kio/filters/merge.go
+++ b/kyaml/kio/filters/merge.go
@@ -44,7 +44,7 @@ func (c MergeFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 			return nil, err
 		}
 		key := mergeKey{
-			apiVersion: meta.ApiVersion,
+			apiVersion: meta.APIVersion,
 			kind:       meta.Kind,
 			namespace:  meta.Namespace,
 			name:       meta.Name,
diff --git a/kyaml/kio/filters/merge3.go b/kyaml/kio/filters/merge3.go
index ccc9d50bc..f302eeada 100644
--- a/kyaml/kio/filters/merge3.go
+++ b/kyaml/kio/filters/merge3.go
@@ -113,7 +113,7 @@ func (ts *tuples) add(node *yaml.RNode) error {
 	for i := range ts.list {
 		t := ts.list[i]
 		if t.meta.Name == nodeMeta.Name && t.meta.Namespace == nodeMeta.Namespace &&
-			t.meta.ApiVersion == nodeMeta.ApiVersion && t.meta.Kind == nodeMeta.Kind {
+			t.meta.APIVersion == nodeMeta.APIVersion && t.meta.Kind == nodeMeta.Kind {
 			return t.add(node)
 		}
 	}
diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go
index f6559d189..67593d026 100644
--- a/kyaml/kio/filters/testyaml/testyaml.go
+++ b/kyaml/kio/filters/testyaml/testyaml.go
@@ -27,7 +27,7 @@ apiVersion: example.com/v1beta1
 kind: MyType2
 `)
 
-var UnformattedJson1 = []byte(`
+var UnformattedJSON1 = []byte(`
 {
   "spec": "a",
   "status": {"conditions": [3, 1, 2]},
diff --git a/kyaml/kio/tree.go b/kyaml/kio/tree.go
index c8a32356c..b96d99d62 100644
--- a/kyaml/kio/tree.go
+++ b/kyaml/kio/tree.go
@@ -285,8 +285,8 @@ func compareNodes(i, j *yaml.RNode) bool {
 	}
 
 	// compare apiVersion
-	if metai.ApiVersion != metaj.ApiVersion {
-		return metai.ApiVersion < metaj.ApiVersion
+	if metai.APIVersion != metaj.APIVersion {
+		return metai.APIVersion < metaj.APIVersion
 	}
 	return true
 }
diff --git a/kyaml/yaml/types.go b/kyaml/yaml/types.go
index 49b629db5..3e14575b3 100644
--- a/kyaml/yaml/types.go
+++ b/kyaml/yaml/types.go
@@ -221,8 +221,8 @@ func (m MapNodeSlice) Values() []*RNode {
 
 // ResourceMeta contains the metadata for a both Resource Type and Resource.
 type ResourceMeta struct {
-	// ApiVersion is the apiVersion field of a Resource
-	ApiVersion string `yaml:"apiVersion,omitempty"`
+	// APIVersion is the apiVersion field of a Resource
+	APIVersion string `yaml:"apiVersion,omitempty"`
 	// Kind is the kind field of a Resource
 	Kind string `yaml:"kind,omitempty"`
 	// ObjectMeta is the metadata field of a Resource