diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java
index ec00f43..a76ad4b 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java
@@ -13,17 +13,17 @@ import com.google.gwt.event.shared.HasHandlers;
  * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
  *
  */
-public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExpiredHandler> {
+public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExpiredEventHandler> {
 
-	public static Type<SessionExpiredHandler> TYPE = new Type<SessionExpiredHandler>();
+	public static Type<SessionExpiredEventHandler> TYPE = new Type<SessionExpiredEventHandler>();
 	private SessionExpiredType sessionExpiredType;
 	
-	public interface SessionExpiredHandler extends EventHandler {
+	public interface SessionExpiredEventHandler extends EventHandler {
 		void onSessionExpired(SessionExpiredEvent event);
 	}
 	
-	public interface HasSessionExpiredHandler extends HasHandlers{
-		public HandlerRegistration addSessionExpiredHandler(SessionExpiredHandler handler);
+	public interface HasSessionExpiredEventHandler extends HasHandlers{
+		public HandlerRegistration addSessionExpiredEventHandler(SessionExpiredEventHandler handler);
 	}
 
 	public SessionExpiredEvent(SessionExpiredType sessionExpiredType) {
@@ -35,16 +35,16 @@ public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExp
 	}
 		
 	@Override
-	protected void dispatch(SessionExpiredHandler handler) {
+	protected void dispatch(SessionExpiredEventHandler handler) {
 		handler.onSessionExpired(this);
 	}
 
 	@Override
-	public Type<SessionExpiredHandler> getAssociatedType() {
+	public Type<SessionExpiredEventHandler> getAssociatedType() {
 		return TYPE;
 	}
 
-	public static Type<SessionExpiredHandler> getType() {
+	public static Type<SessionExpiredEventHandler> getType() {
 		return TYPE;
 	}