Renames many classes to better names