Fixed the names some more.

See title