fix name orderings