Feature rebrand

@jessepollak @brennenbyrne Can you look at this and merge it if you think it's good?