diff --git a/heka/files/decoder/rsyslog.toml b/heka/files/decoder/rsyslog.toml
index a6356e8..bb4ec51 100644
--- a/heka/files/decoder/rsyslog.toml
+++ b/heka/files/decoder/rsyslog.toml
@@ -1,8 +1,8 @@
-[RsyslogDecoder_{{ name }}]
+[RsyslogDecoder]
 type = "SandboxDecoder"
 filename = "lua_decoders/rsyslog.lua"
 
-[RsyslogDecoder_{{ name }}.config]
+[RsyslogDecoder.config]
 type = "RSYSLOG_TraditionalFileFormat"
 template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
 tz = "Europe/Prague"
diff --git a/heka/files/input/logstreamer.toml b/heka/files/input/logstreamer.toml
index c36206f..f8ee4a6 100644
--- a/heka/files/input/logstreamer.toml
+++ b/heka/files/input/logstreamer.toml
@@ -4,7 +4,7 @@
 file_match = '{{ values.file_match }}'
 priority = {{ values.priority }}
 
-decoder = "{{ values.decoder }}_decoder"
+decoder = "{{ values.decoder }}"
 
 {% if values.splitter is defined %}
 splitter = {{ values.splitter }}