Adopt upstream branding changes