Fixed for renames.