finish refacto to manage upper case in name or multiple occurrences of the same keyword with different cases