issue #613 - NamesAndTypes doesn't get a number next to it