The previous names are just too verbose. This PR shortens them and tries to make things clearer. ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._
