Better naming of event accessor interface
Restructuring and renaming after review