refactored names to be more succinct