adapting implementation to new event store

changed naming scheme and builder pattern