Added some identifiers mangling