More renames that I missed before