use current type name everywhere+points

0