rename some methods and events