renamed several events to keep naming convention
renamed several functions to keep naming conventions