Refactored names to standardize