Changes to support api-data renaming of ETL