rename + build all order
fix conflict