diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt
index a14bed6..48e5fed 100644
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@@ -2471,17 +2471,17 @@ node_nfs_requests_total{method="Create",proto="4"} 15
 node_nfs_requests_total{method="CreateSession",proto="4"} 32
 node_nfs_requests_total{method="DeAllocate",proto="4"} 0
 node_nfs_requests_total{method="DelegReturn",proto="4"} 97
-node_nfs_requests_total{method="DestroyClientId",proto="4"} 0
+node_nfs_requests_total{method="DestroyClientID",proto="4"} 0
 node_nfs_requests_total{method="DestroySession",proto="4"} 67
-node_nfs_requests_total{method="ExchangeId",proto="4"} 58
-node_nfs_requests_total{method="FreeStateId",proto="4"} 0
+node_nfs_requests_total{method="ExchangeID",proto="4"} 58
+node_nfs_requests_total{method="FreeStateID",proto="4"} 0
 node_nfs_requests_total{method="FsInfo",proto="3"} 2
 node_nfs_requests_total{method="FsInfo",proto="4"} 68
 node_nfs_requests_total{method="FsLocations",proto="4"} 32
 node_nfs_requests_total{method="FsStat",proto="2"} 82
 node_nfs_requests_total{method="FsStat",proto="3"} 13332
 node_nfs_requests_total{method="FsidPresent",proto="4"} 11
-node_nfs_requests_total{method="GetAcl",proto="4"} 36
+node_nfs_requests_total{method="GetACL",proto="4"} 36
 node_nfs_requests_total{method="GetAttr",proto="2"} 57
 node_nfs_requests_total{method="GetAttr",proto="3"} 1.061909262e+09
 node_nfs_requests_total{method="GetDeviceInfo",proto="4"} 1
@@ -2541,17 +2541,17 @@ node_nfs_requests_total{method="SecinfoNoName",proto="4"} 0
 node_nfs_requests_total{method="Seek",proto="4"} 0
 node_nfs_requests_total{method="Sequence",proto="4"} 13
 node_nfs_requests_total{method="ServerCaps",proto="4"} 56
-node_nfs_requests_total{method="SetAcl",proto="4"} 49
+node_nfs_requests_total{method="SetACL",proto="4"} 49
 node_nfs_requests_total{method="SetAttr",proto="2"} 74
 node_nfs_requests_total{method="SetAttr",proto="3"} 48906
-node_nfs_requests_total{method="SetClientId",proto="4"} 12
-node_nfs_requests_total{method="SetClientIdConfirm",proto="4"} 84
+node_nfs_requests_total{method="SetClientID",proto="4"} 12
+node_nfs_requests_total{method="SetClientIDConfirm",proto="4"} 84
 node_nfs_requests_total{method="Setattr",proto="4"} 73
 node_nfs_requests_total{method="StatFs",proto="4"} 86
 node_nfs_requests_total{method="SymLink",proto="2"} 53
 node_nfs_requests_total{method="SymLink",proto="3"} 0
 node_nfs_requests_total{method="Symlink",proto="4"} 84
-node_nfs_requests_total{method="TestStateId",proto="4"} 0
+node_nfs_requests_total{method="TestStateID",proto="4"} 0
 node_nfs_requests_total{method="WrCache",proto="2"} 86
 node_nfs_requests_total{method="Write",proto="2"} 0
 node_nfs_requests_total{method="Write",proto="3"} 2.570425e+06
diff --git a/collector/fixtures/e2e-ppc64le-output.txt b/collector/fixtures/e2e-ppc64le-output.txt
index 05023ac..e000f6f 100644
--- a/collector/fixtures/e2e-ppc64le-output.txt
+++ b/collector/fixtures/e2e-ppc64le-output.txt
@@ -2472,17 +2472,17 @@ node_nfs_requests_total{method="Create",proto="4"} 15
 node_nfs_requests_total{method="CreateSession",proto="4"} 32
 node_nfs_requests_total{method="DeAllocate",proto="4"} 0
 node_nfs_requests_total{method="DelegReturn",proto="4"} 97
-node_nfs_requests_total{method="DestroyClientId",proto="4"} 0
+node_nfs_requests_total{method="DestroyClientID",proto="4"} 0
 node_nfs_requests_total{method="DestroySession",proto="4"} 67
