Minor internal renaming