Rebrand

Depends on #1 so that'll have to go in first.