Rename after merge