updated type names