Rewrite the Naming Logic