Bulk rename tool fixes #1594