Massive refactoring/renaming.