Fix naming conflicts for data kind tests