shorter names are more in line with what we already use, makes less
layout problems in the documentation and is easier to type when telling
people about it.