Package Type name is only set in one place. However, I'm not sure I'm keen on the particular pattern but this may be too much for me to change in this pull request