change variable names

since we don’t support content boxes on sites anymore, there shouldn’t
be any problem with variable collisions