fix names order