Rename base to kind