Just some minor renaming