Fix tests. Finish renaming.