use current type name everywhere+discussion

I wouldn't swear that we're using the right name everywhere, but this particular case appears to be fixed.