Fixed some missing renames