Fixed eventhandling modules name