more consistent branding
fix conflict