Correctly order by name