Fix qualified names having underscores