Renaming entity handlers