Rename event package
Merge origin/master