diff --git a/aqhome/events/0BUILD b/aqhome/events/0BUILD
index 045fad1..dc5fb56 100644
--- a/aqhome/events/0BUILD
+++ b/aqhome/events/0BUILD
@@ -48,14 +48,14 @@
   
     <headers dist="true" install="$(pkgincludedir)/data" >
       eventsubscription.h
-      timer.h
+      eventtimer.h
       eventhandler.h
     </headers>
 
 
     <headers dist="true" >
       eventsubscription_p.h
-      timer_p.h
+      eventtimer_p.h
       eventhandler_p.h
     </headers>
   
@@ -64,7 +64,7 @@
       $(local/typefiles)
 
       eventsubscription.c
-      timer.c
+      eventtimer.c
       eventhandler.c
     </sources>
 
diff --git a/aqhome/events/eventhandler.h b/aqhome/events/eventhandler.h
index 8493591..6cc18a6 100644
--- a/aqhome/events/eventhandler.h
+++ b/aqhome/events/eventhandler.h
@@ -21,7 +21,7 @@ typedef struct AQH_EVENT_HANDLER AQH_EVENT_HANDLER;
 GWEN_INHERIT_FUNCTION_LIB_DEFS(AQH_EVENT_HANDLER, AQHOME_API)
 GWEN_LIST_FUNCTION_LIB_DEFS(AQH_EVENT_HANDLER, AQH_EventHandler, AQHOME_API)
 
-#include "aqhome/events/timer.h"
+#include "aqhome/events/eventtimer.h"
 #include "aqhome/events/eventsubscription.h"
 
 
diff --git a/aqhome/events/timer.c b/aqhome/events/eventtimer.c
similarity index 99%
rename from aqhome/events/timer.c
rename to aqhome/events/eventtimer.c
index d96f857..104c26d 100644
--- a/aqhome/events/timer.c
+++ b/aqhome/events/eventtimer.c
@@ -10,7 +10,7 @@
 # include <config.h>
 #endif
 
-#include "./timer_p.h"
+#include "./eventtimer_p.h"
 
 #include <gwenhywfar/debug.h>
 
diff --git a/aqhome/events/timer.h b/aqhome/events/eventtimer.h
similarity index 100%
rename from aqhome/events/timer.h
rename to aqhome/events/eventtimer.h
diff --git a/aqhome/events/timer_p.h b/aqhome/events/eventtimer_p.h
similarity index 94%
rename from aqhome/events/timer_p.h
rename to aqhome/events/eventtimer_p.h
index c6da06b..329425d 100644
--- a/aqhome/events/timer_p.h
+++ b/aqhome/events/eventtimer_p.h
@@ -10,7 +10,7 @@
 #define AQH_EVENT_TIMER_P_H
 
 
-#include "aqhome/events/timer.h"
+#include "aqhome/events/eventtimer.h"