diff --git a/src/se/hal/intf/HalEventController.java b/src/se/hal/intf/HalEventController.java
index b5933237..6640a035 100755
--- a/src/se/hal/intf/HalEventController.java
+++ b/src/se/hal/intf/HalEventController.java
@@ -12,13 +12,13 @@ public interface HalEventController {
     /**
      * Will register an event type to be handled by this controller
      */
-    void register(HalEventConfig event);
+    void register(HalEventConfig eventConfig);
 
     /**
      * Deregisters an event from this controller, the controller
      * will no longer handle that type of event
      */
-    void deregister(HalEventConfig event);
+    void deregister(HalEventConfig eventConfig);
 
     /**
      * @param   eventConfig  the event configuration to target when sending
diff --git a/src/se/hal/intf/HalSensorController.java b/src/se/hal/intf/HalSensorController.java
index e9173036..ea1289a4 100755
--- a/src/se/hal/intf/HalSensorController.java
+++ b/src/se/hal/intf/HalSensorController.java
@@ -12,13 +12,13 @@ public interface HalSensorController {
     /**
      * Will register a sensor type to be handled by this controller
      */
-    void register(HalSensorConfig sensor);
+    void register(HalSensorConfig sensorConfig);
 
     /**
      * Deregisters a sensor from this controller, the controller
      * will no longer handle that type of sensor
      */
-    void deregister(HalSensorConfig sensor);
+    void deregister(HalSensorConfig sensorConfig);
 
     /**
      * @return the number of registered objects