Fix all wrong type names