Changed some class names
Merge branch 'gavschanges'