More renaming fixes