Relocation.
More renaming.