Fix to handle lower case canonical names