upcase names
resolve upcase conflict