reworked some type names