diff --git a/sensu/files/sensu.conf b/sensu/files/sensu.conf
index 764636c..fd79f95 100644
--- a/sensu/files/sensu.conf
+++ b/sensu/files/sensu.conf
@@ -27,14 +27,14 @@
 {%- for device_name, device in client.network_device.iteritems() %}
 {%- for interface_name, interface in device.get('interface', {}).iteritems() %}
 remote_{{ device_name }}_{{ interface_name|replace("/", "_") }}_interface_up:
-  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device_name.management.address }} -C {{ device_name.community }} -n ^{{ interface_name }}$"
+  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device.management.address }} -C {{ device.community }} -n ^{{ interface_name }}$"
   interval: 60
   occurrences: 1
   subscribers:
   - remote-network
 {%- for subinterface_name, subinterface in interface.get('subinterface', {}).iteritems() %}
-remote_{{ device_name }}_{{ subinterface_name|replace("/", '_')|replace('.', '_') }}_interface_up:
-  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device_name.management.address }} -C {{ device_name.community }} -n ^{{ subinterface_name }}$"
+remote_{{ device_name }}_{{ subinterface_name|replace("/", "_")|replace('.', '_') }}_interface_up:
+  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device.management.address }} -C {{ device.community }} -n ^{{ subinterface_name }}$"
   interval: 60
   occurrences: 1
   subscribers: