Yes, that is indeed a better name. I'll change it.