Please, for the love of God, remove all mentions of Type 1, Type 2, Type 3 blah blah blah from all web sites and documentation.