Some minor renaming