Refactor. Changes in method spelling