Refactoring - using more english names