Modify events handled (rename/move) Still bugs in rename