Normalizing naming for events
CleanUp of old Goal