diff --git a/heka/files/input/logstreamer.toml b/heka/files/input/logstreamer.toml
index 109477d..599c639 100644
--- a/heka/files/input/logstreamer.toml
+++ b/heka/files/input/logstreamer.toml
@@ -1,10 +1,12 @@
-[<%= @title %>_logstreamer]
+{%- from "heka/map.jinja" import server with context %}
+
+[{%- server.name %}_logstreamer]
 type = "LogstreamerInput"
-log_directory = "<%= @log_directory %>"
-file_match = '<%= @file_match %>'
-<% if @differentiator -%>
-differentiator = <%= @differentiator %>
-<% end -%>
-decoder = "<%= @decoder %>_decoder"
-splitter = "<%= @splitter ? "#{ @splitter }_splitter" : "TokenSplitter" %>"
+log_directory = "{% @log_directory %}"
+file_match = '{% @file_match %}'
+{% if @differentiator -%}
+differentiator = {% @differentiator %}
+{% end -%}
+decoder = "{% @decoder %}_decoder"
+splitter = "{% @splitter ? "#{ @splitter }_splitter" : "TokenSplitter" %}"