Fix bug and convert name to upper case.