Fix names to match ubiquitous language.