Some minor renaming changes