Renaming event to follow conventions