Massive renaming, refactoring.

Nothing new.