that's a good point, but probably out of the scope of this rename change. We can address ALL of these spy counts in another pass.