Changed to getUnlocalizedName2

Changed to getUnlocalizedName2 to remove the need to use substring and index of.