Changes for consistent naming across datasets