Fix for uppercase names