Updated type names