More dealing with riot's insane naming system