Changed the names of variables from Dir to AZ, as Dir is ambiguous between Direction and Directory.
Authored by: tswift 2019-08-29
Parent: [r9622]
Child: [r9624]
