More generic naming

Toolbar’s going to have more than this one function probably.