diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go
index 8f911aa5848..f37171c65a3 100644
--- a/metricbeat/module/vsphere/datastore/datastore.go
+++ b/metricbeat/module/vsphere/datastore/datastore.go
@@ -38,12 +38,12 @@ func init() {
 	)
 }
 
-// MetricSet type defines all fields of the MetricSet
+// MetricSet type defines all fields of the MetricSet.
 type MetricSet struct {
 	*vsphere.MetricSet
 }
 
-// NewMetricSet create a new instance of the MetricSet
+// New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	ms, err := vsphere.NewMetricSet(base)
 	if err != nil {
diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go
index c294f7c9c26..6f7d19b5d57 100644
--- a/metricbeat/module/vsphere/host/host.go
+++ b/metricbeat/module/vsphere/host/host.go
@@ -43,12 +43,12 @@ func init() {
 	)
 }
 
-// MetricSet type defines all fields of the MetricSet
+// MetricSet type defines all fields of the MetricSet.
 type MetricSet struct {
 	*vsphere.MetricSet
 }
 
-// NewMetricSet create a new instance of the MetricSet
+// New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	ms, err := vsphere.NewMetricSet(base)
 	if err != nil {
diff --git a/metricbeat/module/vsphere/metricset.go b/metricbeat/module/vsphere/metricset.go
index b95f1e77a1d..c7089b52ac7 100644
--- a/metricbeat/module/vsphere/metricset.go
+++ b/metricbeat/module/vsphere/metricset.go
@@ -29,14 +29,14 @@ var HostParser = parse.URLHostParserBuilder{
 	DefaultPath:   "/sdk",
 }.Build()
 
-// MetricSet type defines all fields of the MetricSet
+// MetricSet type defines all fields of the MetricSet.
 type MetricSet struct {
 	mb.BaseMetricSet
 	Insecure bool
 	HostURL  *url.URL
 }
 
-// NewMetricSet create a new instance of the MetricSet
+// NewMetricSet creates a new instance of the MetricSet.
 func NewMetricSet(base mb.BaseMetricSet) (*MetricSet, error) {
 	config := struct {
 		Insecure bool `config:"insecure"`
diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go
index 0e9da7fc2d6..13af0168765 100644
--- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go
+++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go
@@ -43,13 +43,13 @@ func init() {
 	)
 }
 
-// MetricSet type defines all fields of the MetricSet
+// MetricSet type defines all fields of the MetricSet.
 type MetricSet struct {
 	*vsphere.MetricSet
 	GetCustomFields bool
 }
 
-// NewMetricSet create a new instance of the MetricSet
+// New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	ms, err := vsphere.NewMetricSet(base)
 	if err != nil {