Fixed naming resolution bug