Refactoring.
Fixed unit tests after renaming.