Rename some types and methods for a bit of consistency