unify masters naming convention