name fix and invert order