etl

298f1976 - Renamed internal structures