Rename a few things for consistency.