Fix class names
Merge branch 'master' into 3.3/master