Fix -Wshadow warnings in apps/