Fix ordering of renames/updates