diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index c55bc01a8..987720ed9 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -45,7 +45,7 @@ void IcingaApplication::StaticInitialize(void)
 	ScriptVariable::Set("EnableHostChecks", true);
 	ScriptVariable::Set("EnableServiceChecks", true);
 	ScriptVariable::Set("EnablePerfdata", true);
-	ScriptVariable::Set("NodeName", Utility::GetHostName());
+	ScriptVariable::Set("NodeName", Utility::GetFQDN());
 }
 
 REGISTER_STATSFUNCTION(IcingaApplicationStats, &IcingaApplication::StatsFunc);
diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp
index 0f25559f7..e3f5142ac 100644
--- a/lib/methods/nullchecktask.cpp
+++ b/lib/methods/nullchecktask.cpp
@@ -33,7 +33,7 @@ REGISTER_SCRIPTFUNCTION(NullCheck, &NullCheckTask::ScriptFunc);
 void NullCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr)
 {
 	String output = "Hello from ";
-	output += Utility::GetHostName();
+	output += Utility::GetFQDN();
 
 	Dictionary::Ptr perfdata = make_shared<Dictionary>();
 	perfdata->Set("time", Convert::ToDouble(Utility::GetTime()));
diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index 1ea4d3c7e..f4f78111b 100644
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -34,7 +34,7 @@ REGISTER_SCRIPTFUNCTION(RandomCheck, &RandomCheckTask::ScriptFunc);
 void RandomCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr)
 {
 	String output = "Hello from ";
-	output += Utility::GetHostName();
+	output += Utility::GetFQDN();
 
 	Dictionary::Ptr perfdata = make_shared<Dictionary>();
 	perfdata->Set("time", Convert::ToDouble(Utility::GetTime()));