[expectations] Change nomenclature, add validation