Convert to one Rename Class