Clean up after merge + rename