Along with previous commit, fixing the name of some class variables