shortened some names

This makes it a lot nicer to use the actual API.