switch to generic brand variables instead

What it says on the tin :)

Discuss! :)