Refactor away some of the old-old-old branding...