Rename a few things for clarity