Change generic type names