Fix language names and order