Rename+events handling fix