Renamed some variables that still referred to the old guards-id stack