Remove all instances of CLASS_NAME
Merge branch 'dev' into gh-pages