entity transformation lens renaming
cleanup