Class names changed to protect the innocent, no ref in html

- Need to get rid of this branch anyway, should take care of it
all later or something