Finalized refactoring and renaming.