renamed some methods and events