Renamed few methods and events names