Small refactoring. Change terminology.