Refactored a few names to standardize.