fix: force type var short form as a key in generic resolve mapping (#…

fix: force type var short form as a key in generic resolve mapping (#… #452