Refactoring rename for events com -T