diff --git a/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp b/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
index 1d522fc50..0ac5b96b2 100644
--- a/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
@@ -32,9 +32,9 @@ class icinga-classicui {
     require => [ Class['apache'], Group['icingacmd'] ]
   }
 
-  icinga2::feature { 'statusdat': }
+  icinga2::feature { 'statusdata': }
 
   icinga2::feature { 'command': }
 
-  icinga2::feature { 'compat-log': }
+  icinga2::feature { 'compatlog': }
 }
diff --git a/doc/2.2-setting-up-icinga-classic-ui.md b/doc/2.2-setting-up-icinga-classic-ui.md
index 0d6b9052b..176e39eaf 100644
--- a/doc/2.2-setting-up-icinga-classic-ui.md
+++ b/doc/2.2-setting-up-icinga-classic-ui.md
@@ -33,7 +33,8 @@ by the Classic UI. The command pipe is also not enabled by default.
 
 You can use i2enfeature to enable these features:
 
-    # i2enfeature statusdat
+    # i2enfeature statusdata
+    # i2enfeature compatlog
     # i2enfeature command
 
 After enabling these features you will need to restart Icinga 2:
diff --git a/doc/2.6-running-icinga.md b/doc/2.6-running-icinga.md
index eaf193263..c5d427ddc 100644
--- a/doc/2.6-running-icinga.md
+++ b/doc/2.6-running-icinga.md
@@ -85,18 +85,18 @@ You can view a list of available feature configuration files:
     Syntax: i2enfeature <feature>
     Enables the specified feature.
 
-    Available features: statusdat
+    Available features: statusdata
 
 Using the `i2enfeature` command you can enable features:
 
-    # i2enfeature statusdat
-    Module 'statusdat' was enabled.
+    # i2enfeature statusdata
+    Module 'statusdata' was enabled.
     Make sure to restart Icinga 2 for these changes to take effect.
 
 You can disable features using the `i2disfeature` command:
 
-    # i2disfeature statusdat
-    Module 'statusdat' was disabled.
+    # i2disfeature statusdata
+    Module 'statusdata' was disabled.
     Make sure to restart Icinga 2 for these changes to take effect.
 
 > **Note**
diff --git a/doc/4.3-object-types.md b/doc/4.3-object-types.md
index df41c7c58..32c4a1633 100644
--- a/doc/4.3-object-types.md
+++ b/doc/4.3-object-types.md
@@ -575,7 +575,7 @@ Example:
     library "compat"
 
     object CompatLogger "my-log" {
-      log\_dir = "/var/log/icinga2/compat/compat-log",
+      log\_dir = "/var/log/icinga2/compat",
       rotation\_method = "HOURLY"
     }
 
diff --git a/etc/icinga2/features-available/Makefile.am b/etc/icinga2/features-available/Makefile.am
index fc37d95f5..777bb8b45 100644
--- a/etc/icinga2/features-available/Makefile.am
+++ b/etc/icinga2/features-available/Makefile.am
@@ -5,14 +5,14 @@ icinga2confdir = $(DESTDIR)${sysconfdir}/icinga2/features-available
 CONFIG_FILES = \
 	checker.conf \
 	command.conf \
-	compat-log.conf \
+	compatlog.conf \
 	graphite.conf \
 	ido-mysql.conf \
 	livestatus.conf \
 	notification.conf \
 	perfdata.conf \
 	syslog.conf \
-	statusdat.conf
+	statusdata.conf
 
 install-data-local:
 	@$(MKDIR_P) $(icinga2confdir); \
diff --git a/etc/icinga2/features-available/compat-log.conf b/etc/icinga2/features-available/compatlog.conf
similarity index 79%
rename from etc/icinga2/features-available/compat-log.conf
rename to etc/icinga2/features-available/compatlog.conf
index b322feb7b..58c5df716 100644
--- a/etc/icinga2/features-available/compat-log.conf
+++ b/etc/icinga2/features-available/compatlog.conf
@@ -5,5 +5,5 @@
 
 library "compat"
 
-object CompatLogger "compat-log" { }
+object CompatLogger "compatlog" { }
 
diff --git a/etc/icinga2/features-available/statusdat.conf b/etc/icinga2/features-available/statusdata.conf
similarity index 100%
rename from etc/icinga2/features-available/statusdat.conf
rename to etc/icinga2/features-available/statusdata.conf
diff --git a/tools/migration/icinga2-migration.conf b/tools/migration/icinga2-migration.conf
index 6b49be68f..7ad062052 100644
--- a/tools/migration/icinga2-migration.conf
+++ b/tools/migration/icinga2-migration.conf
@@ -5,8 +5,8 @@ include "../../etc/icinga2/features-available/checker.conf"
 include "../../etc/icinga2/features-available/notification.conf"
 
 //classic ui
-include "../../etc/icinga2/features-available/statusdat.conf"
-include "../../etc/icinga2/features-available/compat-log.conf"
+include "../../etc/icinga2/features-available/statusdata.conf"
+include "../../etc/icinga2/features-available/compatlog.conf"
 include "../../etc/icinga2/features-available/command.conf"
 
 include "conf/resource.conf"