Renames classes to more accurate names