Small refactoring of names