Some refactoring (naming)