First step of refactoring. Changing names.