Update User Stories to the terminology defined