Fix issue with last commit. Refactor names.