Refactored names to be more descriptive