Some more refactoring to improve naming