more style/naming unification