PIM-2816: Change dispatched events keys
PIM-2816: Remove useless spaces