Simplify name rewriting