A few classdiagrams leading to further renaming.