BDD: update sentences to use real identifiers