Renames some old stuff