Rename EVERYTHING... partially...