[Cleanup] Standardize list name setting.