diff --git a/manifests/compute.pp b/manifests/compute.pp
index 539ac862..380a89c6 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -100,10 +100,10 @@ class cloud::compute(
   if $use_syslog {
     $log_dir = false
     nova_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/nova'
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 3868aad6..32d1f9f9 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -455,10 +455,10 @@ class cloud::identity (
     $log_dir  = false
     $log_file = false
     keystone_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir  = '/var/log/keystone'
diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index 189d6724..12abaf01 100644
--- a/manifests/image/api.pp
+++ b/manifests/image/api.pp
@@ -97,10 +97,10 @@ class cloud::image::api(
     $log_file_api      = false
     $log_file_registry = false
     glance_api_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir           = '/var/log/glance'
diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp
index 22188907..75c50af1 100644
--- a/manifests/image/registry.pp
+++ b/manifests/image/registry.pp
@@ -78,10 +78,10 @@ class cloud::image::registry(
     $log_file_api      = false
     $log_file_registry = false
     glance_registry_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir           = '/var/log/glance'
diff --git a/manifests/network.pp b/manifests/network.pp
index 5317d920..b6656151 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -101,10 +101,10 @@ class cloud::network(
   if $use_syslog {
     $log_dir = false
     neutron_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/neutron'
diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp
index d216db1b..27829b04 100644
--- a/manifests/orchestration.pp
+++ b/manifests/orchestration.pp
@@ -118,10 +118,10 @@ class cloud::orchestration(
   if $use_syslog {
     $log_dir = false
     heat_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/heat'
diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp
index 33d7b9ae..d432b7a7 100644
--- a/manifests/telemetry.pp
+++ b/manifests/telemetry.pp
@@ -89,10 +89,10 @@ class cloud::telemetry(
   if $use_syslog {
     $log_dir = false
     ceilometer_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/ceilometer'
diff --git a/manifests/volume.pp b/manifests/volume.pp
index f6e97e8a..449a6ae1 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -75,10 +75,10 @@ class cloud::volume(
   if $use_syslog {
     $log_dir = false
     cinder_config {
-      'DEFAULT/logging_context_format': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
-      'DEFAULT/logging_debug_format': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_format': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/cinder'