Change the name of some classes and simplify the ascii conversion