Fix some naughty variable name reuse (hopefully correctly)
tree9ae9f1f58fb151111255335cdf93048df149c4f4
drwxr-xr-x - apps
drwxr-xr-x - bootloader
drwxr-xr-x - docs
drwxr-xr-x - firmware
drwxr-xr-x - flash
drwxr-xr-x - fonts
drwxr-xr-x - gdb
drwxr-xr-x - manual
drwxr-xr-x - rbutil
drwxr-xr-x - tools
drwxr-xr-x - uisimulator
drwxr-xr-x - wps