Pulling in Garrett's renaming