-node_nfs_requests_total{method="ExchangeId",proto="4"} 58
-node_nfs_requests_total{method="FreeStateId",proto="4"} 0
+node_nfs_requests_total{method="ExchangeID",proto="4"} 58
+node_nfs_requests_total{method="FreeStateID",proto="4"} 0
 node_nfs_requests_total{method="FsInfo",proto="3"} 2
 node_nfs_requests_total{method="FsInfo",proto="4"} 68
 node_nfs_requests_total{method="FsLocations",proto="4"} 32
 node_nfs_requests_total{method="FsStat",proto="2"} 82
 node_nfs_requests_total{method="FsStat",proto="3"} 13332
 node_nfs_requests_total{method="FsidPresent",proto="4"} 11
-node_nfs_requests_total{method="GetAcl",proto="4"} 36
+node_nfs_requests_total{method="GetACL",proto="4"} 36
 node_nfs_requests_total{method="GetAttr",proto="2"} 57
 node_nfs_requests_total{method="GetAttr",proto="3"} 1.061909262e+09
 node_nfs_requests_total{method="GetDeviceInfo",proto="4"} 1
@@ -2542,17 +2542,17 @@ node_nfs_requests_total{method="SecinfoNoName",proto="4"} 0
 node_nfs_requests_total{method="Seek",proto="4"} 0
 node_nfs_requests_total{method="Sequence",proto="4"} 13
 node_nfs_requests_total{method="ServerCaps",proto="4"} 56
-node_nfs_requests_total{method="SetAcl",proto="4"} 49
+node_nfs_requests_total{method="SetACL",proto="4"} 49
 node_nfs_requests_total{method="SetAttr",proto="2"} 74
 node_nfs_requests_total{method="SetAttr",proto="3"} 48906
-node_nfs_requests_total{method="SetClientId",proto="4"} 12
-node_nfs_requests_total{method="SetClientIdConfirm",proto="4"} 84
+node_nfs_requests_total{method="SetClientID",proto="4"} 12
+node_nfs_requests_total{method="SetClientIDConfirm",proto="4"} 84
 node_nfs_requests_total{method="Setattr",proto="4"} 73
 node_nfs_requests_total{method="StatFs",proto="4"} 86
 node_nfs_requests_total{method="SymLink",proto="2"} 53
 node_nfs_requests_total{method="SymLink",proto="3"} 0
 node_nfs_requests_total{method="Symlink",proto="4"} 84
-node_nfs_requests_total{method="TestStateId",proto="4"} 0
+node_nfs_requests_total{method="TestStateID",proto="4"} 0
 node_nfs_requests_total{method="WrCache",proto="2"} 86
 node_nfs_requests_total{method="Write",proto="2"} 0
 node_nfs_requests_total{method="Write",proto="3"} 2.570425e+06
diff --git a/vendor/github.com/prometheus/procfs/nfs/nfs.go b/vendor/github.com/prometheus/procfs/nfs/nfs.go
index e2185b7..651bf68 100644
--- a/vendor/github.com/prometheus/procfs/nfs/nfs.go
+++ b/vendor/github.com/prometheus/procfs/nfs/nfs.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package nfsd implements parsing of /proc/net/rpc/nfsd.
+// Package nfs implements parsing of /proc/net/rpc/nfsd.
 // Fields are documented in https://www.svennd.be/nfsd-stats-explained-procnetrpcnfsd/
 package nfs
 
