Deal with blaze renames