Renamed duplicated class files