Pulling in Garrett's renaming through master