diff --git a/pytools/obmcutil b/pytools/obmcutil
index 8924315..18be97c 100644
--- a/pytools/obmcutil
+++ b/pytools/obmcutil
@@ -108,7 +108,7 @@
         dbus_obj = bus.get_object(bus_name, obj)
 
         if (property_name != ""):
-            intf = dbus.Interface(dbus_obj, "org.freedesktop.DBus.Properties")
+            dbus_iface = dbus.Interface(dbus_obj, "org.freedesktop.DBus.Properties")
             if (objinfo.has_key('value')):
                 property_value = objinfo['value']
             else:
@@ -117,13 +117,13 @@
                 else:
                     property_value = None
             if(property_value is not None):
-                intf.Set(intf_name, property_name, property_value)
+                dbus_iface.Set(intf_name, property_name, property_value)
             else:
-                prop = intf.Get(intf_name,property_name)
+                prop = dbus_iface.Get(intf_name,property_name)
                 print '{:<20}'.format(property_name+": ") + str(prop)
         else:
-            intf = dbus.Interface(dbus_obj, "org.freedesktop.DBus.Properties")
-            props = intf.GetAll(intf_name)
+            dbus_iface = dbus.Interface(dbus_obj, "org.freedesktop.DBus.Properties")
+            props = dbus_iface.GetAll(intf_name)
             for p in props:
                 print p + " = " + str(props[p])
 
