Update Function names
Add Documentation about existing events