Small renames + missing tests.