refactored data collection namings