Fix some variable shadowing warnings in the specs