rename fixes
Merge pull request #115 from dart-gde/event-class

rename fixes