diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index cd8569708..41f6c282a 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -425,7 +425,7 @@ set<Service::Ptr> Host::GetParentServices(void) const
 	return parents;
 }
 
-Dynamic::Ptr Host::CalculateDynamicMacros(void) const
+Dictionary::Ptr Host::CalculateDynamicMacros(void) const
 {
 	Dictionary::Ptr macros = boost::make_shared<Dictionary>();
 
diff --git a/lib/icinga/host.h b/lib/icinga/host.h
index e4f5b29a4..472a1cdb5 100644
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.h
@@ -51,7 +51,7 @@ public:
 	Dictionary::Ptr GetServiceDependencies(void) const;
 	String GetHostCheck(void) const;
 
-	Dynamic::Ptr CalculateDynamicMacros(void) const;
+	Dictionary::Ptr CalculateDynamicMacros(void) const;
 
 	shared_ptr<Service> GetHostCheckService(void) const;
 	set<Host::Ptr> GetParentHosts(void) const;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 2fe15cfb3..4563e1716 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -269,7 +269,7 @@ set<Service::Ptr> Service::GetParentServices(void) const
 	return parents;
 }
 
-Dynamic::Ptr Service::CalculateDynamicMacros(void) const
+Dictionary::Ptr Service::CalculateDynamicMacros(void) const
 {
 	Dictionary::Ptr macros = boost::make_shared<Dictionary>();
 
diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index bc9f4506c..d9f93fe6b 100644
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -106,7 +106,7 @@ public:
 	Dictionary::Ptr GetGroups(void) const;
 	String GetShortName(void) const;
 
-	Dynamic::Ptr CalculateDynamicMacros(void) const;
+	Dictionary::Ptr CalculateDynamicMacros(void) const;
 
 	set<Host::Ptr> GetParentHosts(void) const;
 	set<Service::Ptr> GetParentServices(void) const;