Update Antwalk and main with consistent variablenames