Changed tag map typedef names