@@ -136,8 +136,8 @@ type ClientV4Stats struct {
 	Setattr            uint64
 	FsInfo             uint64
 	Renew              uint64
-	SetClientId        uint64
-	SetClientIdConfirm uint64
+	SetClientID        uint64
+	SetClientIDConfirm uint64
 	Lock               uint64
 	Lockt              uint64
 	Locku              uint64
@@ -156,13 +156,13 @@ type ClientV4Stats struct {
 	ReadDir            uint64
 	ServerCaps         uint64
 	DelegReturn        uint64
-	GetAcl             uint64
-	SetAcl             uint64
+	GetACL             uint64
+	SetACL             uint64
 	FsLocations        uint64
 	ReleaseLockowner   uint64
 	Secinfo            uint64
 	FsidPresent        uint64
-	ExchangeId         uint64
+	ExchangeID         uint64
 	CreateSession      uint64
 	DestroySession     uint64
 	Sequence           uint64
@@ -173,11 +173,11 @@ type ClientV4Stats struct {
 	LayoutCommit       uint64
 	LayoutReturn       uint64
 	SecinfoNoName      uint64
-	TestStateId        uint64
-	FreeStateId        uint64
+	TestStateID        uint64
+	FreeStateID        uint64
 	GetDeviceList      uint64
 	BindConnToSession  uint64
-	DestroyClientId    uint64
+	DestroyClientID    uint64
 	Seek               uint64
 	Allocate           uint64
 	DeAllocate         uint64
@@ -238,7 +238,7 @@ type V4Ops struct {
 	RelLockOwner uint64
 }
 
-// RPCStats models all stats from /proc/net/rpc/nfs.
+// ClientRPCStats models all stats from /proc/net/rpc/nfs.
 type ClientRPCStats struct {
 	Network       Network
 	ClientRPC     ClientRPC
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse.go b/vendor/github.com/prometheus/procfs/nfs/parse.go
index 8f568f0..95a83cc 100644
--- a/vendor/github.com/prometheus/procfs/nfs/parse.go
+++ b/vendor/github.com/prometheus/procfs/nfs/parse.go
@@ -204,8 +204,8 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		Setattr:            v[10],
 		FsInfo:             v[11],
 		Renew:              v[12],
-		SetClientId:        v[13],
-		SetClientIdConfirm: v[14],
+		SetClientID:        v[13],
+		SetClientIDConfirm: v[14],
 		Lock:               v[15],
 		Lockt:              v[16],
 		Locku:              v[17],
@@ -224,13 +224,13 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		ReadDir:            v[30],
 		ServerCaps:         v[31],
 		DelegReturn:        v[32],
-		GetAcl:             v[33],
-		SetAcl:             v[34],
+		GetACL:             v[33],
+		SetACL:             v[34],
 		FsLocations:        v[35],
 		ReleaseLockowner:   v[36],
 		Secinfo:            v[37],
 		FsidPresent:        v[38],
-		ExchangeId:         v[39],
+		ExchangeID:         v[39],
 		CreateSession:      v[40],
 		DestroySession:     v[41],
 		Sequence:           v[42],
@@ -241,11 +241,11 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		LayoutCommit:       v[47],
 		LayoutReturn:       v[48],
 		SecinfoNoName:      v[49],
-		TestStateId:        v[50],
-		FreeStateId:        v[51],
+		TestStateID:        v[50],
+		FreeStateID:        v[51],
 		GetDeviceList:      v[52],
 		BindConnToSession:  v[53],
-		DestroyClientId:    v[54],
+		DestroyClientID:    v[54],
 		Seek:               v[55],
 		Allocate:           v[56],
 		DeAllocate:         v[57],
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 3d8eec0..a147c7b 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -165,38 +165,38 @@
 		{
 			"checksumSHA1": "Etvt6mgzvD7ARf4Ux03LHfgSlzU=",
 			"path": "github.com/prometheus/procfs",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
 			"checksumSHA1": "O64FotgWPYIpl3m2gvTEPIem+xg=",
 			"path": "github.com/prometheus/procfs/bcache",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
 			"checksumSHA1": "lv9rIcjbVEGo8AT1UCUZXhXrfQc=",
 			"path": "github.com/prometheus/procfs/internal/util",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
-			"checksumSHA1": "EekY1iRG9JY74mDD0jsbFCWbAFs=",
+			"checksumSHA1": "HSP5hVT0CNMRa8+Xtz4z2Ic5U0E=",
 			"path": "github.com/prometheus/procfs/nfs",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
 			"checksumSHA1": "pqTCYsAj0qGsfJTkrAVQPUMN2qU=",
 			"path": "github.com/prometheus/procfs/sysfs",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
 			"checksumSHA1": "yItvTQLUVqm/ArLEbvEhqG0T5a0=",
 			"path": "github.com/prometheus/procfs/xfs",
-			"revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349",
-			"revisionTime": "2018-03-10T14:15:09Z"
+			"revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea",
+			"revisionTime": "2018-03-21T23:08:12Z"
 		},
 		{
 			"checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=",