Convert entity event over to use an interface and clean up method names a little