diff --git a/heka/files/input/amqp.toml b/heka/files/input/amqp.toml
index 196697f..a103d30 100644
--- a/heka/files/input/amqp.toml
+++ b/heka/files/input/amqp.toml
@@ -1,13 +1,13 @@
-[{{ name }}_amqp]
+[input_{{ name }}]
 type = "AMQPInput"
-url = "amqp://<%= @user %>:<%= @password %>@<%= @host %>:<%= @port %>/"
-exchange = "<%= @exchange %>"
-exchange_type = "<%= @exchange_type %>"
-exchange_durability = <%= @exchange_durability %>
-exchange_auto_delete = <%= @exchange_auto_delete %>
-queue_auto_delete = <%= @queue_auto_delete %>
-queue = "<%= @queue %>"
-routing_key = "<%= @routing_key %>"
-decoder = "<%= @decoder %>_decoder"
-splitter = "NullSplitter"
+url = "amqp://{{ values.user }}:{{ values.password }}@{{ values.host }}:{{ values.port }}/{{ values.vhost }}"
+exchange = "{{ values.exchange }}"
+exchange_type = "{{ values.exchange_type }}"
+exchange_durability = "{{ values.exchange_durability }}"
+exchange_auto_delete = "{{ values.exchange_auto_delete }}"
+queue_auto_delete = {{ values.queue_auto_delete }}
+queue = "{{ values.queue }}"
+routing_key = "{{ values.routing_key }}"
+decoder = "{{ values.decoder }}"
+splitter = "{{ values.splitter }}"
 
diff --git a/heka/files/output/elasticsearch.toml b/heka/files/output/elasticsearch.toml
index 2339da3..82d7cbd 100644
--- a/heka/files/output/elasticsearch.toml
+++ b/heka/files/output/elasticsearch.toml
@@ -1,11 +1,11 @@
-[<%= @title %>_output]
+[output_{{ name }}]
 type = "ElasticSearchOutput"
-message_matcher = "<%= @message_matcher %>"
-encoder = "<%= @encoder %>_encoder"
+message_matcher = "{{ values.message_matcher }}"
+encoder = "{{ values.encoder }}"
 
 <% # Heka expects milliseconds here -%>
-flush_interval = <%= @flush_interval.to_i() * 1000 %>
-flush_count = <%= @flush_count %>
+#flush_interval = <%= @flush_interval.to_i() * 1000 %>
+#flush_count = <%= @flush_count %>
 
 server = "http://<%= @server %>:<%= @port %>"
 
diff --git a/heka/files/output/logoutput.toml b/heka/files/output/logoutput.toml
index dbca2e9..965da0c 100644
--- a/heka/files/output/logoutput.toml
+++ b/heka/files/output/logoutput.toml
@@ -1,4 +1,4 @@
 [LogOutput]
-encoder = "RstEncoder"
-message_matcher = "TRUE"
+encoder = "{{ values.encoder }}"
+message_matcher = "{{ values.message_filter }}"
 
diff --git a/metadata/service/server/router.yml b/metadata/service/server/router.yml
index 9549a6f..8579a8a 100644
--- a/metadata/service/server/router.yml
+++ b/metadata/service/server/router.yml
@@ -7,7 +7,6 @@
   heka_router_input_password: guest
   heka_router_input_vhost: /heka
   heka_router_input_exchange: logs
-
 parameters:
   heka:
     server:
@@ -23,13 +22,13 @@
           exchange_type: fanout
           decoder: ProtoBufDecoder
           splitter: HekaFramingSplitter
-        rsyslog-syslog:
+        rsyslog_syslog:
           engine: logstreamer
           log_directory: /var/log
           file_match: syslog\.?(?P<Index>\d+)?(.gz)?
           decoder: RsyslogDecoder
           priority: ["^Index"]
-        rsyslog-auth:
+        rsyslog_auth:
           engine: logstreamer
           log_directory: /var/log
           file_match: auth\.log\.?(?P<Index>\d+)?(.gz)?