Change in way class names are constructed to make python2 happy