fix name order