New classes plus some renamed for a better user friendly interface

No match.