Fix type/tag naming inconsistencies.