Fixed type names