Updated to BCAW nomenclature