Sorting out a couple more renaming issues