Improve the use of the ubiquitous language