Changing how dispatches the events, using directly cake events
Changing names of annotations to avoid conflicts with CakePHP objects