Unify naming a little more