Removed event library, updated naming conventions