Added a bit better name mangling. Better handling of simple generic classes