Refactored names to be more readable.