#5909 Improve referenced name parser