Yep, I think that's better naming too.