[fix] Rename and merge rewrite