Fixed all -Wshadow warnings