Fixed generation of generic type macro names