Name and print top types consistently

Closes PR 14117
Closes PR 14118