diff --git a/contrib/config/icinga2_demo0_basic.conf b/contrib/config/icinga2_demo0_basic.conf
index e553ecec8..d87dc0461 100644
--- a/contrib/config/icinga2_demo0_basic.conf
+++ b/contrib/config/icinga2_demo0_basic.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/contrib/config/icinga2_demo1_hostcheck.conf b/contrib/config/icinga2_demo1_hostcheck.conf
index 63be24390..d2c46f3ac 100644
--- a/contrib/config/icinga2_demo1_hostcheck.conf
+++ b/contrib/config/icinga2_demo1_hostcheck.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/contrib/config/icinga2_demo2_hostgroup.conf b/contrib/config/icinga2_demo2_hostgroup.conf
index 43aa2330e..561656d00 100644
--- a/contrib/config/icinga2_demo2_hostgroup.conf
+++ b/contrib/config/icinga2_demo2_hostgroup.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/contrib/config/icinga2_demo3_abstract.conf b/contrib/config/icinga2_demo3_abstract.conf
index 8277c2b60..ac7e0f8f0 100644
--- a/contrib/config/icinga2_demo3_abstract.conf
+++ b/contrib/config/icinga2_demo3_abstract.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/contrib/config/icinga2_demo4_distm.conf b/contrib/config/icinga2_demo4_distm.conf
index 5a1efc01d..e5796df30 100644
--- a/contrib/config/icinga2_demo4_distm.conf
+++ b/contrib/config/icinga2_demo4_distm.conf
@@ -78,7 +78,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/contrib/config/icinga2_demo5_distm_bench.conf b/contrib/config/icinga2_demo5_distm_bench.conf
index 64e8de9d6..0bd22f1df 100644
--- a/contrib/config/icinga2_demo5_distm_bench.conf
+++ b/contrib/config/icinga2_demo5_distm_bench.conf
@@ -78,7 +78,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index d431aad5c..318df23a2 100644
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -359,7 +359,7 @@ type Pizza {
 	%attribute number "radius",
 
 	%attribute dictionary "ingredients" {
-		%validator "native::ValidateIngredients",
+		%validator "ValidateIngredients",
 
 		%attribute string "*",
 
@@ -381,7 +381,7 @@ dictionary.
 * Elements in the ingredients dictionary can be either a string or a dictionary.
 * If they're a dictionary they may contain attributes "quantity" (of type
 number) and "name" (of type string).
-* The script function "native::ValidateIngredients" is run to perform further
+* The script function "ValidateIngredients" is run to perform further
 validation of the ingredients dictionary.
 * Pizza objects may contain attribute matching the pattern "custom::*" of any
 type.
@@ -614,7 +614,7 @@ object Service "localhost-uptime" {
   alias = "localhost Uptime",
 
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   },
 
   check_command = "$plugindir$/check_snmp -H $address$ -C $community$ -o $oid$",
@@ -649,7 +649,7 @@ Attribute: methods - check
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The check type of the service. For now only external check plugins are
-supported ("native::PluginCheck").
+supported ("PluginCheck").
 
 Attribute: check_command
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -869,7 +869,7 @@ local object Component "delegation" {
 
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   },
 
   macros = {
diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32
index 72ef7516a..be79b1f6d 100644
--- a/etc/icinga2/icinga2.conf.win32
+++ b/etc/icinga2/icinga2.conf.win32
@@ -71,7 +71,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 
diff --git a/lib/icinga/pluginchecktask.cpp b/lib/icinga/pluginchecktask.cpp
index 62ed38d15..f88cfce95 100644
--- a/lib/icinga/pluginchecktask.cpp
+++ b/lib/icinga/pluginchecktask.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION("native::PluginCheck",  &PluginCheckTask::ScriptFunc);
+REGISTER_SCRIPTFUNCTION("PluginCheck",  &PluginCheckTask::ScriptFunc);
 
 PluginCheckTask::PluginCheckTask(const ScriptTask::Ptr& task, const Process::Ptr& process)
 	: m_Task(task), m_Process(process)