Tweak type names