diff --git a/x-pack/auditbeat/include/list.go b/x-pack/auditbeat/include/list.go
index f1e99abfbd2b..1820d2ce9a0b 100644
--- a/x-pack/auditbeat/include/list.go
+++ b/x-pack/auditbeat/include/list.go
@@ -7,5 +7,5 @@ package include
 import (
 	// Include all Auditbeat modules so that they register their
 	// factories with the global registry.
-	_ "github.com/elastic/beats/x-pack/auditbeat/module/sysinfo/host"
+	_ "github.com/elastic/beats/x-pack/auditbeat/module/system/host"
 )
diff --git a/x-pack/auditbeat/module/sysinfo/_meta/fields.yml b/x-pack/auditbeat/module/sysinfo/_meta/fields.yml
deleted file mode 100644
index f0d6e49a2ab6..000000000000
--- a/x-pack/auditbeat/module/sysinfo/_meta/fields.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- key: sysinfo
-  title: Sysinfo
-  description: These are the fields generated by the sysinfo module.
-  fields:
diff --git a/x-pack/auditbeat/module/sysinfo/_meta/config.yml.tmpl b/x-pack/auditbeat/module/system/_meta/config.yml.tmpl
similarity index 92%
rename from x-pack/auditbeat/module/sysinfo/_meta/config.yml.tmpl
rename to x-pack/auditbeat/module/system/_meta/config.yml.tmpl
index 735739450a85..80e133ae740b 100644
--- a/x-pack/auditbeat/module/sysinfo/_meta/config.yml.tmpl
+++ b/x-pack/auditbeat/module/system/_meta/config.yml.tmpl
@@ -1,6 +1,6 @@
 {{ if .Reference -}}
 {{ end -}}
-- module: sysinfo
+- module: system
   {{ if eq .GOOS "darwin" -}}
   metricsets:
     - host
diff --git a/x-pack/auditbeat/module/sysinfo/_meta/docs.asciidoc b/x-pack/auditbeat/module/system/_meta/docs.asciidoc
similarity index 73%
rename from x-pack/auditbeat/module/sysinfo/_meta/docs.asciidoc
rename to x-pack/auditbeat/module/system/_meta/docs.asciidoc
index b73eec3fd3f5..d20f430847e4 100644
--- a/x-pack/auditbeat/module/sysinfo/_meta/docs.asciidoc
+++ b/x-pack/auditbeat/module/system/_meta/docs.asciidoc
@@ -1,6 +1,6 @@
-== Sysinfo Module
+== System Module
 
-The `sysinfo` module ... TODO.
+The `system` module ... TODO.
 
 The module is implemented for Linux, macOS (Darwin), and Windows.
 
@@ -16,7 +16,7 @@ TODO
 
 [source,yaml]
 ----
-- module: sysinfo
+- module: system
 ----
 
 *`some_option`*:: TODO
diff --git a/x-pack/auditbeat/module/system/_meta/fields.yml b/x-pack/auditbeat/module/system/_meta/fields.yml
new file mode 100644
index 000000000000..36667c7b0025
--- /dev/null
+++ b/x-pack/auditbeat/module/system/_meta/fields.yml
@@ -0,0 +1,4 @@
+- key: system
+  title: System
+  description: These are the fields generated by the system module.
+  fields:
diff --git a/x-pack/auditbeat/module/sysinfo/host/_meta/docs.asciidoc b/x-pack/auditbeat/module/system/host/_meta/docs.asciidoc
similarity index 69%
rename from x-pack/auditbeat/module/sysinfo/host/_meta/docs.asciidoc
rename to x-pack/auditbeat/module/system/host/_meta/docs.asciidoc
index 7b0dabfb6fcb..d8e6689c4694 100644
--- a/x-pack/auditbeat/module/sysinfo/host/_meta/docs.asciidoc
+++ b/x-pack/auditbeat/module/system/host/_meta/docs.asciidoc
@@ -1,4 +1,4 @@
-The Sysinfo `host` metricset provides ... TODO.
+The System `host` metricset provides ... TODO.
 
 The module is implemented for Linux, macOS (Darwin), and Windows.
 
diff --git a/x-pack/auditbeat/module/sysinfo/host/_meta/fields.yml b/x-pack/auditbeat/module/system/host/_meta/fields.yml
similarity index 100%
rename from x-pack/auditbeat/module/sysinfo/host/_meta/fields.yml
rename to x-pack/auditbeat/module/system/host/_meta/fields.yml
diff --git a/x-pack/auditbeat/module/sysinfo/host/config.go b/x-pack/auditbeat/module/system/host/config.go
similarity index 100%
rename from x-pack/auditbeat/module/sysinfo/host/config.go
rename to x-pack/auditbeat/module/system/host/config.go
diff --git a/x-pack/auditbeat/module/sysinfo/host/host.go b/x-pack/auditbeat/module/system/host/host.go
similarity index 97%
rename from x-pack/auditbeat/module/sysinfo/host/host.go
rename to x-pack/auditbeat/module/system/host/host.go
index 5a9aafafff9a..1b630a7e4ea5 100644
--- a/x-pack/auditbeat/module/sysinfo/host/host.go
+++ b/x-pack/auditbeat/module/system/host/host.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	moduleName    = "sysinfo"
+	moduleName    = "system"
 	metricsetName = "host"
 )