+ fixing sound events and refactoring for naming conversion