Fix type names with underscores