Fix the bug of wrong name to emit event
Merge remote-tracking branch 'origin/master'