refactor race order function names