WIP entity rename logic